[MODINVSTOR-1243] Add tenantId to items

folio-org · Aug 27, 2024 · a61fc63 · a61fc63
1 parent d135a4e
commit a61fc63
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/org/folio/inventory/resources/TenantItems.java b/src/main/java/org/folio/inventory/resources/TenantItems.java
@@ -41,6 +41,7 @@ public class TenantItems {
   private static final String TENANT_ITEMS_PATH = "/inventory/tenant-items";
   public static final String ITEMS_FIELD = "items";
   public static final String TOTAL_RECORDS_FIELD = "totalRecords";
+  public static final String TENANT_ID_FIELD = "tenantId";
 
   private final HttpClient client;
 
@@ -76,7 +77,7 @@ private void getItemsFromTenants(RoutingContext routingContext) {
   }
 
   private CompletableFuture<List<JsonObject>> getItemsWithTenantId(String tenantId, List<String> itemIds, RoutingContext routingContext) {
-    log.info("getItemsWithTenantId:: Fetching items - [{}] from tenant - {}", itemIds, tenantId);
+    log.info("getItemsWithTenantId:: Fetching items - {} from tenant - {}", itemIds, tenantId);
     var context = new WebContext(routingContext);
     CollectionResourceClient itemsStorageClient;
     try {
@@ -93,9 +94,16 @@ private CompletableFuture<List<JsonObject>> getItemsWithTenantId(String tenantId
     itemsStorageClient.getAll(getByIdsQuery, itemsFetched::complete);
 
     return itemsFetched.thenApplyAsync(response ->
-      response.getStatusCode() == 200 && response.hasBody()
-        ? JsonArrayHelper.toList(response.getJson(), ITEMS_FIELD)
-        : List.of());
+      getItemsWithTenantId(tenantId, response));
+  }
+
+  private List<JsonObject> getItemsWithTenantId(String tenantId, Response response) {
+    if (response.getStatusCode() == 200 && response.hasBody()) {
+      return List.of();
+    }
+    return JsonArrayHelper.toList(response.getJson(), ITEMS_FIELD).stream()
+      .map(item -> item.put(TENANT_ID_FIELD, tenantId))
+      .toList();
   }
 
   private JsonObject constructResponse(List<JsonObject> items) {

diff --git a/src/test/java/api/items/TenantItemApiTests.java b/src/test/java/api/items/TenantItemApiTests.java
@@ -7,6 +7,7 @@
 import static api.support.InstanceSamples.smallAngryPlanet;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.folio.inventory.resources.TenantItems.ITEMS_FIELD;
+import static org.folio.inventory.resources.TenantItems.TENANT_ID_FIELD;
 import static org.folio.inventory.resources.TenantItems.TOTAL_RECORDS_FIELD;
 import static org.folio.inventory.support.ItemUtil.ID;
 
@@ -58,6 +59,8 @@ public void testTenantItemsGetFromDifferentTenants() throws MalformedURLExceptio
       .toCompletableFuture().get(5, TimeUnit.SECONDS);
     assertThat(response.getStatusCode()).isEqualTo(200);
 
+    consortiumItem.put(TENANT_ID_FIELD, CONSORTIA_TENANT_ID);
+    collegeItem.put(TENANT_ID_FIELD, COLLEGE_TENANT_ID);
     var items = extractItems(response, 2);
     assertThat(items).contains(consortiumItem, collegeItem);
   }