add Query parameter to membership endpoints (#526)

NASA-PDS · Aug 15, 2024 · d88c0aa · d88c0aa
1 parent e6e5953
commit d88c0aa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/model/swagger.yml b/model/swagger.yml
@@ -278,6 +278,7 @@ paths:
       - $ref: "#/components/parameters/Fields"
       - $ref: "#/components/parameters/Identifier"
       - $ref: "#/components/parameters/Limit"
+      - $ref: "#/components/parameters/Query"
       - $ref: "#/components/parameters/Sort"
       - $ref: "#/components/parameters/SearchAfter"
   /products/{identifier}/members/{versions}:
@@ -302,6 +303,7 @@ paths:
       - $ref: "#/components/parameters/Fields"
       - $ref: "#/components/parameters/Identifier"
       - $ref: "#/components/parameters/Limit"
+      - $ref: "#/components/parameters/Query"
       - $ref: "#/components/parameters/Sort"
       - $ref: "#/components/parameters/SearchAfter"
       - $ref: "#/components/parameters/Versions"
@@ -327,6 +329,7 @@ paths:
       - $ref: "#/components/parameters/Fields"
       - $ref: "#/components/parameters/Identifier"
       - $ref: "#/components/parameters/Limit"
+      - $ref: "#/components/parameters/Query"
       - $ref: "#/components/parameters/Sort"
       - $ref: "#/components/parameters/SearchAfter"
   /products/{identifier}/members/members/{versions}:
@@ -351,6 +354,7 @@ paths:
       - $ref: "#/components/parameters/Fields"
       - $ref: "#/components/parameters/Identifier"
       - $ref: "#/components/parameters/Limit"
+      - $ref: "#/components/parameters/Query"
       - $ref: "#/components/parameters/Sort"
       - $ref: "#/components/parameters/SearchAfter"
       - $ref: "#/components/parameters/Versions"
@@ -376,6 +380,7 @@ paths:
       - $ref: "#/components/parameters/Fields"
       - $ref: "#/components/parameters/Identifier"
       - $ref: "#/components/parameters/Limit"
+      - $ref: "#/components/parameters/Query"
       - $ref: "#/components/parameters/Sort"
       - $ref: "#/components/parameters/SearchAfter"
   /products/{identifier}/member-of/{versions}:
@@ -400,6 +405,7 @@ paths:
       - $ref: "#/components/parameters/Fields"
       - $ref: "#/components/parameters/Identifier"
       - $ref: "#/components/parameters/Limit"
+      - $ref: "#/components/parameters/Query"
       - $ref: "#/components/parameters/Sort"
       - $ref: "#/components/parameters/SearchAfter"
       - $ref: "#/components/parameters/Versions"
@@ -425,6 +431,7 @@ paths:
       - $ref: "#/components/parameters/Fields"
       - $ref: "#/components/parameters/Identifier"
       - $ref: "#/components/parameters/Limit"
+      - $ref: "#/components/parameters/Query"
       - $ref: "#/components/parameters/Sort"
       - $ref: "#/components/parameters/SearchAfter"
   /products/{identifier}/member-of/member-of/{versions}:
@@ -449,6 +456,7 @@ paths:
       - $ref: "#/components/parameters/Fields"
       - $ref: "#/components/parameters/Identifier"
       - $ref: "#/components/parameters/Limit"
+      - $ref: "#/components/parameters/Query"
       - $ref: "#/components/parameters/Sort"
       - $ref: "#/components/parameters/SearchAfter"
       - $ref: "#/components/parameters/Versions"

diff --git a/service/src/main/java/gov/nasa/pds/api/registry/controllers/ProductsController.java b/service/src/main/java/gov/nasa/pds/api/registry/controllers/ProductsController.java
@@ -409,7 +409,7 @@ private PdsLidVid resolveIdentifierToLidvid(PdsProductIdentifier identifier) thr
 
   @Override
   public ResponseEntity<Object> productMembers(
-          String identifier, List<String> fields, Integer limit, List<String> sort, List<String> searchAfter)
+          String identifier, List<String> fields, Integer limit, String q, List<String> sort, List<String> searchAfter)
           throws NotFoundException, UnhandledException, SortSearchAfterMismatchException, BadRequestException,
           AcceptFormatNotSupportedException{
 
@@ -433,7 +433,7 @@ public ResponseEntity<Object> productMembers(
       }
 
       SearchRequest searchRequest = searchRequestBuilder
-              .applyMultipleProductsDefaults(fields, "", List.of(), limit, sort, searchAfter, true)
+              .applyMultipleProductsDefaults(fields, q, List.of(), limit, sort, searchAfter, true)
               .build();
 
       SearchResponse<HashMap> searchResponse =
@@ -450,7 +450,7 @@ public ResponseEntity<Object> productMembers(
 
   @Override
   public ResponseEntity<Object> productMembersMembers(
-          String identifier, List<String> fields, Integer limit, List<String> sort, List<String> searchAfter)
+          String identifier, List<String> fields, Integer limit, String q, List<String> sort, List<String> searchAfter)
           throws NotFoundException, UnhandledException, SortSearchAfterMismatchException, BadRequestException,
           AcceptFormatNotSupportedException{
 
@@ -470,7 +470,7 @@ public ResponseEntity<Object> productMembersMembers(
       }
 
       SearchRequest searchRequest = searchRequestBuilder
-              .applyMultipleProductsDefaults(fields, "", List.of(), limit, sort, searchAfter, true)
+              .applyMultipleProductsDefaults(fields, q, List.of(), limit, sort, searchAfter, true)
               .build();
 
       SearchResponse<HashMap> searchResponse =
@@ -523,7 +523,7 @@ private List<PdsLidVid> resolveLidVidsFromProductField(PdsProductIdentifier iden
 
   @Override
   public ResponseEntity<Object> productMemberOf(
-          String identifier, List<String> fields, Integer limit, List<String> sort, List<String> searchAfter)
+          String identifier, List<String> fields, Integer limit, String q, List<String> sort, List<String> searchAfter)
           throws NotFoundException, UnhandledException, SortSearchAfterMismatchException, BadRequestException,
           AcceptFormatNotSupportedException, UnparsableQParamException {
 
@@ -543,7 +543,7 @@ public ResponseEntity<Object> productMemberOf(
       }
 
       SearchRequest searchRequest = new RegistrySearchRequestBuilder(this.connectionContext)
-              .applyMultipleProductsDefaults(fields, "", List.of(), limit, sort, searchAfter, true)
+              .applyMultipleProductsDefaults(fields, q, List.of(), limit, sort, searchAfter, true)
               .matchFieldAnyOfIdentifiers("_id", parentIds)
               .build();
 
@@ -561,7 +561,7 @@ public ResponseEntity<Object> productMemberOf(
 
   @Override
   public ResponseEntity<Object> productMemberOfOf(
-          String identifier, List<String> fields, Integer limit, List<String> sort, List<String> searchAfter)
+          String identifier, List<String> fields, Integer limit, String q, List<String> sort, List<String> searchAfter)
           throws NotFoundException, UnhandledException, SortSearchAfterMismatchException, BadRequestException,
           AcceptFormatNotSupportedException, UnparsableQParamException {
 
@@ -580,7 +580,7 @@ public ResponseEntity<Object> productMemberOfOf(
       }
 
       SearchRequest searchRequest = new RegistrySearchRequestBuilder(this.connectionContext)
-              .applyMultipleProductsDefaults(fields, "", List.of(), limit, sort, searchAfter, true)
+              .applyMultipleProductsDefaults(fields, q, List.of(), limit, sort, searchAfter, true)
               .matchFieldAnyOfIdentifiers("_id", parentIds)
               .build();