Merge branch 'refs/heads/UXPROD-5001' into UXPROD-5001_improvement

# Conflicts:
#	src/main/java/org/folio/dcb/listener/kafka/CirculationEventListener.java
#	src/main/java/org/folio/dcb/listener/kafka/EventData.java
#	src/main/java/org/folio/dcb/service/impl/CirculationServiceImpl.java

src/main/java/org/folio/dcb/controller/TransactionApiController.java

@@ -3,7 +3,7 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.folio.dcb.domain.dto.DcbTransaction;
-import org.folio.dcb.domain.dto.DcbTransactionUpdate;
+import org.folio.dcb.domain.dto.DcbUpdateTransaction;
 import org.folio.dcb.domain.dto.TransactionStatus;
 import org.folio.dcb.domain.dto.TransactionStatusResponseCollection;
 import org.folio.dcb.rest.resource.TransactionsApi;
@@ -76,8 +76,8 @@ public ResponseEntity<TransactionStatusResponseCollection> getTransactionStatusL
   }
 
   @Override
-  public ResponseEntity<Void> updateTransactionDetails(String dcbTransactionId, DcbTransactionUpdate dcbTransactionUpdate) {
-    transactionsService.updateTransactionDetails(dcbTransactionId, dcbTransactionUpdate);
+  public ResponseEntity<Void> updateTransactionDetails(String dcbTransactionId, DcbUpdateTransaction dcbUpdateTransaction) {
+    transactionsService.updateTransactionDetails(dcbTransactionId, dcbUpdateTransaction);
     return ResponseEntity.status(HttpStatus.NO_CONTENT)
       .build();
   }

src/main/java/org/folio/dcb/domain/mapper/TransactionMapper.java

@@ -3,7 +3,7 @@
 import org.folio.dcb.domain.dto.DcbItem;
 import org.folio.dcb.domain.dto.DcbPatron;
 import org.folio.dcb.domain.dto.DcbPickup;
-import org.folio.dcb.domain.dto.DcbTransactionUpdateItem;
+import org.folio.dcb.domain.dto.DcbUpdateItem;
 import org.folio.dcb.domain.dto.TransactionStatusResponseList;
 import org.folio.dcb.domain.entity.TransactionAuditEntity;
 import org.folio.dcb.domain.entity.TransactionEntity;
@@ -92,12 +92,12 @@ public DcbPickup mapTransactionEntityToDcbPickup(TransactionEntity transactionEn
       .build();
   }
 
-  public DcbItem convertTransactionUpdateItemToDcbItem(DcbTransactionUpdateItem updatedItem, TransactionEntity entity) {
+  public DcbItem convertTransactionUpdateItemToDcbItem(DcbUpdateItem dcbUpdateItem, TransactionEntity entity) {
     return DcbItem
       .builder()
-      .lendingLibraryCode(updatedItem.getLendingLibraryCode())
-      .barcode(updatedItem.getBarcode())
-      .materialType(updatedItem.getMaterialType())
+      .lendingLibraryCode(dcbUpdateItem.getLendingLibraryCode())
+      .barcode(dcbUpdateItem.getBarcode())
+      .materialType(dcbUpdateItem.getMaterialType())
       .title(entity.getItemTitle())
       .build();
   }

src/main/java/org/folio/dcb/listener/kafka/EventData.java

@@ -8,7 +8,6 @@ public class EventData {
   private String itemId;
   private String requestId;
   private boolean isDcb;
-  private String cancellationAdditionalInformation;
   private boolean isDcbReRequestCancellation;
 
   public enum EventType {

src/main/java/org/folio/dcb/service/CirculationService.java

@@ -20,8 +20,7 @@ public interface CirculationService {
   /**
    * Cancels a transaction request based on the provided transaction details.
    * <p>
-   * If {@code isItemUnavailableCancellation} is {@code true}, the cancellation reason
-   * will be updated to indicate item unavailability, and the notification for this
+   * If {@code isItemUnavailableCancellation} is {@code true}, the notification for this
    * cancellation will be suppressed by setting the {@code suppressNotification} flag
    * to {@code true}.
    * </p>

src/main/java/org/folio/dcb/service/TransactionsService.java

@@ -1,7 +1,7 @@
 package org.folio.dcb.service;
 
 import org.folio.dcb.domain.dto.DcbTransaction;
-import org.folio.dcb.domain.dto.DcbTransactionUpdate;
+import org.folio.dcb.domain.dto.DcbUpdateTransaction;
 import org.folio.dcb.domain.dto.TransactionStatus;
 import org.folio.dcb.domain.dto.TransactionStatusResponse;
 import org.folio.dcb.domain.dto.TransactionStatusResponseCollection;
@@ -18,6 +18,6 @@ public interface TransactionsService {
   TransactionStatusResponse updateTransactionStatus(String dcbTransactionId, TransactionStatus transactionStatus);
   TransactionStatusResponse getTransactionStatusById(String dcbTransactionId);
   TransactionStatusResponseCollection getTransactionStatusList(OffsetDateTime fromDate, OffsetDateTime toDate, Integer pageNumber, Integer pageSize);
-  void updateTransactionDetails(String dcbTransactionId, DcbTransactionUpdate dcbTransactionUpdate);
+  void updateTransactionDetails(String dcbTransactionId, DcbUpdateTransaction dcbUpdateTransaction);
 
   }

src/main/java/org/folio/dcb/service/impl/BaseLibraryService.java

@@ -8,7 +8,7 @@
 import org.folio.dcb.domain.dto.DcbItem;
 import org.folio.dcb.domain.dto.DcbPatron;
 import org.folio.dcb.domain.dto.DcbTransaction;
-import org.folio.dcb.domain.dto.DcbTransactionUpdateItem;
+import org.folio.dcb.domain.dto.DcbUpdateItem;
 import org.folio.dcb.domain.dto.TransactionStatus;
 import org.folio.dcb.domain.dto.TransactionStatusResponse;
 import org.folio.dcb.domain.entity.TransactionEntity;
@@ -138,9 +138,9 @@ public void updateTransactionEntity(TransactionEntity transactionEntity, Transac
     transactionRepository.save(transactionEntity);
   }
 
-  public void updateTransactionDetails(TransactionEntity transactionEntity, DcbTransactionUpdateItem updatedItem) {
+  public void updateTransactionDetails(TransactionEntity transactionEntity, DcbUpdateItem dcbUpdateItem) {
     DcbPatron dcbPatron = transactionMapper.mapTransactionEntityToDcbPatron(transactionEntity);
-    DcbItem dcbItem = transactionMapper.convertTransactionUpdateItemToDcbItem(updatedItem, transactionEntity);
+    DcbItem dcbItem = transactionMapper.convertTransactionUpdateItemToDcbItem(dcbUpdateItem, transactionEntity);
     checkItemExistsInInventoryAndThrow(dcbItem.getBarcode());
     CirculationItem item = circulationItemService.checkIfItemExistsAndCreate(dcbItem, transactionEntity.getServicePointId());
     dcbItem.setId(item.getId());

src/main/java/org/folio/dcb/service/impl/TransactionsServiceImpl.java

@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.folio.dcb.domain.dto.DcbTransaction;
-import org.folio.dcb.domain.dto.DcbTransactionUpdate;
+import org.folio.dcb.domain.dto.DcbUpdateTransaction;
 import org.folio.dcb.domain.dto.TransactionStatus;
 import org.folio.dcb.domain.dto.TransactionStatusResponse;
 import org.folio.dcb.domain.dto.TransactionStatusResponseCollection;
@@ -112,7 +112,7 @@ public TransactionStatusResponseCollection getTransactionStatusList(OffsetDateTi
   }
 
   @Override
-  public void updateTransactionDetails(String dcbTransactionId, DcbTransactionUpdate dcbTransactionUpdate) {
+  public void updateTransactionDetails(String dcbTransactionId, DcbUpdateTransaction dcbUpdateTransaction) {
     var transactionEntity = getTransactionEntityOrThrow(dcbTransactionId);
     if (!TransactionStatus.StatusEnum.CREATED.equals(transactionEntity.getStatus())) {
       throw new StatusException(String.format(
@@ -121,7 +121,7 @@ public void updateTransactionDetails(String dcbTransactionId, DcbTransactionUpda
     if (DcbTransaction.RoleEnum.LENDER.equals(transactionEntity.getRole())) {
       throw new IllegalArgumentException("Item details cannot be updated for lender role");
     }
-    baseLibraryService.updateTransactionDetails(transactionEntity, dcbTransactionUpdate.getItem());
+    baseLibraryService.updateTransactionDetails(transactionEntity, dcbUpdateTransaction.getItem());
   }
 
   private TransactionStatusResponse generateTransactionStatusResponseFromTransactionEntity(TransactionEntity transactionEntity) {

src/main/java/org/folio/dcb/utils/TransactionHelper.java

@@ -22,7 +22,6 @@ public class TransactionHelper {
   public static final String LASTNAME = "lastName";
   public static final String DCB_INSTANCE_TITLE = "DCB_INSTANCE";
   public static final String DCB_REQUESTER_LASTNAME = "DcbSystem";
-  public static final String CANCELLATION_ADDITIONAL_INFORMATION = "cancellationAdditionalInformation";
 
   private TransactionHelper(){}
 
@@ -67,8 +66,6 @@ public static EventData parseRequestEvent(String eventPayload){
           default -> log.info("parseRequestEvent:: Request status {} is not supported", requestStatus);
         }
         eventData.setDcb(checkDcbRequest(kafkaEvent));
-        eventData.setCancellationAdditionalInformation(kafkaEvent.getNewNode().has(CANCELLATION_ADDITIONAL_INFORMATION) ?
-          kafkaEvent.getNewNode().get(CANCELLATION_ADDITIONAL_INFORMATION).asText() : null);
         return eventData;
       }
     return null;

src/main/resources/swagger.api/dcb_transaction.yaml

@@ -32,7 +32,7 @@ paths:
       parameters:
         - $ref: '#/components/parameters/dcbTransactionId'
       requestBody:
-        $ref: "#/components/requestBodies/DCBTransactionUpdate"
+        $ref: "#/components/requestBodies/DcbUpdateTransaction"
       responses:
         '204':
           description: 'Transaction updated successfully'
@@ -126,13 +126,13 @@ components:
         application/json:
           schema:
             $ref: "schemas/dcbTransaction.yaml#/DcbTransaction"
-    DCBTransactionUpdate:
+    DcbUpdateTransaction:
       description: DCB transaction update object
       required: true
       content:
         application/json:
           schema:
-            $ref: "schemas/DcbTransactionUpdate.yaml#/DcbTransactionUpdate"
+            $ref: "schemas/dcbUpdateTransaction.yaml#/DcbUpdateTransaction"
   responses:
     TransactionStatus:
       description: Transaction Status object

src/main/resources/swagger.api/schemas/dcbUpdateItem.yaml

@@ -0,0 +1,18 @@
+DcbUpdateItem:
+  description: Item metadata required for updating the existing transaction
+  type: object
+  properties:
+    barcode:
+      description: The barcode of the item as specified in the lending library
+      type: string
+    materialType:
+      description: The “hub-normalized” form of the item item type, used in the circulation rules for determining the correct loan policy.
+      type: string
+    lendingLibraryCode:
+      description: The code which identifies the lending library
+      type: string
+  additionalProperties: false
+  required:
+    - barcode
+    - materialType
+    - lendingLibraryCode

src/main/resources/swagger.api/schemas/dcbUpdateTransaction.yaml

@@ -0,0 +1,6 @@
+DcbUpdateTransaction:
+  type: object
+  properties:
+    item:
+      $ref: 'dcbUpdateItem.yaml#/DcbUpdateItem'
+