adding filter to existing api #564

gbif · Apr 24, 2024 · a91778e · a91778e
1 parent 63aec84
commit a91778e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 23 deletions.
diff --git a/...ests/src/test/java/org/gbif/registry/ws/it/collections/resource/CollectionResourceIT.java b/...ests/src/test/java/org/gbif/registry/ws/it/collections/resource/CollectionResourceIT.java
@@ -30,7 +30,6 @@
 import org.gbif.api.vocabulary.GbifRegion;
 import org.gbif.api.vocabulary.collections.AccessionStatus;
 import org.gbif.api.vocabulary.collections.PreservationType;
-import org.gbif.api.vocabulary.collections.Source;
 import org.gbif.registry.service.collections.batch.CollectionBatchService;
 import org.gbif.registry.service.collections.duplicates.CollectionDuplicatesService;
 import org.gbif.registry.service.collections.duplicates.DuplicatesService;
@@ -102,8 +101,6 @@ public void listTest() {
     req.setAccessionStatus(AccessionStatus.INSTITUTIONAL);
     req.setPreservationTypes(
         Arrays.asList(PreservationType.SAMPLE_CRYOPRESERVED, PreservationType.SAMPLE_DRIED));
-    req.setSource(Source.DATASET);
-    req.setSourceId("12345");
 
     PagingResponse<CollectionView> result = getClient().list(req);
     assertEquals(views.size(), result.getResults().size());

diff --git a/...sts/src/test/java/org/gbif/registry/ws/it/collections/resource/InstitutionResourceIT.java b/...sts/src/test/java/org/gbif/registry/ws/it/collections/resource/InstitutionResourceIT.java
@@ -30,7 +30,6 @@
 import org.gbif.api.vocabulary.GbifRegion;
 import org.gbif.api.vocabulary.collections.Discipline;
 import org.gbif.api.vocabulary.collections.InstitutionGovernance;
-import org.gbif.api.vocabulary.collections.Source;
 import org.gbif.registry.service.collections.batch.InstitutionBatchService;
 import org.gbif.registry.service.collections.duplicates.DuplicatesService;
 import org.gbif.registry.service.collections.duplicates.InstitutionDuplicatesService;
@@ -104,8 +103,6 @@ public void listTest() {
     req.setActive(true);
     req.setInstitutionalGovernance(InstitutionGovernance.ACADEMIC_FEDERAL);
     req.setDisciplines(Arrays.asList(Discipline.AGRICULTURAL, Discipline.OCEAN));
-    req.setSource(Source.ORGANIZATION);
-    req.setSourceId("12345");
 
     PagingResponse<Institution> result = getClient().list(req);
     assertEquals(institutions.size(), result.getResults().size());

diff --git a/...rg/gbif/registry/ws/provider/BaseGrSciCollSearchRequestHandlerMethodArgumentResolver.java b/...rg/gbif/registry/ws/provider/BaseGrSciCollSearchRequestHandlerMethodArgumentResolver.java
@@ -23,6 +23,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;
 import org.gbif.registry.service.collections.utils.SearchUtils;
 import org.gbif.ws.server.provider.PageableProvider;
 
@@ -175,6 +176,16 @@ protected <T extends SearchRequest> void fillSearchRequestParams(
         }
       }
     }
+
+    String sourceParam = webRequest.getParameter("source");
+    if (!Strings.isNullOrEmpty(sourceParam)) {
+      request.setSource(Source.valueOf(Source.class,"sourceParam"));
+    }
+
+    String sourceIdParam = webRequest.getParameter("sourceId");
+    if (!Strings.isNullOrEmpty(sourceIdParam)) {
+      request.setSourceId(sourceIdParam);
+    }
   }
 
   private static void validateIntegerRange(String param, String paramName) {

diff --git a/...a/org/gbif/registry/ws/provider/CollectionSearchRequestHandlerMethodArgumentResolver.java b/...a/org/gbif/registry/ws/provider/CollectionSearchRequestHandlerMethodArgumentResolver.java
@@ -18,7 +18,6 @@
 import org.gbif.api.vocabulary.collections.AccessionStatus;
 import org.gbif.api.vocabulary.collections.CollectionContentType;
 import org.gbif.api.vocabulary.collections.PreservationType;
-import org.gbif.api.vocabulary.collections.Source;
 
 import java.util.Arrays;
 import java.util.UUID;
@@ -89,13 +88,6 @@ public Object resolveArgument(
       }
     }
 
-    String sourceParam = webRequest.getParameter("source");
-    if (!Strings.isNullOrEmpty(sourceParam))
-      searchRequest.setSource(VocabularyUtils.lookupEnum(sourceParam, Source.class));
-
-    String sourceIdParam = webRequest.getParameter("sourceId");
-    if (!Strings.isNullOrEmpty(sourceIdParam)) searchRequest.setSourceId(sourceIdParam);
-
     return searchRequest;
   }
 }
diff --git a/.../org/gbif/registry/ws/provider/InstitutionSearchRequestHandlerMethodArgumentResolver.java b/.../org/gbif/registry/ws/provider/InstitutionSearchRequestHandlerMethodArgumentResolver.java
@@ -18,7 +18,6 @@
 import org.gbif.api.vocabulary.collections.Discipline;
 import org.gbif.api.vocabulary.collections.InstitutionGovernance;
 import org.gbif.api.vocabulary.collections.InstitutionType;
-import org.gbif.api.vocabulary.collections.Source;
 
 import java.util.Arrays;
 import java.util.stream.Collectors;
@@ -28,7 +27,6 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import com.google.common.base.Strings;
 
 @SuppressWarnings("NullableProblems")
 public class InstitutionSearchRequestHandlerMethodArgumentResolver
@@ -64,13 +62,6 @@ public Object resolveArgument(
               .collect(Collectors.toList()));
     }
 
-    String sourceParam = webRequest.getParameter("source");
-    if (!Strings.isNullOrEmpty(sourceParam))
-      searchRequest.setSource(VocabularyUtils.lookupEnum(sourceParam, Source.class));
-
-    String sourceIdParam = webRequest.getParameter("sourceId");
-    if (!Strings.isNullOrEmpty(sourceIdParam)) searchRequest.setSourceId(sourceIdParam);
-
     return searchRequest;
   }
 }