[MODORDSTOR-356] - Completed the forgotten places to populate statusU…

…pdatedDate
folio-org · Nov 14, 2023 · 2197b20 · 2197b20
1 parent aa27190
commit 2197b20
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/org/folio/helper/CheckinReceivePiecesHelper.java b/src/main/java/org/folio/helper/CheckinReceivePiecesHelper.java
@@ -30,6 +30,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -400,8 +401,9 @@ protected Future<Map<String, List<Piece>>> storeUpdatedPieceRecords(Map<String,
       .ofValues(piecesGroupedByPoLine)
       .flatMap(List::stream)
       .filter(this::isSuccessfullyProcessedPiece)
-      .map((Piece piece) -> storeUpdatedPieceRecord(piece, requestContext))
-      .collect(Collectors.toList());
+      .map(piece -> piece.withStatusUpdatedDate(new Date()))
+      .map(piece -> storeUpdatedPieceRecord(piece, requestContext))
+      .toList();
 
     return GenericCompositeFuture.join(futures)
       .map(v -> piecesGroupedByPoLine);

diff --git a/src/main/java/org/folio/service/orders/flows/update/open/OpenCompositeOrderPieceService.java b/src/main/java/org/folio/service/orders/flows/update/open/OpenCompositeOrderPieceService.java
@@ -5,6 +5,7 @@
 import static org.folio.orders.utils.HelperUtils.collectResultsOnSuccess;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletionException;
@@ -121,18 +122,23 @@ public Future<Void> updatePieceRecord(Piece piece, RequestContext requestContext
       .compose(v -> inventoryManager.updateItemWithPieceFields(piece, requestContext))
       .onSuccess(vVoid ->
         pieceStorageService.getPieceById(piece.getId(), requestContext).onSuccess(pieceStorage -> {
+            Piece.ReceivingStatus receivingStatusUpdate = piece.getReceivingStatus();
             Piece.ReceivingStatus receivingStatusStorage = pieceStorage.getReceivingStatus();
+            boolean isReceivingStatusChanged = receivingStatusStorage.compareTo(receivingStatusUpdate) != 0;
+
+            if(isReceivingStatusChanged) {
+              piece.setStatusUpdatedDate(new Date());
+            }
+
             pieceStorageService.updatePiece(piece, requestContext)
               .onSuccess(ok -> {
                 promise.complete();
                 JsonObject messageToEventBus = new JsonObject();
                 messageToEventBus.put("poLineIdUpdate", piece.getPoLineId());
-
-                Piece.ReceivingStatus receivingStatusUpdate = piece.getReceivingStatus();
                 logger.debug("receivingStatusStorage -- {}", receivingStatusStorage);
                 logger.debug("receivingStatusUpdate -- {}", receivingStatusUpdate);
 
-                if (receivingStatusStorage.compareTo(receivingStatusUpdate) != 0) {
+                if (isReceivingStatusChanged) {
                   receiptStatusPublisher.sendEvent(MessageAddress.RECEIPT_STATUS, messageToEventBus, requestContext);
                 }
               })