Change bank/transfer/id route to use transferId instead of endToEndId

Author: ASitnikov

server/src/main/java/com/exactpro/blockchain/api/bank/BankHandler.java

@@ -39,13 +39,13 @@ public Mono<ServerResponse> getAllTransfers(ServerRequest request) {
     }
 
     public Mono<ServerResponse> getTransfer(ServerRequest request) {
-        String endToEndId = request.pathVariable("endToEndId");
-        return ServerResponse.ok().body(transferRepository.getByEndToEndId(endToEndId), Transfer.class);
+        int transferId = Integer.parseInt(request.pathVariable("transferId"));
+        return ServerResponse.ok().body(transferRepository.getByTransferId(transferId), Transfer.class);
     }
 
     public Mono<ServerResponse> getMessages(ServerRequest request) {
-        String endToEndId = request.pathVariable("endToEndId");
-        return ServerResponse.ok().body(messageRepository.findByEndToEndId(endToEndId), Transfer.class);
+        int transferId = Integer.parseInt(request.pathVariable("transferId"));
+        return ServerResponse.ok().body(messageRepository.findByTransferId(transferId), Transfer.class);
     }
 
     public Mono<ServerResponse> getAllIbans(ServerRequest request) {

server/src/main/java/com/exactpro/blockchain/api/bank/BankRouter.java

@@ -18,8 +18,8 @@ public class BankRouter {
     @Bean
     public @NonNull RouterFunction<ServerResponse> bankRoutes(@NonNull BankHandler bankHandler) {
         return route(GET(contentPath + "/api/bank/transfer"), bankHandler::getAllTransfers)
-            .andRoute(GET(contentPath + "/api/bank/transfer/{endToEndId}"), bankHandler::getTransfer)
-            .andRoute(GET(contentPath + "/api/bank/transfer/{endToEndId}/message"), bankHandler::getMessages)
+            .andRoute(GET(contentPath + "/api/bank/transfer/{transferId}"), bankHandler::getTransfer)
+            .andRoute(GET(contentPath + "/api/bank/transfer/{transferId}/message"), bankHandler::getMessages)
             .andRoute(GET(contentPath + "/api/bank/iban"), bankHandler::getAllIbans);
     }
 }

server/src/main/java/com/exactpro/blockchain/repository/MessageRepository.java

@@ -7,6 +7,6 @@
 import reactor.core.publisher.Flux;
 
 public interface MessageRepository extends ReactiveCrudRepository<Message, String> {
-    @Query("SELECT m.* FROM Message m INNER JOIN Transfer t ON m.transferId = t.transferId WHERE t.endToEndId = :endToEndId")
-    Flux<Message> findByEndToEndId(@Param("endToEndId") String currencyCode);
+    @Query("SELECT m.* FROM Message m INNER JOIN Transfer t ON m.transferId = t.transferId WHERE t.transferId = :transferId")
+    Flux<Message> findByTransferId(@Param("transferId") int transferId);
 }

server/src/main/java/com/exactpro/blockchain/repository/TransferRepository.java

@@ -13,15 +13,13 @@ public interface TransferRepository extends ReactiveCrudRepository<Transfer, Int
 
     @NonNull Flux<Transfer> findByClientId(int clientId);
 
-    @NonNull Flux<Transfer> findByEndToEndId(String endToEndId);
-
-    default @NonNull Mono<Transfer> getByEndToEndId(String endToEndId) {
+    default @NonNull Mono<Transfer> getByTransferId(int transferId) {
         return
-            findByEndToEndId(endToEndId)
+            findByTransferId(transferId)
             .single()
             .onErrorMap(
                 NoSuchElementException.class,
-                error -> new Exception(String.format("Transfer with EndToEndId '%s' doesn't exist", endToEndId), error)
+                error -> new Exception(String.format("Transfer with transferId '%d' doesn't exist", transferId), error)
             );
     }
 }