[MODORDSTOR-416] Process piece and poline outbox independently

folio-org · Sep 27, 2024 · 9f9401d · 9f9401d
1 parent 346f299
commit 9f9401d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/org/folio/event/handler/HoldingCreateAsyncRecordHandler.java b/src/main/java/org/folio/event/handler/HoldingCreateAsyncRecordHandler.java
@@ -62,23 +62,23 @@ protected Future<Void> processInventoryCreationEvent(ResourceEvent resourceEvent
           processPoLinesUpdate(holdingId, tenantId, headers, conn),
           processPiecesUpdate(holdingId, tenantId, headers, conn)
         );
-        return GenericCompositeFuture.all(tenantIdUpdates)
-          .onSuccess(ar -> auditOutboxService.processOutboxEventLogs(headers))
-          .mapEmpty();
+        return GenericCompositeFuture.all(tenantIdUpdates).mapEmpty();
       });
   }
 
   private Future<Void> processPoLinesUpdate(String holdingId, String tenantId, Map<String, String> headers, Conn conn) {
     return poLinesService.getPoLinesByHoldingId(holdingId, conn)
       .compose(poLines -> updatePoLines(poLines, holdingId, tenantId, conn))
       .compose(poLines -> auditOutboxService.saveOrderLinesOutboxLogs(conn, poLines, OrderLineAuditEvent.Action.EDIT, headers))
+      .onSuccess(ar -> auditOutboxService.processOutboxEventLogs(headers))
       .mapEmpty();
   }
 
   private Future<Void> processPiecesUpdate(String holdingId, String tenantId, Map<String, String> headers, Conn conn) {
     return pieceService.getPiecesByHoldingId(holdingId, conn)
       .compose(pieces -> updatePieces(pieces, holdingId, tenantId, conn))
       .compose(pieces -> auditOutboxService.savePiecesOutboxLog(conn, pieces, PieceAuditEvent.Action.CREATE, headers))
+      .onSuccess(ar -> auditOutboxService.processOutboxEventLogs(headers))
       .mapEmpty();
   }
 

diff --git a/src/test/java/org/folio/event/handler/HoldingCreateAsyncRecordHandlerTest.java b/src/test/java/org/folio/event/handler/HoldingCreateAsyncRecordHandlerTest.java
@@ -77,6 +77,7 @@ public void initMocks() throws Exception {
       doReturn(Future.succeededFuture(Optional.empty())).when(consortiumConfigurationService).getConsortiumConfiguration(any());
       doReturn(Future.succeededFuture(true)).when(auditOutboxService).savePiecesOutboxLog(any(Conn.class), anyList(), any(), anyMap());
       doReturn(Future.succeededFuture(true)).when(auditOutboxService).saveOrderLinesOutboxLogs(any(Conn.class), anyList(), any(), anyMap());
+      doReturn(Future.succeededFuture(true)).when(auditOutboxService).processOutboxEventLogs(anyMap());
     }
   }
 

diff --git a/src/test/java/org/folio/event/handler/ItemCreateAsyncRecordHandlerTest.java b/src/test/java/org/folio/event/handler/ItemCreateAsyncRecordHandlerTest.java
@@ -70,6 +70,7 @@ public void initMocks() throws Exception {
       doReturn(pgClient).when(dbClient).getPgClient();
       doReturn(Future.succeededFuture(Optional.empty())).when(consortiumConfigurationService).getConsortiumConfiguration(any());
       doReturn(Future.succeededFuture(true)).when(auditOutboxService).savePiecesOutboxLog(any(Conn.class), anyList(), any(), anyMap());
+      doReturn(Future.succeededFuture(true)).when(auditOutboxService).processOutboxEventLogs(anyMap());
     }
   }