Fixed filter parameter name.

EBISPOT · Apr 10, 2021 · dba7932 · dba7932
1 parent 022b8b9
commit dba7932
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/uk/ac/ebi/spot/ontotools/curation/constants/CurationConstants.java b/src/main/java/uk/ac/ebi/spot/ontotools/curation/constants/CurationConstants.java
@@ -34,7 +34,7 @@ public class CurationConstants {
 
     public static final String PARAM_ENTITY_ID = "entityId";
 
-    public static final String PARAM_SEARCH = "search";
+    public static final String PARAM_FILTER = "filter";
 
     public static final String PARAM_CONTEXT = "context";
 

diff --git a/src/main/java/uk/ac/ebi/spot/ontotools/curation/rest/controller/EntityController.java b/src/main/java/uk/ac/ebi/spot/ontotools/curation/rest/controller/EntityController.java
@@ -63,7 +63,7 @@ public class EntityController {
             produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(HttpStatus.OK)
     public RestResponsePage<EntityDto> getEntities(@PathVariable String projectId,
-                                                   @RequestParam(value = CurationConstants.PARAM_SEARCH, required = false) String prefix,
+                                                   @RequestParam(value = CurationConstants.PARAM_FILTER, required = false) String prefix,
                                                    @RequestParam(value = CurationConstants.PARAM_CONTEXT, required = false) String context,
                                                    @PageableDefault(size = 20, page = 0) Pageable pageable, HttpServletRequest request) {
         User user = jwtService.extractUser(HeadersUtil.extractJWT(request));

diff --git a/src/main/java/uk/ac/ebi/spot/ontotools/curation/rest/controller/UsersController.java b/src/main/java/uk/ac/ebi/spot/ontotools/curation/rest/controller/UsersController.java
@@ -43,7 +43,7 @@ public class UsersController {
      */
     @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(HttpStatus.OK)
-    public RestResponsePage<UserDto> getUsers(@RequestParam(value = CurationConstants.PARAM_SEARCH, required = false) String prefix,
+    public RestResponsePage<UserDto> getUsers(@RequestParam(value = CurationConstants.PARAM_FILTER, required = false) String prefix,
                                               @PageableDefault(size = 20, page = 0) Pageable pageable,
                                               HttpServletRequest request) {
         User user = jwtService.extractUser(HeadersUtil.extractJWT(request));

diff --git a/src/test/java/uk/ac/ebi/spot/ontotools/curation/EntityControllerTest.java b/src/test/java/uk/ac/ebi/spot/ontotools/curation/EntityControllerTest.java
@@ -108,7 +108,7 @@ public void shouldGetEntitiesByPrefixSearch() throws Exception {
 
         String prefix = "chon";
         String endpoint = GeneralCommon.API_V1 + CurationConstants.API_PROJECTS + "/" + project.getId() + CurationConstants.API_ENTITIES +
-                "?" + CurationConstants.PARAM_SEARCH + "=" + prefix;
+                "?" + CurationConstants.PARAM_FILTER + "=" + prefix;
         String response = mockMvc.perform(get(endpoint)
                 .contentType(MediaType.APPLICATION_JSON)
                 .header(IDPConstants.JWT_TOKEN, "token1"))
@@ -123,7 +123,7 @@ public void shouldGetEntitiesByPrefixSearch() throws Exception {
 
         prefix = "achond";
         endpoint = GeneralCommon.API_V1 + CurationConstants.API_PROJECTS + "/" + project.getId() + CurationConstants.API_ENTITIES +
-                "?" + CurationConstants.PARAM_SEARCH + "=" + prefix;
+                "?" + CurationConstants.PARAM_FILTER + "=" + prefix;
         response = mockMvc.perform(get(endpoint)
                 .contentType(MediaType.APPLICATION_JSON)
                 .header(IDPConstants.JWT_TOKEN, "token1"))