fix(consortium): fix shared filter for subjects/contributors (#480)

Closes: MSEARCH-639 (cherry picked from commit 76092dc)
folio-org · Nov 30, 2023 · b8011e9 · b8011e9
1 parent f429fae
commit b8011e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+## v3.0.4 2023-11-30
+### Bug fixes
+* Fix shared filter for subjects/contributors ([MSEARCH-639](https://issues.folio.org/browse/MSEARCH-639))
+
 ## v3.0.3 2023-11-15
 ### Tech Dept
 * Ignore authority shadow copies while indexing ([MSEARCH-638](https://issues.folio.org/browse/MSEARCH-638))

diff --git a/src/main/java/org/folio/search/service/consortium/ConsortiumSearchHelper.java b/src/main/java/org/folio/search/service/consortium/ConsortiumSearchHelper.java
@@ -113,6 +113,8 @@ public <T> Set<InstanceSubResource> filterSubResourcesForConsortium(
     if (sharedFilter.isPresent()) {
       if (sharedFilterValue(sharedFilter.get())) {
         subResourcesFilter = InstanceSubResource::getShared;
+      } else {
+        subResourcesFilter = subResourcesFilter.and(instanceSubResource -> !instanceSubResource.getShared());
       }
     } else {
       if (tenantFilter.isEmpty()) {

diff --git a/src/test/java/org/folio/search/service/consortium/ConsortiumSearchHelperTest.java b/src/test/java/org/folio/search/service/consortium/ConsortiumSearchHelperTest.java
@@ -18,7 +18,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 import org.folio.search.model.index.InstanceSubResource;
 import org.folio.search.model.index.SubjectResource;
 import org.folio.search.model.service.BrowseContext;
@@ -287,12 +286,13 @@ void filterSubResourcesForConsortium_positive_local() {
     var subResources = subResources();
     var resource = new SubjectResource();
     resource.setInstances(subResources);
-    var expected = subResources.stream().filter(s -> s.getTenantId().equals(TENANT_ID)).collect(Collectors.toSet());
 
     var actual = consortiumSearchHelper.filterSubResourcesForConsortium(browseContext, resource,
       SubjectResource::getInstances);
 
-    assertThat(actual).isEqualTo(expected);
+    assertThat(actual).hasSize(1)
+      .allMatch(instanceSubResource -> instanceSubResource.getShared().equals(Boolean.FALSE))
+      .allMatch(instanceSubResource -> instanceSubResource.getTenantId().equals(TENANT_ID));
   }
 
   @Test