From 5b66b6723ce58f5d9d161a4e758e3241540e2706 Mon Sep 17 00:00:00 2001
From: GME <guillaume.meneroud@gmail.com>
Date: Mon, 26 Nov 2018 11:04:29 +0100
Subject: [PATCH] update balance api

---
 .idea/workspace.xml                           | 257 +++++++++---------
 .../BlockchainQueryImplementation.java        |   8 +-
 .../DatabaseUserImplementation.java           |   7 +-
 .../restService/BlockchainQueryResource.java  |  31 +--
 src/main/java/restService/StringResponse.java |  10 +
 .../restImplementation/UserLoggerTest.java    |   7 +-
 6 files changed, 160 insertions(+), 160 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6c9a4fe..08cec61 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7c8802f8-163e-48a6-9d7a-9324ac89091d" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/restImplementation/DatabaseUserImplementation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/restImplementation/DatabaseUserImplementation.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/restService/DatabaseUserResource.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/restService/DatabaseUserResource.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/restService/BlockchainQueryResource.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/restService/BlockchainQueryResource.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/restService/StringResponse.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/restService/StringResponse.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/restImplementation/UserLoggerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/restImplementation/UserLoggerTest.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -18,11 +20,60 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="DatabaseUserResource.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="DatabaseUserResource.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/restService/DatabaseUserResource.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="561">
-              <caret line="43" column="86" lean-forward="true" selection-start-line="43" selection-start-column="86" selection-end-line="43" selection-end-column="86" />
+            <state relative-caret-position="587">
+              <caret line="91" column="34" lean-forward="true" selection-start-line="91" selection-start-column="34" selection-end-line="91" selection-end-column="34" />
+              <folding>
+                <element signature="e#4324#4325#0" expanded="true" />
+                <element signature="e#4386#4387#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="DatabaseTransactionResource.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/restService/DatabaseTransactionResource.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="102">
+              <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="BlockchainQueryResource.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/restService/BlockchainQueryResource.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="102">
+              <caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="BlockchainQueryImplementation.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="170">
+              <caret line="10" column="23" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="WelcomeResource.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/restService/WelcomeResource.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="85">
+              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="StringResponse.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/restService/StringResponse.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="187">
+              <caret line="13" column="37" lean-forward="true" selection-start-line="13" selection-start-column="37" selection-end-line="13" selection-end-column="37" />
             </state>
           </provider>
         </entry>
@@ -30,12 +81,10 @@
       <file leaf-file-name="DatabaseUserImplementation.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/restImplementation/DatabaseUserImplementation.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="561">
-              <caret line="33" column="44" lean-forward="true" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
+            <state relative-caret-position="1045">
+              <caret line="64" column="55" selection-start-line="64" selection-start-column="55" selection-end-line="64" selection-end-column="55" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#411#427#0" expanded="true" />
-                <element signature="e#1670#1686#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -85,8 +134,12 @@
         <option value="$PROJECT_DIR$/src/test/java/blockchain/query/CreateChaincodeUserTest.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/restImplementation/DatabaseUserImplementation.java" />
         <option value="$PROJECT_DIR$/src/main/java/restService/DatabaseUserResource.java" />
+        <option value="$PROJECT_DIR$/src/test/java/restImplementation/UserLoggerTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/restImplementation/DatabaseUserImplementation.java" />
+        <option value="$PROJECT_DIR$/src/main/java/restService/StringResponse.java" />
+        <option value="$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java" />
+        <option value="$PROJECT_DIR$/src/main/java/restService/BlockchainQueryResource.java" />
       </list>
     </option>
   </component>
@@ -110,7 +163,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -191,6 +244,14 @@
               <item name="blockchain" type="462c0819:PsiDirectoryNode" />
               <item name="utility" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
+              <item name="java-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="restImplementation" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
               <item name="java-api" type="462c0819:PsiDirectoryNode" />
@@ -199,69 +260,12 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="restService" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
-              <item name="java-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
-              <item name="java-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
-              <item name="java-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="blockchain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
-              <item name="java-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="blockchain" type="462c0819:PsiDirectoryNode" />
-              <item name="client" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
-              <item name="java-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="blockchain" type="462c0819:PsiDirectoryNode" />
-              <item name="query" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
-              <item name="java-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="blockchain" type="462c0819:PsiDirectoryNode" />
-              <item name="user" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
-              <item name="java-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="blockchain" type="462c0819:PsiDirectoryNode" />
-              <item name="utility" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -454,12 +458,12 @@
       <listeners />
     </configuration>
     <list>
