MSEARCH-794: refactor inventory clients

folio-org · Aug 16, 2024 · c208148 · c208148
1 parent 2c03b2f
commit c208148
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/src/main/java/org/folio/search/client/InventoryHoldingClient.java b/src/main/java/org/folio/search/client/InventoryHoldingClient.java
@@ -20,8 +20,9 @@ InventoryRecordDtoCollection<InventoryHoldingDto> getHoldings(@RequestParam("que
                                                                 @RequestParam("limit") int limit);
 
   @GetMapping(path = "/holdings", produces = APPLICATION_JSON_VALUE)
-  InventoryRecordDtoCollection<InventoryHoldingDto> getHoldings(
-    @RequestParam("limit") int limit, @RequestParam("totalRecords") String totalRecords);
+  InventoryRecordDtoCollection<InventoryHoldingDto> getHoldings(@RequestParam("offset") int offset,
+                                                                @RequestParam("limit") int limit,
+                                                                @RequestParam("totalRecords") String totalRecords);
 
   record InventoryHoldingDto(String id) {}
 }
diff --git a/src/main/java/org/folio/search/client/InventoryInstanceClient.java b/src/main/java/org/folio/search/client/InventoryInstanceClient.java
@@ -20,8 +20,9 @@ InventoryRecordDtoCollection<InventoryInstanceDto> getInstances(@RequestParam("q
                                                                   @RequestParam("limit") int limit);
 
   @GetMapping(path = "/instances", produces = APPLICATION_JSON_VALUE)
-  InventoryRecordDtoCollection<InventoryInstanceDto> getInstances(
-    @RequestParam("limit") int limit, @RequestParam("totalRecords") String totalRecords);
+  InventoryRecordDtoCollection<InventoryInstanceDto> getInstances(@RequestParam("offset") int offset,
+                                                                  @RequestParam("limit") int limit,
+                                                                  @RequestParam("totalRecords") String totalRecords);
 
   record InventoryInstanceDto(String id) {}
 }
diff --git a/src/main/java/org/folio/search/client/InventoryItemClient.java b/src/main/java/org/folio/search/client/InventoryItemClient.java
@@ -20,8 +20,9 @@ InventoryRecordDtoCollection<InventoryItemDto> getItems(@RequestParam("query") C
                                                           @RequestParam("limit") int limit);
 
   @GetMapping(path = "/items", produces = APPLICATION_JSON_VALUE)
-  InventoryRecordDtoCollection<InventoryItemDto> getItems(
-    @RequestParam("limit") int limit, @RequestParam("totalRecords") String totalRecords);
+  InventoryRecordDtoCollection<InventoryItemDto> getItems(@RequestParam("offset") int offset,
+                                                          @RequestParam("limit") int limit,
+                                                          @RequestParam("totalRecords") String totalRecords);
 
   record InventoryItemDto(String id) {}
 }
diff --git a/src/main/java/org/folio/search/integration/InventoryService.java b/src/main/java/org/folio/search/integration/InventoryService.java
@@ -2,6 +2,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.ObjectUtils;
@@ -61,9 +62,9 @@ public int fetchInventoryRecordCount(InventoryRecordType recordType) {
 
     try {
       var result = switch (recordType) {
-        case INSTANCE -> inventoryInstanceClient.getInstances(0, TotalRecordsType.EXACT.getValue());
-        case ITEM -> inventoryItemClient.getItems(0, TotalRecordsType.EXACT.getValue());
-        case HOLDING -> inventoryHoldingClient.getHoldings(0, TotalRecordsType.EXACT.getValue());
+        case INSTANCE -> inventoryInstanceClient.getInstances(0, 0, TotalRecordsType.EXACT.getValue());
+        case ITEM -> inventoryItemClient.getItems(0, 0, TotalRecordsType.EXACT.getValue());
+        case HOLDING -> inventoryHoldingClient.getHoldings(0, 0, TotalRecordsType.EXACT.getValue());
       };
 
       if (result == null) {
@@ -102,7 +103,9 @@ public void publishReindexRecordsRange(MergeRangeEntity rangeEntity) {
   }
 
   private List<UUID> fetchInstances(CqlQuery cqlQuery, int offset, int limit) {
-    var result = inventoryInstanceClient.getInstances(cqlQuery, offset, limit);
+    var result = Optional.ofNullable(cqlQuery)
+      .map(query -> inventoryInstanceClient.getInstances(query, offset, limit))
+      .orElseGet(() -> inventoryInstanceClient.getInstances(offset, limit, TotalRecordsType.AUTO.getValue()));
 
     if (result == null) {
       log.warn("Failed to retrieve Inventory Instances, [query: {}, offset: {}, limit: {}]", cqlQuery, offset, limit);
@@ -116,7 +119,9 @@ private List<UUID> fetchInstances(CqlQuery cqlQuery, int offset, int limit) {
   }
 
   private List<UUID> fetchItems(CqlQuery cqlQuery, int offset, int limit) {
-    var result = inventoryItemClient.getItems(cqlQuery, offset, limit);
+    var result = Optional.ofNullable(cqlQuery)
+      .map(query -> inventoryItemClient.getItems(query, offset, limit))
+      .orElseGet(() -> inventoryItemClient.getItems(offset, limit, TotalRecordsType.AUTO.getValue()));
 
     if (result == null) {
       log.warn("Failed to retrieve Inventory Items, [query: {}, offset: {}, limit: {}]", cqlQuery, offset, limit);
@@ -130,7 +135,9 @@ private List<UUID> fetchItems(CqlQuery cqlQuery, int offset, int limit) {
   }
 
   private List<UUID> fetchHoldings(CqlQuery cqlQuery, int offset, int limit) {
-    var result = inventoryHoldingClient.getHoldings(cqlQuery, offset, limit);
+    var result = Optional.ofNullable(cqlQuery)
+      .map(query -> inventoryHoldingClient.getHoldings(query, offset, limit))
+      .orElseGet(() -> inventoryHoldingClient.getHoldings(offset, limit, TotalRecordsType.AUTO.getValue()));
 
     if (result == null) {
       log.warn("Failed to retrieve Inventory Holdings, [query: {}, offset: {}, limit: {}]", cqlQuery, offset, limit);