fix: fix issues introduced by merging 'develop' into feat/search-api-collections

vera · vera · commit febdf1afb6de · 2025-07-29T17:56:47.000+02:00
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/AbstractExternalSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/AbstractExternalSearchServiceBean.java
@@ -50,7 +50,7 @@ public void setSettingsService(SettingsServiceBean settingsService) {
      * @throws Exception
      */
     protected SolrQueryResponse postProcessResponse(String responseString, DataverseRequest dataverseRequest,
-            boolean retrieveEntities, boolean addFacets, boolean addHighlights) throws Exception {
+            boolean retrieveEntities, boolean addFacets, boolean addHighlights, boolean addCollections) throws Exception {
 
         JsonObject responseObject = JsonUtil.getJsonObject(responseString);
         JsonArray resultsArray = responseObject.getJsonArray("results");
@@ -82,7 +82,7 @@ protected SolrQueryResponse postProcessResponse(String responseString, Dataverse
         // Execute Solr query
         SolrQueryResponse solrResponse = solrSearchService.search(dataverseRequest, null, solrQuery,
                 Collections.emptyList(), null, null, 0, false, pids.size(), retrieveEntities, null, null, addFacets,
-                addHighlights);
+                addHighlights, addCollections);
 
         // Reorder results based on distance, lowest values first
         List<SolrSearchResult> reorderedResults = solrResponse.getSolrSearchResults().stream()
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/GetExternalSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/GetExternalSearchServiceBean.java
@@ -44,7 +44,7 @@ public void setSolrSearchService(SearchService solrSearchService) {
     public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Dataverse> dataverses, String query,
             List<String> filterQueries, String sortField, String sortOrder, int paginationStart,
             boolean onlyDataRelatedToMe, int numResultsPerPage, boolean retrieveEntities, String geoPoint,
-            String geoRadius, boolean addFacets, boolean addHighlights) throws SearchException {
+            String geoRadius, boolean addFacets, boolean addHighlights, boolean addCollections) throws SearchException {
 
         String externalSearchUrl = settingsService.getValueForKey(SettingsServiceBean.Key.GetExternalSearchUrl);
         if (externalSearchUrl == null || externalSearchUrl.isEmpty()) {
@@ -53,7 +53,7 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
 
         // Prepare query parameters
         String queryParams = prepareQuery(query, paginationStart, numResultsPerPage, sortField, sortOrder,
-                filterQueries, addHighlights, addFacets, onlyDataRelatedToMe, retrieveEntities, geoPoint, geoRadius);
+                filterQueries, addHighlights, addCollections, addFacets, onlyDataRelatedToMe, retrieveEntities, geoPoint, geoRadius);
 
         // Send GET request to external service
         try (Client client = ClientBuilder.newClient()) {
@@ -67,14 +67,14 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
             // Parse response and process results
             String responseString = response.readEntity(String.class);
             logger.finest("External search returned: " + responseString);
-            return postProcessResponse(responseString, dataverseRequest, retrieveEntities, addFacets, addHighlights);
+            return postProcessResponse(responseString, dataverseRequest, retrieveEntities, addFacets, addHighlights, addCollections);
         } catch (Exception e) {
             throw new SearchException("Error parsing external search service response", e);
         }
     }
 
     private String prepareQuery(String query, int paginationStart, int numResultsPerPage, String sortField,
-            String sortOrder, List<String> filterQueries, boolean addHighlights, boolean addFacets,
+            String sortOrder, List<String> filterQueries, boolean addHighlights, boolean addCollections, boolean addFacets,
             boolean onlyDataRelatedToMe, boolean retrieveEntities, String geoPoint, String geoRadius) {
         StringBuilder queryParams = new StringBuilder();
         queryParams.append("q=").append(URLEncoder.encode(query, StandardCharsets.UTF_8));
@@ -94,6 +94,7 @@ private String prepareQuery(String query, int paginationStart, int numResultsPer
         }
 
         queryParams.append("&show_relevance=").append(addHighlights);
+        queryParams.append("&show_collections=").append(addCollections);
         queryParams.append("&show_facets=").append(addFacets);
         queryParams.append("&show_entity_ids=true");
         queryParams.append("&show_api_urls=true");
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/GoldenOldiesSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/GoldenOldiesSearchServiceBean.java
@@ -49,6 +49,7 @@ public String getDisplayName() {
      * @param geoRadius e.g. "5"
      * @param addFacets boolean
      * @param addHighlights boolean
+     * @param addCollections boolean
      * @return
      * @throws SearchException
      */
@@ -67,7 +68,8 @@ public SolrQueryResponse search(
             String geoPoint,
             String geoRadius,
             boolean addFacets,
-            boolean addHighlights
+            boolean addHighlights,
+            boolean addCollections
     ) throws SearchException {
 
         // Execute the query using SolrSearchService
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/OddlyEnoughSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/OddlyEnoughSearchServiceBean.java
@@ -49,6 +49,7 @@ public String getDisplayName() {
      * @param geoRadius e.g. "5"
      * @param addFacets boolean
      * @param addHighlights boolean
+     * @param addCollections boolean
      * @return
      * @throws SearchException
      */
@@ -67,12 +68,13 @@ public SolrQueryResponse search(
             String geoPoint,
             String geoRadius,
             boolean addFacets,
-            boolean addHighlights
+            boolean addHighlights,
+            boolean addCollections
     ) throws SearchException {
 
         logger.info("Search query: " + query + "handled by OddlyEnough search service");
         // Execute the query using SolrSearchService
-        SolrQueryResponse queryResponse = solrSearchService.search(dataverseRequest, dataverses, query, filterQueries, sortField, sortOrder, 0, onlyDatatRelatedToMe, 1000, retrieveEntities, geoPoint, geoRadius, addFacets, addHighlights);
+        SolrQueryResponse queryResponse = solrSearchService.search(dataverseRequest, dataverses, query, filterQueries, sortField, sortOrder, 0, onlyDatatRelatedToMe, 1000, retrieveEntities, geoPoint, geoRadius, addFacets, addHighlights, addCollections);
         
         // Process the results
         List<SolrSearchResult> solrSearchResults = queryResponse.getSolrSearchResults();
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/PostExternalSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/PostExternalSearchServiceBean.java
@@ -45,7 +45,7 @@ private JsonObject prepareQuery(String query, int paginationStart, int numResult
     public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Dataverse> dataverses, String query,
             List<String> filterQueries, String sortField, String sortOrder, int paginationStart,
             boolean onlyDataRelatedToMe, int numResultsPerPage, boolean retrieveEntities, String geoPoint,
-            String geoRadius, boolean addFacets, boolean addHighlights) throws SearchException {
+            String geoRadius, boolean addFacets, boolean addHighlights, boolean addCollections) throws SearchException {
 
         String externalSearchUrl = settingsService.getValueForKey(SettingsServiceBean.Key.PostExternalSearchUrl);
         if (externalSearchUrl == null || externalSearchUrl.isEmpty()) {
@@ -68,7 +68,7 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
             // Parse response and process results
             String responseString = response.readEntity(String.class);
             logger.fine("External search returned: " + responseString);
-            return postProcessResponse(responseString, dataverseRequest, retrieveEntities, addFacets, addHighlights);
+            return postProcessResponse(responseString, dataverseRequest, retrieveEntities, addFacets, addHighlights, addCollections);
         } catch (Exception e) {
             throw new SearchException("Error parsing external search service response", e);
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchService.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchService.java
@@ -65,7 +65,7 @@ default SolrQueryResponse search(DataverseRequest dataverseRequest, List<Dataver
             List<String> filterQueries, String sortField, String sortOrder, int paginationStart,
             boolean onlyDataRelatedToMe, int numResultsPerPage, boolean retrieveEntities, String geoPoint,
             String geoRadius) throws SearchException{
-        return search(dataverseRequest, dataverses, query, filterQueries, sortField, sortOrder, paginationStart, onlyDataRelatedToMe, numResultsPerPage, true, null, null, true, true);
+        return search(dataverseRequest, dataverses, query, filterQueries, sortField, sortOrder, paginationStart, onlyDataRelatedToMe, numResultsPerPage, true, null, null, true, true, false);
     }
 
     /**
@@ -83,13 +83,14 @@ default SolrQueryResponse search(DataverseRequest dataverseRequest, List<Dataver
      * @param geoRadius e.g. "5"
      * @param addFacets boolean
      * @param addHighlights boolean
+     * @param addCollections boolean
      * @return
      * @throws SearchException
      */
     SolrQueryResponse search(DataverseRequest dataverseRequest, List<Dataverse> dataverses, String query,
             List<String> filterQueries, String sortField, String sortOrder, int paginationStart,
             boolean onlyDataRelatedToMe, int numResultsPerPage, boolean retrieveEntities, String geoPoint,
-            String geoRadius, boolean addFacets, boolean addHighlights) throws SearchException;
+            String geoRadius, boolean addFacets, boolean addHighlights, boolean addCollections) throws SearchException;
 
     /** Provide a way for other search engines to use the solr search engine
      * 
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchServiceBean.java
@@ -111,6 +111,7 @@ public String getDisplayName() {
      * @param geoRadius e.g. "5"
      * @param addFacets boolean
      * @param addHighlights boolean
+     * @param addCollections boolean
      * @return
      * @throws SearchException
      */
