local-typex differencies (#660)

* Added dataProvider Facet * Replaced deprecated `sortOrder` with the new one. * `searchFacetDataProvider` should be in the searchFilters * Updated Integration test which checks the search filters
ufal · May 21, 2024 · 39a1ea1 · 39a1ea1
1 parent e343e98
commit 39a1ea1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ClarinDiscoveryRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ClarinDiscoveryRestControllerIT.java
@@ -1002,7 +1002,8 @@ public void discoverSearchTest() throws Exception {
                         SearchFilterMatcher.clarinItemsLanguageFilter(),
                         SearchFilterMatcher.clarinItemsCommunityFilter(),
                         SearchFilterMatcher.clarinItemsTypeFilter(),
-                        SearchFilterMatcher.clarinSubjectFirstValueFilter()
+                        SearchFilterMatcher.clarinSubjectFirstValueFilter(),
+                        SearchFilterMatcher.clarinDataProviderFacet()
                 )))
                 //These sortOptions need to be present as it's the default in the configuration
                 .andExpect(jsonPath("$.sortOptions", contains(

diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SearchFilterMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SearchFilterMatcher.java
@@ -216,4 +216,14 @@ public static Matcher<? super Object> clarinSubjectFirstValueFilter() {
                 checkOperators()
         );
     }
+
+    public static Matcher<? super Object> clarinDataProviderFacet() {
+        return allOf(
+                hasJsonPath("$.filter", is("dataProvider")),
+                hasJsonPath("$.hasFacets", is(false)),
+                hasJsonPath("$.type", is("text")),
+                hasJsonPath("$.openByDefault", is(false)),
+                checkOperators()
+        );
+    }
 }
diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
@@ -202,6 +202,7 @@
                 <ref bean="searchFilterType"/>
                 <ref bean="searchFilterPublisher"/>
                 <ref bean="searchFilterSubjectFirstValue"/>
+                <ref bean="searchFacetDataProvider" />
             </list>
         </property>
         <!--The sort filters for the discovery search-->
@@ -2567,6 +2568,18 @@
         <property name="sortOrderFilterPage" value="COUNT"/>
     </bean>
 
+    <bean id="searchFacetDataProvider" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="dataProvider"/>
+        <property name="metadataFields">
+            <list>
+                <value>local.dataProvider</value>
+            </list>
+        </property>
+        <property name="facetLimit" value="20"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+    </bean>
+
     <bean id="searchFilterEntityType" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
         <property name="indexFieldName" value="entityType"/>
         <property name="metadataFields">