From e9ce67a6a69bc23957fca411a80a87e69149fbd3 Mon Sep 17 00:00:00 2001
From: GME <guillaume.meneroud@gmail.com>
Date: Wed, 3 Apr 2019 14:39:39 +0200
Subject: [PATCH] Update transaction API

---
 .../java/restService/TransactionResource.java | 64 ++++++++++++++++++-
 src/main/java/restService/UserResource.java   | 14 ++--
 2 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/src/main/java/restService/TransactionResource.java b/src/main/java/restService/TransactionResource.java
index 2571298..e6842bf 100644
--- a/src/main/java/restService/TransactionResource.java
+++ b/src/main/java/restService/TransactionResource.java
@@ -8,6 +8,7 @@ import restImplementation.TransactionImplementation;
 
 import javax.validation.Valid;
 import java.util.HashMap;
+import java.util.List;
 
 @RestController
 @RequestMapping(value = "/api/rest/transaction")
@@ -31,7 +32,68 @@ public class TransactionResource {
         }
     }
 
-    
+    @RequestMapping(value = "/get", method = RequestMethod.GET, params = {"userHash","txID"},produces = "application/json")
+    @ResponseStatus(HttpStatus.OK)
+    public ResponseEntity getTransaction(@RequestParam(value = "txID") String txID, @RequestParam(value = "userHash") String userHash){
+        TransactionImplementation transactionImplementation = new TransactionImplementation();
+        try {
+            Transaction transaction = transactionImplementation.getTransaction(userHash,txID);
+            return ResponseEntity.status(HttpStatus.OK).body(transaction);
+        }catch (Exception e){
+            StringResponse responseS = new StringResponse(e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseS);
+        }
+    }
 
+    @RequestMapping(value = "/get/sent", method = RequestMethod.GET, params = {"userHash"}, produces = "application/json")
+    @ResponseStatus(HttpStatus.OK)
+    public ResponseEntity getSentTransaction(@RequestParam(value = "userHash") String userHash){
+        TransactionImplementation transactionImplementation = new TransactionImplementation();
+        try {
+            List<Transaction> listTransaction = transactionImplementation.getSentTransaction(userHash);
+            return ResponseEntity.status(HttpStatus.OK).body(listTransaction);
+        } catch (Exception e){
+            StringResponse responseS = new StringResponse(e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseS);
+        }
+    }
 
+    @RequestMapping(value = "/get/received", method = RequestMethod.GET, params = {"userHash"}, produces = "application/json")
+    @ResponseStatus(HttpStatus.OK)
+    public ResponseEntity getReceivedTransaction(@RequestParam(value = "userHash") String userHash){
+        TransactionImplementation transactionImplementation = new TransactionImplementation();
+        try {
+            List<Transaction> listTransaction = transactionImplementation.getReceivedTransaction(userHash);
+            return ResponseEntity.status(HttpStatus.OK).body(listTransaction);
+        } catch (Exception e){
+            StringResponse responseS = new StringResponse(e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseS);
+        }
+    }
+
+    @RequestMapping(value = "/get/latest", method = RequestMethod.GET, params = {"userHash"}, produces = "application/json")
+    @ResponseStatus(HttpStatus.OK)
+    public ResponseEntity getLatestTransaction(@RequestParam(value = "userHash") String userHash){
+        TransactionImplementation transactionImplementation = new TransactionImplementation();
+        try {
+            List<Transaction> listTransaction = transactionImplementation.getLatestTransactions(userHash);
+            return ResponseEntity.status(HttpStatus.OK).body(listTransaction);
+        } catch (Exception e){
+            StringResponse responseS = new StringResponse(e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseS);
+        }
+    }
+
+    @RequestMapping(value = "/getAll", method = RequestMethod.GET, params = {"userHash"}, produces = "application/json")
+    @ResponseStatus(HttpStatus.OK)
+    public ResponseEntity getAllTransaction(@RequestParam(value = "userHash") String userHash){
+        TransactionImplementation transactionImplementation = new TransactionImplementation();
+        try {
+            List<Transaction> listTransaction = transactionImplementation.getUserTransactions(userHash);
+            return ResponseEntity.status(HttpStatus.OK).body(listTransaction);
+        } catch (Exception e){
+            StringResponse responseS = new StringResponse(e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseS);
+        }
+    }
 }
diff --git a/src/main/java/restService/UserResource.java b/src/main/java/restService/UserResource.java
index db19ef3..51db07b 100644
--- a/src/main/java/restService/UserResource.java
+++ b/src/main/java/restService/UserResource.java
@@ -41,7 +41,7 @@ public class UserResource {
     }
 
 
-    @RequestMapping(value = "/approve", method = RequestMethod.POST,produces = "application/json")
+    @RequestMapping(value = "/approve", method = RequestMethod.POST, produces = "application/json")
     @ResponseStatus(HttpStatus.OK)
     public ResponseEntity<StringResponse> approveUser(@Valid @RequestBody User user){
         try{
@@ -56,7 +56,7 @@ public class UserResource {
     }
 
 
-    @RequestMapping(value = "/login", method = RequestMethod.POST,produces = "application/json")
+    @RequestMapping(value = "/login", method = RequestMethod.POST, produces = "application/json")
     @ResponseStatus(HttpStatus.OK)
     public ResponseEntity<StringResponse> login(@Valid @RequestBody User user){
         try{
@@ -91,9 +91,9 @@ public class UserResource {
     }
 
 
-    @PostMapping(value = "/get", produces = "application/json")
-    @ResponseBody
-    public ResponseEntity<User> getUser(@RequestBody User user){
+    @RequestMapping(value = "/get", method = RequestMethod.POST, produces = "application/json")
+    @ResponseStatus(HttpStatus.OK)
+    public ResponseEntity<User> getUser(@Valid @RequestBody User user){
         try{
             UserImplementation userImplementation = new UserImplementation();
             User response = userImplementation.getUser(user.getEmail(), user.getPassword());
@@ -112,7 +112,7 @@ public class UserResource {
 
 
 
-    @PostMapping(value = "/delete", produces = "application/json")
+    @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = "application/json")
     @ResponseStatus(HttpStatus.OK)
     public ResponseEntity<StringResponse> removeUser(@Valid @RequestBody User user){
         try{
@@ -127,7 +127,7 @@ public class UserResource {
     }
 
 
-    @PostMapping(value = "/update")
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseStatus(HttpStatus.OK)
     public ResponseEntity updateUser(@RequestBody User user){
         return new ResponseEntity(null, HttpStatus.SERVICE_UNAVAILABLE);