From be4f551b4949774571fd1413e80bc0315f5188f7 Mon Sep 17 00:00:00 2001 From: Fernando Ferreira de Lima Filho <fferreiralf@ufrn.edu.br> Date: Sat, 28 May 2022 16:01:36 -0300 Subject: [PATCH] feature: client integration with withdrawal service --- .../main/java/br/ufrn/imd/client/utils/MachineState.java | 9 ++++++--- .../main/java/br/ufrn/imd/client/utils/NameSpace.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) 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 1832bfb..443e6ff 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 @@ -143,11 +143,14 @@ public class MachineState { } else if(state.equals(WITHDRAWAL)) { String v = sc.nextLine(); - WithdrawalMessage withdrawalMessage = new WithdrawalMessage(this.client, Double.parseDouble(v)); - ResponseEntity<Account> response = restTemplate.postForEntity(HOST_WITHDRAWAL_SERVICE, withdrawalMessage, Account.class); + ResponseEntity<Client> response = + restTemplate.getForEntity( + HOST_WITHDRAWAL_SERVICE + + String.format("/%d?value=%s", this.client.getId(), v), + 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 6515c3b..f539a02 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 @@ -7,7 +7,7 @@ public class NameSpace { public static final Integer PORT_BALANCE_SERVICE = 8080; public static final Integer PORT_TRANSFER_SERVICE = 8080; public final static String HOST_AUTHENTICATOR_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_AUTHENTICATOR_SERVICE, "authenticator"); - public final static String HOST_WITHDRAWAL_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_WITHDRAWAL_SERVICE, "withdrawal"); + 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"); -- GitLab