From 6ab4409e263312afb15418ca303aa91ef6032c8a Mon Sep 17 00:00:00 2001
From: Fernando Ferreira de Lima Filho <fferreiralf@ufrn.edu.br>
Date: Sat, 28 May 2022 15:03:12 -0300
Subject: [PATCH] feature: client integrationd with balance service
---
.../ufrn/imd/balance/controller/BalanceController.java | 4 ++--
.../main/java/br/ufrn/imd/client/utils/MachineState.java | 9 ++++++---
.../main/java/br/ufrn/imd/client/utils/NameSpace.java | 2 +-
.../ufrn/imd/deposit/controller/DepositController.java | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/WebServices/balance/src/main/java/br/ufrn/imd/balance/controller/BalanceController.java b/WebServices/balance/src/main/java/br/ufrn/imd/balance/controller/BalanceController.java
index bc740b4..c178d8b 100644
--- a/WebServices/balance/src/main/java/br/ufrn/imd/balance/controller/BalanceController.java
+++ b/WebServices/balance/src/main/java/br/ufrn/imd/balance/controller/BalanceController.java
@@ -4,15 +4,15 @@ package br.ufrn.imd.balance.controller;
import br.ufrn.imd.balance.domain.Client;
import br.ufrn.imd.balance.service.BalanceService;
import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
-@AllArgsConstructor
+@RequiredArgsConstructor
@RestController
@RequestMapping("/banking/client/{id}")
public class BalanceController {
- @Autowired
private final BalanceService service;
@GetMapping
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 e65c0ec..1832bfb 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
@@ -110,11 +110,14 @@ public class MachineState {
}
} else if(state.equals(DEPOSIT)) {
String v = sc.nextLine();
- DepositMessage depositMessage = new DepositMessage(this.client, Double.parseDouble(v));
- ResponseEntity<Account> response = restTemplate.postForEntity(HOST_DEPOSIT_SERVICE, depositMessage, Account.class);
+ ResponseEntity<Client> response =
+ restTemplate.getForEntity(
+ HOST_DEPOSIT_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())
);
}
try {
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 8d93bf2..6515c3b 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
@@ -8,7 +8,7 @@ public class NameSpace {
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 static final String HOST_DEPOSIT_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_DEPOSIT_SERVICE, "deposit");
+ 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");
}
diff --git a/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/controller/DepositController.java b/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/controller/DepositController.java
index 1511647..104333f 100644
--- a/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/controller/DepositController.java
+++ b/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/controller/DepositController.java
@@ -14,7 +14,7 @@ public class DepositController {
@Autowired
private final DepositService service;
- @PatchMapping
+ @GetMapping
@ResponseStatus(HttpStatus.OK)
public Client deposit(@PathVariable Integer id, @RequestParam(name = "value") Double value) {
return service.deposit(value, new Client(id));
--
GitLab