From 6d4b8379347d50bdf7f32c492bcf96b01fd103cd Mon Sep 17 00:00:00 2001
From: Fernando Ferreira de Lima Filho <fferreiralf@ufrn.edu.br>
Date: Sat, 28 May 2022 16:15:15 -0300
Subject: [PATCH] feature: client integration with transfer service
---
.../controller/BalanceController.class | Bin 1465 -> 1394 bytes
.../ufrn/imd/client/utils/MachineState.java | 14 ++++++++++----
.../br/ufrn/imd/client/utils/NameSpace.java | 2 +-
.../controller/TransferController.java | 2 +-
4 files changed, 12 insertions(+), 6 deletions(-)
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
GIT binary patch
delta 293
zcmYj~J5B>Z5JX?EZN?rCuxq^L;{{{$S^gwQ1l$0LjEn>!aRN@Vnxhbz03kBC16Oe1
z10c!-n31}ts=L&0+@AXK^ZVr$xa7RW0y~afPr{yOpVH$va2z_0s`9EDe^n2KUBoQO
z<4vvm{AN>23yvKp0ncfm;4Hq^CX48VY1F1ph#&Rgy+%53>N!j5JtZJzSv7kp86E9c
zq#Gs!T~(%7uD_?%>LY8cvmxtDzAs@yZYmSvb)$bfhlGC+{|E6jY0V)`Q4_XwCSmZ4
P>qu?O4`;YL?1|A2<qsPr
delta 399
zcmYk0$x6du6ot=ChqQm9cCdA79qLe<s_8;-At-_`Auc3pg>DjPBjTznAE4$%6o+C9
zK7bD)K1274ClS=mJ@@<nb2(?EUX1G7*WeYv4jO4Bv7%#DLBpCt73&H*YC0?(^<H&1
z*q2gpE5*ub({VfYg>&Y6?Q7d{UC(#?mgm|Bm%ew^YB$e&Cm*sMd}_6a8yQKyj13)|
zCQNLZD8m*sdhd;35F2&{is?xR45~&oF@`wCNrzO8nz0@sLug0!K4Q;^-$l*|&hQQ>
zAj4Vw@gj>HiC4&DlK%zn2_Ybg%F<TkKE<!;W*0M<#T;1|K9sl!8_v@dHrS(v4V2YK
s!m2+(?nxT{vW<V)>Ni^<h4f!`iY5&U(dlB;B1c{#8<nueF{Fd#Z^q*=lK=n!
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 443e6ff..aae4075 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 f539a02..624c024 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 2d8606e..5bb1cc7 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) {
--
GitLab