search filterfacet isOpenByDefault as facetentry property

DSpace#9404
uniba-ub · Dec 25, 2024 · 9e04b9f · 9e04b9f
1 parent f6ce766
commit 9e04b9f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/...bapp/src/main/java/org/dspace/app/rest/converter/DiscoverFacetConfigurationConverter.java b/...bapp/src/main/java/org/dspace/app/rest/converter/DiscoverFacetConfigurationConverter.java
@@ -42,6 +42,7 @@ private void addSidebarFacets(FacetConfigurationRest facetConfigurationRest,
             SearchFacetEntryRest facetEntry = new SearchFacetEntryRest(discoverySearchFilterFacet.getIndexFieldName());
             facetEntry.setFacetType(discoverySearchFilterFacet.getType());
             facetEntry.setFacetLimit(discoverySearchFilterFacet.getFacetLimit());
+            facetEntry.setOpenByDefault(discoverySearchFilterFacet.isOpenByDefault());
 
             facetConfigurationRest.addSidebarFacet(facetEntry);
         }

diff --git a/...ver-webapp/src/main/java/org/dspace/app/rest/converter/DiscoverFacetResultsConverter.java b/...ver-webapp/src/main/java/org/dspace/app/rest/converter/DiscoverFacetResultsConverter.java
@@ -109,6 +109,7 @@ private SearchFacetEntryRest convertFacetEntry(final String facetName, final Dis
         }
 
         facetEntryRest.setFacetLimit(field.getFacetLimit());
+        facetEntryRest.setOpenByDefault(field.isOpenByDefault());
 
         //We requested one extra facet value. Check if that value is present to indicate that there are more results
         facetEntryRest.setHasMore(facetResults.size() > page.getPageSize());

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchFacetEntryRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchFacetEntryRest.java
@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import org.dspace.app.rest.DiscoveryRestController;
+import org.dspace.discovery.configuration.DiscoverySearchFilter;
 import org.dspace.discovery.configuration.DiscoverySearchFilterFacet;
 
 /**
@@ -31,6 +32,9 @@ public class SearchFacetEntryRest extends RestAddressableModel {
     private Boolean hasMore = null;
     private int facetLimit;
 
+    @JsonIgnore
+    private Boolean isOpenByDefault;
+
     @JsonIgnore
     private boolean exposeMinMax = false;
 
@@ -107,6 +111,16 @@ public void setFacetLimit(final int facetLimit) {
         this.facetLimit = facetLimit;
     }
 
+    public void setOpenByDefault(boolean isOpenByDefault) {
+        this.isOpenByDefault = Boolean.valueOf(isOpenByDefault);
+    }
+    /**
+     * See documentation at {@link DiscoverySearchFilter#isOpenByDefault()}
+     */
+    public Boolean isOpenByDefault() {
+        return this.isOpenByDefault;
+    }
+
     /**
      * See documentation at {@link DiscoverySearchFilterFacet#exposeMinAndMaxValue()}
      */