#615 added missing params

(cherry picked from commit 4723370)
gbif · Sep 10, 2024 · 7b82d7e · 7b82d7e
1 parent f21e7b6
commit 7b82d7e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/...in/java/org/gbif/registry/persistence/mapper/collections/params/CollectionListParams.java b/...in/java/org/gbif/registry/persistence/mapper/collections/params/CollectionListParams.java
@@ -30,6 +30,4 @@ public class CollectionListParams extends ListParams {
   @Nullable List<String> preservationTypes;
   @Nullable List<String> accessionStatus;
   @Nullable Boolean personalCollection;
-  @Nullable String sourceId;
-  @Nullable Source source;
 }
diff --git a/...n/java/org/gbif/registry/persistence/mapper/collections/params/InstitutionListParams.java b/...n/java/org/gbif/registry/persistence/mapper/collections/params/InstitutionListParams.java
@@ -29,6 +29,4 @@ public class InstitutionListParams extends ListParams {
   @Nullable List<String> types;
   @Nullable List<String> institutionalGovernances;
   @Nullable List<String> disciplines;
-  @Nullable String sourceId;
-  @Nullable Source source;
 }
diff --git a/...nce/src/main/java/org/gbif/registry/persistence/mapper/collections/params/ListParams.java b/...nce/src/main/java/org/gbif/registry/persistence/mapper/collections/params/ListParams.java
@@ -24,6 +24,7 @@
 import org.gbif.api.vocabulary.IdentifierType;
 import org.gbif.api.vocabulary.SortOrder;
 import org.gbif.api.vocabulary.collections.MasterSourceType;
+import org.gbif.api.vocabulary.collections.Source;
 
 @Getter
 @SuperBuilder
@@ -50,6 +51,8 @@ public abstract class ListParams {
   @Nullable RangeParam occurrenceCount;
   @Nullable RangeParam typeSpecimenCount;
   @Nullable List<UUID> institutionKeys;
+  @Nullable Source source;
+  @Nullable String sourceId;
   @Nullable CollectionsSortField sortBy;
   @Nullable SortOrder sortOrder;
   @Nullable private Boolean deleted;

diff --git a/...service/src/main/java/org/gbif/registry/service/collections/CollectionsSearchService.java b/...service/src/main/java/org/gbif/registry/service/collections/CollectionsSearchService.java
@@ -313,6 +313,11 @@ private void buildCommonParams(
         .code(searchRequest.getCode())
         .name(searchRequest.getName())
         .alternativeCode(searchRequest.getAlternativeCode())
+        .machineTagNamespace(searchRequest.getMachineTagNamespace())
+        .machineTagName(searchRequest.getMachineTagName())
+        .machineTagValue(searchRequest.getMachineTagValue())
+        .identifierType(searchRequest.getIdentifierType())
+        .identifier(searchRequest.getIdentifier())
         .countries(searchRequest.getCountry())
         .regionCountries(parseGbifRegion(searchRequest))
         .city(searchRequest.getCity())
@@ -321,8 +326,11 @@ private void buildCommonParams(
         .masterSourceType(searchRequest.getMasterSourceType())
         .numberSpecimens(parseIntegerRangeParameter(searchRequest.getNumberSpecimens()))
         .displayOnNHCPortal(searchRequest.getDisplayOnNHCPortal())
+        .replacedBy(searchRequest.getReplacedBy())
         .occurrenceCount(parseIntegerRangeParameter(searchRequest.getOccurrenceCount()))
         .typeSpecimenCount(parseIntegerRangeParameter(searchRequest.getTypeSpecimenCount()))
+        .sourceId(searchRequest.getSourceId())
+        .source(searchRequest.getSource())
         .sortBy(searchRequest.getSortBy())
         .sortOrder(searchRequest.getSortOrder())
         .highlight(searchRequest.getHl())
@@ -382,7 +390,8 @@ private void addHighlights(BaseSearchResponse response, BaseSearchDto dto) {
         .ifPresent(highlights::add);
     createHighlightMatch(dto.getDescriptorGroupTitleHighlight(), "descriptorGroup.title")
         .ifPresent(highlights::add);
-    createHighlightMatch(dto.getDescriptorGroupDescriptionHighlight(), "descriptorGroup.description")
+    createHighlightMatch(
+            dto.getDescriptorGroupDescriptionHighlight(), "descriptorGroup.description")
         .ifPresent(highlights::add);
 
     Optional<Highlight> nameMatch = createHighlightMatch(dto.getNameHighlight(), "name");