Add responses for failed menjacnica transfers and update api key for exchange rates

user-service/src/main/java/rs/edu/raf/banka1/controller/TransferController.java

@@ -54,12 +54,13 @@ public ResponseEntity<List<ExchangeRateDto>> getExchangeRates() {
             @ApiResponse(responseCode = "403", description = "Forbidden"),
             @ApiResponse(responseCode = "500", description = "Internal server error")
     })
-    public ResponseEntity<Void> createTransfer(@RequestBody CreateTransferRequest createTransferRequest) {
+    public ResponseEntity<String> createTransfer(@RequestBody CreateTransferRequest createTransferRequest) {
         Long id = transferService.createTransfer(createTransferRequest);
-        if (id > -1) {
-            transferService.processTransfer(id);
+        if (id == -1L) {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
         }
-        return ResponseEntity.ok().build();
+        String msg = transferService.processTransfer(id);
+        return msg == null ? ResponseEntity.ok().body("ok") : ResponseEntity.badRequest().body(msg);
     }
 
     @GetMapping(value = "/getAll/{accountNumber}", produces = MediaType.APPLICATION_JSON_VALUE)

user-service/src/main/java/rs/edu/raf/banka1/services/TransferService.java

@@ -15,7 +15,7 @@ public interface TransferService {
 
     Long createTransfer(CreateTransferRequest createTransferRequest);
 
-    void processTransfer(Long id);
+    String processTransfer(Long id);
 
     TransferDto getTransferById(Long id);
 

user-service/src/main/java/rs/edu/raf/banka1/services/implementations/TransferServiceImpl.java

@@ -175,11 +175,11 @@ public Long createTransfer(CreateTransferRequest request) {
     }
 
     @Override
-    public void processTransfer(Long id) {
+    public String processTransfer(Long id) {
         Optional<Transfer> transferOpt = transferRepository.findById(id);
         if (transferOpt.isEmpty()) {
             Logger.error("Transfer not found for processing: {}", id);
-            return;
+            return "Transfer not found for processing";
         }
         Transfer transfer = transferOpt.get();
         BankAccount senderAccount = transfer.getSenderBankAccount();
@@ -204,7 +204,7 @@ public void processTransfer(Long id) {
             transfer.setStatus(TransactionStatus.DENIED);
             transferRepository.save(transfer);
             Logger.info("Transfer {} denied. Reason: invalid parameters or insufficient balance.", id);
-            return;
+            return "Transfer denied. Invalid parameters or insufficient balance";
         }
 
         BankAccount rsdBank = bankAccountRepository.findBankByCurrencyCode("RSD").orElse(null);
@@ -228,7 +228,7 @@ public void processTransfer(Long id) {
             Logger.info("Transfer {} denied. Reason: bank not found for currency conversion.", id);
             transfer.setStatus(TransactionStatus.DENIED);
             transferRepository.save(transfer);
-            return;
+            return "Transfer denied. Reason: bank not found for currency conversion.";
         }
 
         double exchangeRate = senderCurrency.getToRSD() * recipientCurrency.getFromRSD();
@@ -258,6 +258,7 @@ public void processTransfer(Long id) {
 
         transferRepository.save(transfer);
         bankAccountRepository.saveAll(List.of(fromBank, toBank, senderAccount, recipientAccount));
+        return null;
     }
 
     @Override

user-service/src/main/resources/examples/application.properties.example

@@ -32,7 +32,7 @@ oauth.jwt.secret=secret_key
 
 
 # API TOKENS:
-exchangeRateAPIToken=a97e7d453aa0cfb0295f5bba
+exchangeRateAPIToken=4459637dd05bd06367a6fa32
 
 # API URLs:
 exchangeRateApiUrl= https://v6.exchangerate-api.com/v6/