+      <item itemvalue="Spring Boot.App" />
       <item itemvalue="JUnit.QueryTest" />
       <item itemvalue="JUnit.TestRegisterEnrollUser" />
       <item itemvalue="JUnit.TestEnrollAdmin" />
       <item itemvalue="JUnit.ChaincodeTransactionTest" />
       <item itemvalue="JUnit.QueryChannelTest" />
-      <item itemvalue="Spring Boot.App" />
     </list>
     <recent_temporary>
       <list>
@@ -493,7 +497,8 @@
       <workItem from="1541767086575" duration="1506000" />
       <workItem from="1542393478360" duration="879000" />
       <workItem from="1542448248868" duration="299000" />
-      <workItem from="1543219415115" duration="1981000" />
+      <workItem from="1543219415115" duration="2335000" />
+      <workItem from="1543224100704" duration="2118000" />
     </task>
     <servers />
   </component>
@@ -530,7 +535,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="28173000" />
+    <option name="totallyTimeSpent" value="30645000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -556,7 +561,7 @@
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.84375" weight="0.51115835" />
       <window_info anchor="bottom" id="Spring" order="12" />
       <window_info anchor="bottom" id="Terminal" order="7" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
       <window_info anchor="right" id="Bean Validation" order="8" />
       <window_info id="Web" order="7" side_tool="true" />
       <window_info id="Learn" order="6" />
@@ -591,41 +596,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="29" column="32" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1275">
-          <caret line="90" column="37" selection-start-line="90" selection-start-column="37" selection-end-line="90" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="29" column="50" selection-start-line="29" selection-start-column="50" selection-end-line="29" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="21" column="48" selection-start-line="21" selection-start-column="48" selection-end-line="21" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" column="56" selection-start-line="15" selection-start-column="56" selection-end-line="15" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="391">
@@ -879,9 +849,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="748">
           <caret line="57" column="13" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -889,10 +856,54 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="344">
           <caret line="33" selection-start-line="33" selection-end-line="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/restImplementation/DatabaseUserImplementation.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1045">
