BXC-4779 - Fix viewable files filter (#1828)

* Filter was failing for jp2's with extent info since that comes after the owner section

* Make ownership portion of filter optional

Author: bbpennel

Diff for: search-solr/src/main/java/edu/unc/lib/boxc/search/solr/filters/MultipleDirectlyOwnedDatastreamsFilter.java

@@ -16,18 +16,22 @@
 public class MultipleDirectlyOwnedDatastreamsFilter implements QueryFilter {
     private Set<DatastreamType> datastreamTypes;
     private SearchFieldKey fieldKey;
+    private boolean onlyDirectlyOwned;
 
-    protected MultipleDirectlyOwnedDatastreamsFilter(SearchFieldKey fieldKey, Set<DatastreamType> datastreamTypes) {
+    protected MultipleDirectlyOwnedDatastreamsFilter(SearchFieldKey fieldKey, Set<DatastreamType> datastreamTypes,
+                                                     boolean onlyDirectlyOwned) {
         this.datastreamTypes = datastreamTypes;
         this.fieldKey = fieldKey;
+        this.onlyDirectlyOwned = onlyDirectlyOwned;
     }
 
     @Override
     public String toFilterString() {
         var dsField = fieldKey.getSolrField();
+        final var ownershipSuffix = onlyDirectlyOwned ? "||" : "";
         return getDatastreamTypes().stream()
                 // Filtering datastreams to exclude those owned by other objects
-                .map(ds -> dsField + ":" + ds.getId() + "|*||")
+                .map(ds -> dsField + ":" + ds.getId() + "|*" + ownershipSuffix)
                 .collect(Collectors.joining(" OR ", "(", ")"));
     }
 

Diff for: search-solr/src/main/java/edu/unc/lib/boxc/search/solr/filters/QueryFilterFactory.java

@@ -31,7 +31,18 @@ public static QueryFilter createFilter(SearchFieldKey fieldKey, DatastreamType d
      * @return new QueryFilter instance with the provided datastream types
      */
     public static QueryFilter createFilter(SearchFieldKey fieldKey, Set<DatastreamType> datastreamTypes) {
-        return new MultipleDirectlyOwnedDatastreamsFilter(fieldKey, datastreamTypes);
+        return new MultipleDirectlyOwnedDatastreamsFilter(fieldKey, datastreamTypes, false);
+    }
+
+    /**
+     * Create a filter which restricts results to entries which contain at least one of the listed datastreams,
+     * where the datastreams are owned by the object itself rather than one of its children
+     * @param fieldKey key of field to filter
+     * @param datastreamTypes datastreams to filter for
+     * @return  new QueryFilter instance with the provided datastream types
+     */
+    public static QueryFilter createDirectlyOwnedFilter(SearchFieldKey fieldKey, Set<DatastreamType> datastreamTypes) {
+        return new MultipleDirectlyOwnedDatastreamsFilter(fieldKey, datastreamTypes, true);
     }
 
     /**

Diff for: search-solr/src/test/java/edu/unc/lib/boxc/search/solr/filters/QueryFilterFactoryTest.java

@@ -8,35 +8,47 @@
 import java.util.HashSet;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
 /**
  * @author lfarrell
  */
 public class QueryFilterFactoryTest {
     @Test
-    public void NamedDatastreamFilterTest() {
+    public void namedDatastreamFilterTest() {
         var filter = QueryFilterFactory.createFilter(SearchFieldKey.DATASTREAM, DatastreamType.JP2_ACCESS_COPY);
         assertInstanceOf(NamedDatastreamFilter.class, filter);
     }
 
     @Test
-    public void MultipleDirectlyOwnedDatastreamsFilterTest() {
+    public void multipleDirectlyOwnedDatastreamsFilterTest() {
+        var datastreamTypes = new HashSet<DatastreamType>();
+        datastreamTypes.add(DatastreamType.JP2_ACCESS_COPY);
+        datastreamTypes.add(DatastreamType.FULLTEXT_EXTRACTION);
+        var filter = QueryFilterFactory.createDirectlyOwnedFilter(SearchFieldKey.DATASTREAM, datastreamTypes);
+        assertInstanceOf(MultipleDirectlyOwnedDatastreamsFilter.class, filter);
+        assertEquals("(datastream:jp2|*|| OR datastream:fulltext|*||)", filter.toFilterString());
+    }
+
+    @Test
+    public void datastreamsFilterTest() {
         var datastreamTypes = new HashSet<DatastreamType>();
         datastreamTypes.add(DatastreamType.JP2_ACCESS_COPY);
         datastreamTypes.add(DatastreamType.FULLTEXT_EXTRACTION);
         var filter = QueryFilterFactory.createFilter(SearchFieldKey.DATASTREAM, datastreamTypes);
         assertInstanceOf(MultipleDirectlyOwnedDatastreamsFilter.class, filter);
+        assertEquals("(datastream:jp2|* OR datastream:fulltext|*)", filter.toFilterString());
     }
 
     @Test
-    public void HasPopulatedFieldFilterTest() {
+    public void hasPopulatedFieldFilterTest() {
         var filter = QueryFilterFactory.createFilter(SearchFieldKey.STREAMING_TYPE);
         assertInstanceOf(HasPopulatedFieldFilter.class, filter);
     }
 
     @Test
-    public void HasValuesFilterTest() {
+    public void hasValuesFilterTest() {
         var filter = QueryFilterFactory.createHasValuesFilter(SearchFieldKey.FILE_FORMAT_TYPE, List.of("application/pdf"));
         assertInstanceOf(HasValuesFilter.class, filter);
     }

Diff for: services-camel-app/src/main/java/edu/unc/lib/boxc/services/camel/exportxml/ExportXMLProcessor.java

@@ -200,7 +200,8 @@ private void adjustRequestPids(ExportXMLRequest request) throws ServiceException
             searchRequest.setApplyCutoffs(false);
             if (request.getOnlyIncludeValidDatastreams()) {
                 searchState.addFilter(
-                        QueryFilterFactory.createFilter(SearchFieldKey.DATASTREAM, request.getDatastreams()));
+                        QueryFilterFactory.createDirectlyOwnedFilter(
+                                SearchFieldKey.DATASTREAM, request.getDatastreams()));
             }
 
             SearchResultResponse resultResponse = searchService.getSearchResults(searchRequest);