[MODORDSTOR-416] Fix item handler unit tests

folio-org · Sep 26, 2024 · 25a014a · 25a014a
1 parent 91e0d1e
commit 25a014a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/org/folio/event/handler/HoldingCreateAsyncRecordHandler.java b/src/main/java/org/folio/event/handler/HoldingCreateAsyncRecordHandler.java
@@ -7,6 +7,7 @@
 
 import org.apache.logging.log4j.Logger;
 import org.folio.event.dto.InventoryFields;
+import org.folio.event.dto.ResourceEvent;
 import org.folio.okapi.common.GenericCompositeFuture;
 import org.folio.rest.jaxrs.model.Location;
 import org.folio.rest.jaxrs.model.Piece;
@@ -38,7 +39,8 @@ public HoldingCreateAsyncRecordHandler(Context context, Vertx vertx) {
   }
 
   @Override
-  protected Future<Void> processInventoryCreationEvent(JsonObject holdingObject, String tenantId) {
+  protected Future<Void> processInventoryCreationEvent(ResourceEvent resourceEvent, String tenantId) {
+    var holdingObject = JsonObject.mapFrom(resourceEvent.getNewValue());
     var holdingId = holdingObject.getString(InventoryFields.ID.getValue());
     var dbClient = new DBClient(getVertx(), tenantId);
     var tenantIdUpdates = List.of(

diff --git a/src/main/java/org/folio/event/handler/InventoryCreateAsyncRecordHandler.java b/src/main/java/org/folio/event/handler/InventoryCreateAsyncRecordHandler.java
@@ -50,9 +50,8 @@ public Future<String> handle(KafkaConsumerRecord<String, String> kafkaConsumerRe
         return Future.succeededFuture();
       }
 
-      var inventoryObject = JsonObject.mapFrom(resourceEvent.getNewValue());
       var tenantId = extractTenantFromHeaders(kafkaConsumerRecord.headers());
-      return processInventoryCreationEvent(inventoryObject, tenantId)
+      return processInventoryCreationEvent(resourceEvent, tenantId)
         .onSuccess(v -> getLogger().info("handle:: '{}' event for '{}' processed successfully", eventType, inventoryEventType.getTopicName()))
         .onFailure(t -> getLogger().error("Failed to process event: {}", kafkaConsumerRecord.value(), t))
         .map(kafkaConsumerRecord.key());
@@ -62,7 +61,7 @@ public Future<String> handle(KafkaConsumerRecord<String, String> kafkaConsumerRe
     }
   }
 
-  protected abstract Future<Void> processInventoryCreationEvent(JsonObject inventoryObject, String tenantId);
+  protected abstract Future<Void> processInventoryCreationEvent(ResourceEvent resourceEvent, String tenantId);
 
   protected abstract Logger getLogger();
 

diff --git a/src/main/java/org/folio/event/handler/ItemCreateAsyncRecordHandler.java b/src/main/java/org/folio/event/handler/ItemCreateAsyncRecordHandler.java
@@ -13,6 +13,7 @@
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.logging.log4j.Logger;
 import org.folio.event.dto.InventoryFields;
+import org.folio.event.dto.ResourceEvent;
 import org.folio.rest.jaxrs.model.Piece;
 import org.folio.rest.persist.DBClient;
 import org.folio.services.piece.PieceService;
@@ -31,7 +32,8 @@ public ItemCreateAsyncRecordHandler(Context context, Vertx vertx) {
   }
 
   @Override
-  protected Future<Void> processInventoryCreationEvent(JsonObject itemObject, String tenantId) {
+  protected Future<Void> processInventoryCreationEvent(ResourceEvent resourceEvent, String tenantId) {
+    var itemObject = JsonObject.mapFrom(resourceEvent.getNewValue());
     var itemId = itemObject.getString(InventoryFields.ID.getValue());
     var dbClient = new DBClient(getVertx(), tenantId);
     return pieceService.getPiecesByItemId(itemId, dbClient)

diff --git a/src/test/java/org/folio/event/handler/ItemCreateAsyncRecordHandlerTest.java b/src/test/java/org/folio/event/handler/ItemCreateAsyncRecordHandlerTest.java
@@ -107,8 +107,7 @@ void positive_shouldProcessItemCreateEvent()
       createPiece(pieceId3, itemId).withHoldingId(holdingId).withReceivingTenantId(tenantId)
     );
 
-    doReturn(Future.succeededFuture(pieces))
-      .when(pieceService).getPiecesByItemId(eq(itemId), any(DBClient.class));
+    doReturn(Future.succeededFuture(pieces)).when(pieceService).getPiecesByItemId(eq(itemId), any(DBClient.class));
     doReturn(Future.succeededFuture()).when(pieceService).updatePieces(eq(expectedPieces), any(DBClient.class));
     doReturn(pgClient).when(dbClient).getPgClient();
     doReturn(tenantId).when(dbClient).getTenantId();
@@ -118,10 +117,10 @@ void positive_shouldProcessItemCreateEvent()
     }).when(pgClient).withConn(any());
 
     Method processItemCreateMethod = ItemCreateAsyncRecordHandler.class
-      .getDeclaredMethod("processItemCreationEvent", ResourceEvent.class, DBClient.class);
+      .getDeclaredMethod("processInventoryCreationEvent", ResourceEvent.class, String.class);
     processItemCreateMethod.setAccessible(true);
 
-    processItemCreateMethod.invoke(handler, resourceEvent, dbClient);
+    processItemCreateMethod.invoke(handler, resourceEvent, tenantId);
 
     verify(pieceService).getPiecesByItemId(eq(itemId), any(DBClient.class));
     verify(pieceService).updatePieces(eq(expectedPieces), any(DBClient.class));