Monnethic/java-api
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'features1.4/transaction' into develop-1.4

Browse source
This commit is contained in:
GME 2019-04-03 14:39:43 +02:00
parent 1378158e35 e9ce67a6a6
commit 99a29d8a49
2 changed files with 70 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/main/java/restService/TransactionResource.java
View file

@ -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);
}
}
}

14
src/main/java/restService/UserResource.java
View file

@ -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);