MODTLR-19 Change schema, response type

folio-org · Feb 21, 2024 · 5230a18 · 5230a18
1 parent eec1348
commit 5230a18
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/main/java/org/folio/client/feign/DcbClient.java b/src/main/java/org/folio/client/feign/DcbClient.java
@@ -15,7 +15,7 @@
 public interface DcbClient {
 
   @PostMapping("/ecs-tlr-transactions")
-  DcbTransaction createDcbTransaction(DcbTransaction dcbTransaction);
+  TransactionStatusResponse createDcbTransaction(DcbTransaction dcbTransaction);
 
   @GetMapping("/transactions/{dcbTransactionId}/status")
   TransactionStatusResponse getDcbTransactionStatus(@PathVariable String dcbTransactionId);

diff --git a/src/main/resources/swagger.api/schemas/dcbTransaction.yaml b/src/main/resources/swagger.api/schemas/dcbTransaction.yaml
@@ -3,10 +3,6 @@ DcbTransaction:
   properties:
     item:
       $ref: 'dcbItem.yaml#/DcbItem'
-    patron:
-      $ref: 'dcbPatron.yaml#/DcbPatron'
-    pickup:
-      $ref: 'dcbPickup.yaml#/DcbPickup'
     role:
       type: string
       enum:

diff --git a/src/test/java/org/folio/client/DcbClientTest.java b/src/test/java/org/folio/client/DcbClientTest.java
@@ -26,7 +26,12 @@ void canCreateDcbTransaction() {
     DcbTransaction dcbTransaction = new DcbTransaction()
       .role(DcbTransaction.RoleEnum.BORROWER)
       .requestId(requestId);
-    when(dcbClient.createDcbTransaction(dcbTransaction)).thenReturn(dcbTransaction);
+    TransactionStatusResponse transactionStatusResponse = new TransactionStatusResponse()
+      .status(TransactionStatusResponse.StatusEnum.CANCELLED)
+      .message("test message")
+      .item(dcbTransaction.getItem())
+      .requestId(requestId);
+    when(dcbClient.createDcbTransaction(dcbTransaction)).thenReturn(transactionStatusResponse);
     var response = dcbClient.createDcbTransaction(dcbTransaction);
     assertNotNull(response);
     assertEquals(DcbTransaction.RoleEnum.BORROWER, response.getRole());
@@ -44,8 +49,6 @@ void canGetDcbTransactionStatus() {
       .status(TransactionStatusResponse.StatusEnum.CANCELLED)
       .message("test message")
       .item(dcbTransaction.getItem())
-      .patron(dcbTransaction.getPatron())
-      .pickup(dcbTransaction.getPickup())
       .requestId(requestId);
     when(dcbClient.getDcbTransactionStatus(transactionId)).thenReturn(transactionStatusResponse);
     var response = dcbClient.getDcbTransactionStatus(transactionId);
@@ -67,8 +70,6 @@ void canChangeDcbTransactionStatus() {
       .status(TransactionStatusResponse.StatusEnum.CANCELLED)
       .message("test message")
       .item(dcbTransaction.getItem())
-      .patron(dcbTransaction.getPatron())
-      .pickup(dcbTransaction.getPickup())
       .requestId(requestId);
     when(dcbClient.changeDcbTransactionStatus(transactionId, targetStatus))
       .thenReturn(transactionStatusResponse);