+          <caret line="64" column="55" selection-start-line="64" selection-start-column="55" selection-end-line="64" selection-end-column="55" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#629#630#0" expanded="true" />
-            <element signature="e#658#659#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/restImplementation/UserLoggerTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="22" column="9" lean-forward="true" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/restService/StringResponse.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="13" column="37" lean-forward="true" selection-start-line="13" selection-start-column="37" selection-end-line="13" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="10" column="23" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/restService/WelcomeResource.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/restService/DatabaseUserResource.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="587">
+          <caret line="91" column="34" lean-forward="true" selection-start-line="91" selection-start-column="34" selection-end-line="91" selection-end-column="34" />
+          <folding>
+            <element signature="e#4324#4325#0" expanded="true" />
+            <element signature="e#4386#4387#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -904,22 +915,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/restImplementation/DatabaseUserImplementation.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/restService/BlockchainQueryResource.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="561">
-          <caret line="33" column="44" lean-forward="true" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#411#427#0" expanded="true" />
-            <element signature="e#1670#1686#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/restService/DatabaseUserResource.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="561">
-          <caret line="43" column="86" lean-forward="true" selection-start-line="43" selection-start-column="86" selection-end-line="43" selection-end-column="86" />
+        <state relative-caret-position="102">
+          <caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/restImplementation/BlockchainQueryImplementation.java b/src/main/java/restImplementation/BlockchainQueryImplementation.java
index 311be1c..5f84df2 100644
--- a/src/main/java/restImplementation/BlockchainQueryImplementation.java
+++ b/src/main/java/restImplementation/BlockchainQueryImplementation.java
@@ -4,12 +4,10 @@ import blockchain.query.QueryWrapper;
 
 public class BlockchainQueryImplementation {
 
-    public String getUserBalance(String userHash){
+    public Double getUserBalance(String userHash){
         QueryWrapper queryWrapper = new QueryWrapper();
-
         String result = queryWrapper.getUserBalance(userHash);
-        //do something here ?
-        return result;
-
+        Double balance = Double.parseDouble(result);
+        return balance;
     }
 }
diff --git a/src/main/java/restImplementation/DatabaseUserImplementation.java b/src/main/java/restImplementation/DatabaseUserImplementation.java
index fc532b9..b243e54 100644
--- a/src/main/java/restImplementation/DatabaseUserImplementation.java
+++ b/src/main/java/restImplementation/DatabaseUserImplementation.java
@@ -27,7 +27,7 @@ public class DatabaseUserImplementation {
             user.setApproved(true);
 
             //TEMPORARY USER HASH IS
-            // name+email+password
+            //name+email+password
             user.setUser_hash(hashPassword(user.getName()+user.getEmail()+user.getPassword()));
             userDao.addUser(user);
             response.put("userHash",user.getUser_hash());
@@ -63,21 +63,16 @@ public class DatabaseUserImplementation {
 
             if(!BCrypt.checkpw(user.getPassword(), hash)){
                 response.put("response","Not Allowed");
-                //response = "Not Allowed";
             }else{
                 response.put("response","Ok");
                 response.put("userHash",user1.getUser_hash());
-                //response = "Ok";
             }
         } else {
             response.put("response","Not Exist");
-            //response = "Not Exist";
         }
-
         return response;
     }
 
-
     private String hashPassword(String plainTextPassword){
         return BCrypt.hashpw(plainTextPassword,BCrypt.gensalt());
     }
diff --git a/src/main/java/restService/BlockchainQueryResource.java b/src/main/java/restService/BlockchainQueryResource.java
index 2018dc0..24f7001 100644
--- a/src/main/java/restService/BlockchainQueryResource.java
+++ b/src/main/java/restService/BlockchainQueryResource.java
@@ -1,28 +1,27 @@
 package restService;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
 import restImplementation.BlockchainQueryImplementation;
 
 @RestController
 @RequestMapping(value = "/api/rest/query")
 public class BlockchainQueryResource {
 
-    @RequestMapping(value = "/hello",params = {"name"})
-    public @ResponseBody
-    String getUser(
-            @RequestParam(value = "name") String hash){
-        return "Hello "+hash;
-    }
+    @RequestMapping(value = "/balance", method = RequestMethod.GET ,params = {"userHash"},produces = "application/json")
+    @ResponseStatus(HttpStatus.OK)
+    public ResponseEntity<StringResponse> getUserBalance(@RequestParam(value = "userHash") String userHash){
+        try{
+            BlockchainQueryImplementation blockchainQueryImplementation = new BlockchainQueryImplementation();
+            Double result = blockchainQueryImplementation.getUserBalance(userHash);
+            StringResponse response = new StringResponse("Ok",result);
+            return ResponseEntity.status(HttpStatus.OK).body(response);
+        }catch (Exception e){
+            StringResponse response = new StringResponse("Error");
+            return ResponseEntity.status(HttpStatus.OK).body(response);
+        }
 
-    @RequestMapping(value = "/balance",params = {"name"})
-    public @ResponseBody
-    String getUserBalance(
-            @RequestParam(value = "name") String hash){
-        BlockchainQueryImplementation blockchainQueryImplementation = new BlockchainQueryImplementation();
-        return blockchainQueryImplementation.getUserBalance(hash);
     }
 
 
diff --git a/src/main/java/restService/StringResponse.java b/src/main/java/restService/StringResponse.java
index 19b74f3..7d80d43 100644
--- a/src/main/java/restService/StringResponse.java
+++ b/src/main/java/restService/StringResponse.java
@@ -3,11 +3,17 @@ package restService;
 public class StringResponse {
     private String response;
     private String userHash;
+    private Double userBalance;
 
     public StringResponse(String response){
         this.response = response;
     }
 
+    public StringResponse(String response, Double userBalance){
+        this.response=response;
+        this.userBalance=userBalance;
+    }
+
     public StringResponse(String response, String userHash){
         this.response=response;
         this.userHash=userHash;
@@ -28,4 +34,8 @@ public class StringResponse {
     public void setUserHash(String userHash) {
         this.userHash = userHash;
     }
+
+    public Double getUserBalance(){return  userBalance;}
+
+    public void setUserBalance(Double userBalance){this.userBalance=userBalance;}
 }
diff --git a/src/test/java/restImplementation/UserLoggerTest.java b/src/test/java/restImplementation/UserLoggerTest.java
index 4444dbe..e46eb0f 100644
--- a/src/test/java/restImplementation/UserLoggerTest.java
+++ b/src/test/java/restImplementation/UserLoggerTest.java
@@ -4,6 +4,8 @@ import database.user.User;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import java.util.Map;
+
 @Ignore
 public class UserLoggerTest {
     @Test
@@ -14,13 +16,10 @@ public class UserLoggerTest {
             user.setEmail("thomas.marshal@gmail.com");
 
             DatabaseUserImplementation databaseUserImplementation = new DatabaseUserImplementation();
-            String res = databaseUserImplementation.userLogger(user);
+            Map<String, String> res = databaseUserImplementation.userLogger(user);
             System.out.println(res);
         }catch (Exception e){
             e.printStackTrace();
         }
-
-
-
     }
 }