diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/CollectionListParams.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/CollectionListParams.java index 8c6e10b5e..c0860be29 100644 --- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/CollectionListParams.java +++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/CollectionListParams.java @@ -30,6 +30,4 @@ public class CollectionListParams extends ListParams { @Nullable List preservationTypes; @Nullable List accessionStatus; @Nullable Boolean personalCollection; - @Nullable String sourceId; - @Nullable Source source; } diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/InstitutionListParams.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/InstitutionListParams.java index efac8f9c1..bb8674cc8 100644 --- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/InstitutionListParams.java +++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/InstitutionListParams.java @@ -29,6 +29,4 @@ public class InstitutionListParams extends ListParams { @Nullable List types; @Nullable List institutionalGovernances; @Nullable List disciplines; - @Nullable String sourceId; - @Nullable Source source; } diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/ListParams.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/ListParams.java index e6f7317ba..fbd818612 100644 --- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/params/ListParams.java +++ b/registry-persistence/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 institutionKeys; + @Nullable Source source; + @Nullable String sourceId; @Nullable CollectionsSortField sortBy; @Nullable SortOrder sortOrder; @Nullable private Boolean deleted; diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/CollectionsSearchService.java b/registry-service/src/main/java/org/gbif/registry/service/collections/CollectionsSearchService.java index 8c7ff4ae1..d294f42a2 100644 --- a/registry-service/src/main/java/org/gbif/registry/service/collections/CollectionsSearchService.java +++ b/registry-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 nameMatch = createHighlightMatch(dto.getNameHighlight(), "name");