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 82558d178a69ac8f9199141cc29a710cb80901e3..31e5aa62650821db8c3122b73f2e30a592f21465 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 38daf84c8662102833ab579f23945f582034ac04..b3e0f26742668c933e0cf1ac985ecc3c37253940 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; } }