diff --git a/WebServices/balance/target/classes/br/ufrn/imd/balance/controller/BalanceController.class b/WebServices/balance/target/classes/br/ufrn/imd/balance/controller/BalanceController.class index b48af94711e95246e8a2876a7785419cef6e5794..24a80af1dfab826109ba2bba7513db78db528c1d 100644 Binary files a/WebServices/balance/target/classes/br/ufrn/imd/balance/controller/BalanceController.class and b/WebServices/balance/target/classes/br/ufrn/imd/balance/controller/BalanceController.class differ diff --git a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java index 443e6ff95320563f7dc64f00fa5be6d8137d3901..aae40752f235211ad845d765b70b42ceacf726f4 100644 --- a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java +++ b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java @@ -167,13 +167,19 @@ public class MachineState { System.out.println(">>> Please enter with the value that you want transfer"); String v = sc.nextLine(); - Account account = new Account(null, accountNumber, null); - TransferMessage transferMessage = new TransferMessage(this.client, account, Double.parseDouble(v)); - ResponseEntity<Account> response = restTemplate.postForEntity(HOST_TRANSFER_SERVICE, transferMessage, Account.class); + ResponseEntity<Client> response = + restTemplate.getForEntity( + HOST_TRANSFER_SERVICE + + String.format("/%d?value=%s&toAccount=%s", + this.client.getId(), + v, + accountNumber + ), + Client.class); if(response.getStatusCodeValue() == 200) { System.out.println( - String.format(">>> Your balance is: %.2f", response.getBody().getBalance()) + String.format(">>> Your balance is: %.2f", response.getBody().getAccount().getBalance()) ); } else if(response.getStatusCodeValue() == 500) { System.out.println( diff --git a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/NameSpace.java b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/NameSpace.java index f539a02e0d1cdbc8d1fe2ed1b8881628d0421907..624c024a4df4a6d4d10514ac8fe8fd3c9df9da72 100644 --- a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/NameSpace.java +++ b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/NameSpace.java @@ -10,5 +10,5 @@ public class NameSpace { public final static String HOST_WITHDRAWAL_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_WITHDRAWAL_SERVICE, "/gateway/withdrawal/banking/client"); public static final String HOST_DEPOSIT_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_DEPOSIT_SERVICE, "/gateway/deposit/banking/client"); public static final String HOST_BALANCE_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_BALANCE_SERVICE, "/gateway/balance/banking/client"); - public final static String HOST_TRANSFER_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_TRANSFER_SERVICE, "transfer"); + public final static String HOST_TRANSFER_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_TRANSFER_SERVICE, "/gateway/transfer/banking/client"); } diff --git a/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/controller/TransferController.java b/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/controller/TransferController.java index 2d8606eb940c23ee8daaa3d64a5e7f838784806f..5bb1cc7d200eb88c83d8758fff2b584a710d93d6 100644 --- a/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/controller/TransferController.java +++ b/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/controller/TransferController.java @@ -15,7 +15,7 @@ public class TransferController { @Autowired private final TransferService service; - @PatchMapping + @GetMapping @ResponseStatus(HttpStatus.OK) public Client transfer(@PathVariable Integer id, @RequestParam(name = "value") Double value, @RequestParam(name = "toAccount") String toAccountNumber) {