From b32894003795047f8540f6af5c7ef59cc85cce58 Mon Sep 17 00:00:00 2001 From: GME Date: Mon, 8 Apr 2019 19:06:13 +0200 Subject: [PATCH] testing front api --- src/main/java/database/Wallet/WalletDao.java | 5 +++++ .../java/restImplementation/UserImplementation.java | 8 ++++++++ .../restImplementation/WalletImplementation.java | 10 ++++++++++ src/main/java/restService/UserResource.java | 9 ++++++++- src/main/java/restService/WalletResource.java | 12 +++++------- .../restImplementation/CreateDataSetProcess.java | 2 ++ 6 files changed, 38 insertions(+), 8 deletions(-) diff --git a/src/main/java/database/Wallet/WalletDao.java b/src/main/java/database/Wallet/WalletDao.java index e5921d7..c4cd4b8 100644 --- a/src/main/java/database/Wallet/WalletDao.java +++ b/src/main/java/database/Wallet/WalletDao.java @@ -6,6 +6,10 @@ import com.j256.ormlite.stmt.PreparedQuery; import com.j256.ormlite.stmt.QueryBuilder; import com.j256.ormlite.stmt.UpdateBuilder; import database.DatabaseHelper; +import org.apache.log4j.BasicConfigurator; +import org.apache.log4j.Logger; +import restImplementation.WalletImplementation; + import java.time.Instant; import java.util.List; @@ -36,6 +40,7 @@ public class WalletDao { } public void updateWalletBalance(String walletHash, double newBalance) throws Exception { + walletDao = createWalletDaoConnection(); UpdateBuilder updateBuilder = walletDao.updateBuilder(); long now = Instant.now().toEpochMilli(); diff --git a/src/main/java/restImplementation/UserImplementation.java b/src/main/java/restImplementation/UserImplementation.java index 558450c..206308b 100644 --- a/src/main/java/restImplementation/UserImplementation.java +++ b/src/main/java/restImplementation/UserImplementation.java @@ -3,12 +3,17 @@ package restImplementation; import blockchain.query.TransactionWrapper; import database.user.User; import database.user.UserDao; +import org.apache.log4j.BasicConfigurator; +import org.apache.log4j.Logger; import org.springframework.security.crypto.bcrypt.BCrypt; +import restService.UserResource; + import java.time.Instant; import java.util.HashMap; import java.util.Map; public class UserImplementation { + private static Logger logger = Logger.getLogger(UserImplementation.class); public Map registerUser(User user) throws Exception { TransactionWrapper transactionWrapper = new TransactionWrapper(); @@ -87,10 +92,13 @@ public class UserImplementation { public Map userLogger(User user) throws Exception { + BasicConfigurator.configure(); + UserDao userDao = new UserDao(); Map response = new HashMap<>(); User userResponse = userDao.getUserWithEmail(user.getEmail()); + logger.info(userResponse.getEmail()); if(userResponse != null){ String hash = userResponse.getPassword(); diff --git a/src/main/java/restImplementation/WalletImplementation.java b/src/main/java/restImplementation/WalletImplementation.java index bb35adc..6401e4b 100644 --- a/src/main/java/restImplementation/WalletImplementation.java +++ b/src/main/java/restImplementation/WalletImplementation.java @@ -7,7 +7,10 @@ import database.Wallet.WalletDao; import database.user.User; import database.user.UserDao; import org.apache.commons.lang.RandomStringUtils; +import org.apache.log4j.BasicConfigurator; +import org.apache.log4j.Logger; import org.springframework.security.crypto.bcrypt.BCrypt; +import restService.UserResource; import javax.json.Json; import javax.json.JsonArray; @@ -19,6 +22,7 @@ import java.util.HashMap; import java.util.Map; public class WalletImplementation { + private static Logger logger = Logger.getLogger(WalletImplementation.class); public Map createWallet(Wallet wallet) throws Exception { Map response = new HashMap<>(); @@ -81,6 +85,8 @@ public class WalletImplementation { //setBalance public void setBalanceToWallet(String associationHash, String associationPwd, String walletHash, double amount) throws Exception { + BasicConfigurator.configure(); + TransactionWrapper transactionWrapper = new TransactionWrapper(); UserDao userDao = new UserDao(); User association = userDao.getUserWithHash(associationHash); @@ -91,8 +97,12 @@ public class WalletImplementation { double newBalance = 0.0; transactionWrapper.sendTransaction("setBalanceOnWallet",new String[]{walletHash,String.valueOf(amount)}); Wallet wallet = getWallet(walletHash); + logger.info("wallet : "+wallet); if(wallet!=null){ + logger.info("wallet!=null"); newBalance=wallet.getBalance(); + logger.info("newBalance : "+newBalance); + logger.info("walletHash : "+walletHash); WalletDao walletDao = new WalletDao(); walletDao.updateWalletBalance(walletHash,newBalance); } else { diff --git a/src/main/java/restService/UserResource.java b/src/main/java/restService/UserResource.java index 51db07b..462e656 100644 --- a/src/main/java/restService/UserResource.java +++ b/src/main/java/restService/UserResource.java @@ -1,6 +1,8 @@ package restService; import database.user.User; +import org.apache.log4j.BasicConfigurator; +import org.apache.log4j.Logger; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -12,6 +14,7 @@ import java.util.Map; @RestController @RequestMapping(value = "/api/rest/user") public class UserResource { + private static Logger logger = Logger.getLogger(UserResource.class); @RequestMapping(value = "/register", method = RequestMethod.POST,produces = "application/json") @@ -59,9 +62,13 @@ public class UserResource { @RequestMapping(value = "/login", method = RequestMethod.POST, produces = "application/json") @ResponseStatus(HttpStatus.OK) public ResponseEntity login(@Valid @RequestBody User user){ + BasicConfigurator.configure(); try{ UserImplementation userImplementation = new UserImplementation(); + logger.info(user.getEmail()); + logger.info(user.getPassword()); Map response = userImplementation.userLogger(user); + logger.info(response.get("response")); switch (response.get("response")){ case "Not Exist" : { StringResponse responseS = new StringResponse("Not Found"); @@ -75,7 +82,7 @@ public class UserResource { StringResponse responseS = new StringResponse("Error"); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseS); } - case "Ok":{ + case "true":{ StringResponse responseS = new StringResponse("Ok",response.get("userHash")); return ResponseEntity.status(HttpStatus.OK).body(responseS); } diff --git a/src/main/java/restService/WalletResource.java b/src/main/java/restService/WalletResource.java index 742e7ba..a465c8a 100644 --- a/src/main/java/restService/WalletResource.java +++ b/src/main/java/restService/WalletResource.java @@ -24,6 +24,7 @@ public class WalletResource { Wallet returnWallet = new Wallet(); returnWallet.setWallet_hash(walletResponse.get("walletHash")); + returnWallet.setUser_hash(wallet.getUser_hash()); returnWallet.setBalance(Double.parseDouble(walletResponse.get("walletBalance"))); returnWallet.setType(walletResponse.get("walletType")); @@ -102,8 +103,10 @@ public class WalletResource { } - @RequestMapping(value = "/{userHash}/delete/{walletHash}", method = RequestMethod.DELETE) - public ResponseEntity deleteWallet(@PathVariable("walletHash") String walletHash, @PathVariable("userHash") String userHash){ + @RequestMapping(value = "/delete", method = RequestMethod.POST) + public ResponseEntity deleteWallet(@RequestBody Map requestParam){ + String userHash = requestParam.get("userHash"); + String walletHash = requestParam.get("walletHash"); WalletImplementation walletImplementation = new WalletImplementation(); try{ walletImplementation.deleteWallet(walletHash,userHash); @@ -113,9 +116,4 @@ public class WalletResource { return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseS); } } - - - - - } diff --git a/src/test/java/restImplementation/CreateDataSetProcess.java b/src/test/java/restImplementation/CreateDataSetProcess.java index 91be1b3..3290955 100644 --- a/src/test/java/restImplementation/CreateDataSetProcess.java +++ b/src/test/java/restImplementation/CreateDataSetProcess.java @@ -4,9 +4,11 @@ import database.Wallet.Wallet; import database.user.User; import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; +import org.junit.Ignore; import java.util.Map; +@Ignore public class CreateDataSetProcess { //OK private static Logger logger = Logger.getLogger(CreateDataSetProcess.class); private static String gonetteHash = "";