From eab500c50e61b6081a5b661a7186c9e89109b800 Mon Sep 17 00:00:00 2001
From: mariaeloi <mariaeduardaeloi@outlook.com>
Date: Fri, 20 May 2022 22:31:27 -0300
Subject: [PATCH] altera rota e retorno de withdrawal
---
.../ufrn/imd/withdrawal/controller/WithdrawalController.java | 5 ++---
.../br/ufrn/imd/withdrawal/service/WithdrawalService.java | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/controller/WithdrawalController.java b/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/controller/WithdrawalController.java
index 82558d1..31e5aa6 100644
--- a/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/controller/WithdrawalController.java
+++ b/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/controller/WithdrawalController.java
@@ -1,6 +1,5 @@
package br.ufrn.imd.withdrawal.controller;
-import br.ufrn.imd.withdrawal.domain.Account;
import br.ufrn.imd.withdrawal.domain.Client;
import br.ufrn.imd.withdrawal.service.WithdrawalService;
import lombok.AllArgsConstructor;
@@ -10,14 +9,14 @@ import org.springframework.web.bind.annotation.*;
@AllArgsConstructor
@RestController
-@RequestMapping("/banking/client/{id}/withdrawal")
+@RequestMapping("/banking/client/{id}")
public class WithdrawalController {
@Autowired
private final WithdrawalService service;
@PatchMapping
@ResponseStatus(HttpStatus.OK)
- public Account withdrawal(@PathVariable Integer id, @RequestParam(name = "value") Double value) {
+ public Client withdrawal(@PathVariable Integer id, @RequestParam(name = "value") Double value) {
return service.withdraw(value, new Client(id));
}
}
diff --git a/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/service/WithdrawalService.java b/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/service/WithdrawalService.java
index 38daf84..b3e0f26 100644
--- a/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/service/WithdrawalService.java
+++ b/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/service/WithdrawalService.java
@@ -15,7 +15,7 @@ public class WithdrawalService {
@Autowired
private final ClientRepository clientRepository;
- public Account withdraw(Double value, Client client) {
+ public Client withdraw(Double value, Client client) {
client = clientRepository.findById(client.getId())
.orElseThrow(() -> new RuntimeException("Invalid user!"));
@@ -26,6 +26,6 @@ public class WithdrawalService {
client = clientRepository.save(client);
log.info("Withdrawal concluded!");
log.info(String.format("Account balance: R$ %.2f", client.getAccount().getBalance()));
- return account;
+ return client;
}
}
--
GitLab