Fix/fixed search field management endpoints

document/src/main/java/com/ritense/document/security/config/DocumentSearchHttpSecurityConfigurer.java

@@ -30,6 +30,7 @@
 public class DocumentSearchHttpSecurityConfigurer implements HttpSecurityConfigurer {
 
     private static final String FIELDS_URL = "/api/v1/document-search/{documentDefinitionName}/fields";
+    private static final String FIELDS_MANAGEMENT_URL = "/api/management/v1/document-search/{documentDefinitionName}/fields";
 
     @Override
     public void configure(HttpSecurity http) {
@@ -40,9 +41,11 @@ public void configure(HttpSecurity http) {
                     .requestMatchers(antMatcher(POST, FIELDS_URL)).hasAuthority(ADMIN)
                     .requestMatchers(antMatcher(GET, FIELDS_URL)).authenticated()
                     .requestMatchers(antMatcher(PUT, FIELDS_URL)).hasAuthority(ADMIN)
-                    .requestMatchers(antMatcher(DELETE, FIELDS_URL)).hasAuthority( ADMIN)
-                    .requestMatchers(antMatcher(
-                        GET, "/api/management/v1/document-search/{documentDefinitionName}/fields")).hasAuthority(ADMIN));
+                    .requestMatchers(antMatcher(DELETE, FIELDS_URL)).hasAuthority(ADMIN)
+                    .requestMatchers(antMatcher(GET, FIELDS_MANAGEMENT_URL)).hasAuthority(ADMIN)
+                    .requestMatchers(antMatcher(POST, FIELDS_MANAGEMENT_URL)).hasAuthority(ADMIN)
+                    .requestMatchers(antMatcher(PUT, FIELDS_MANAGEMENT_URL)).hasAuthority(ADMIN)
+                    .requestMatchers(antMatcher(DELETE, FIELDS_MANAGEMENT_URL)).hasAuthority(ADMIN));
         } catch (Exception e) {
             throw new HttpConfigurerConfigurationException(e);
         }

document/src/main/java/com/ritense/document/web/rest/impl/SearchFieldResource.java

@@ -48,7 +48,10 @@ public SearchFieldResource(final SearchFieldService searchFieldService) {
     }
 
     @Override
-    @PostMapping("/v1/document-search/{documentDefinitionName}/fields")
+    @PostMapping(value = {
+        "/v1/document-search/{documentDefinitionName}/fields",
+        "/management/v1/document-search/{documentDefinitionName}/fields"
+    })
     public ResponseEntity<Void> addSearchField(
         @LoggableResource("documentDefinitionName") @PathVariable String documentDefinitionName,
         @RequestBody SearchFieldDto searchField
@@ -70,7 +73,10 @@ public ResponseEntity<Void> addSearchField(
     }
 
     @Override
-    @GetMapping("/v1/document-search/{documentDefinitionName}/fields")
+    @GetMapping(value = {
+        "/v1/document-search/{documentDefinitionName}/fields",
+        "/management/v1/document-search/{documentDefinitionName}/fields"
+    })
     public ResponseEntity<List<SearchFieldDto>> getSearchFields(
         @LoggableResource("documentDefinitionName") @PathVariable String documentDefinitionName
     ) {
@@ -79,7 +85,10 @@ public ResponseEntity<List<SearchFieldDto>> getSearchFields(
     }
 
     @Override
-    @PutMapping("/v1/document-search/{documentDefinitionName}/fields")
+    @PutMapping(value = {
+        "/v1/document-search/{documentDefinitionName}/fields",
+        "/management/v1/document-search/{documentDefinitionName}/fields"
+    })
     public ResponseEntity<Void> updateSearchField(
         @LoggableResource("documentDefinitionName") @PathVariable String documentDefinitionName,
         @RequestBody List<SearchFieldDto> searchFieldDtos
@@ -98,7 +107,10 @@ public ResponseEntity<Void> updateSearchField(
     }
 
     @Override
-    @DeleteMapping("/v1/document-search/{documentDefinitionName}/fields")
+    @DeleteMapping(value = {
+        "/v1/document-search/{documentDefinitionName}/fields",
+        "/management/v1/document-search/{documentDefinitionName}/fields"
+    })
     public ResponseEntity<Void> deleteSearchField(
         @LoggableResource("documentDefinitionName") @PathVariable String documentDefinitionName,
         @RequestParam String key

document/src/test/java/com/ritense/document/web/rest/searchfields/SearchFieldResourceIntegrationTest.java

@@ -114,7 +114,7 @@ void shouldStoreSearchField() throws Exception {
         var searchFieldDto = SearchFieldMapper.toDto(SEARCH_FIELD);
 
         mockMvc.perform(
-                        post("/api/v1/document-search/{documentDefinitionName}/fields",
+                        post("/api/management/v1/document-search/{documentDefinitionName}/fields",
                                 DOCUMENT_DEFINITION_NAME)
                                 .content(objectMapper.writeValueAsString(searchFieldDto))
                                 .contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -142,7 +142,7 @@ void shouldRespondWith400WhenDataTypeNotTextAndMatchTypeNotExact() throws Except
         searchFieldDto.setDataType(SearchFieldDataType.DATE);
         searchFieldDto.setMatchType(LIKE);
         mockMvc.perform(
-                        post("/api/v1/document-search/{documentDefinitionName}/fields",
+                        post("/api/management/v1/document-search/{documentDefinitionName}/fields",
                                 DOCUMENT_DEFINITION_NAME)
                                 .content(objectMapper.writeValueAsString(searchFieldDto))
                                 .contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -157,7 +157,7 @@ void shouldRespondWith400WhenDataTypeBooleanAndFieldTypeRange() throws Exception
         searchFieldDto.setDataType(SearchFieldDataType.BOOLEAN);
         searchFieldDto.setFieldType(SearchFieldFieldType.RANGE);
         mockMvc.perform(
-                        post("/api/v1/document-search/{documentDefinitionName}/fields",
+                        post("/api/management/v1/document-search/{documentDefinitionName}/fields",
                                 DOCUMENT_DEFINITION_NAME)
                                 .content(objectMapper.writeValueAsString(searchFieldDto))
                                 .contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -172,7 +172,7 @@ void shouldRespondWith400WhenDataTypeDateAndMatchTypeLike() throws Exception {
         searchFieldDto.setDataType(SearchFieldDataType.DATE);
         searchFieldDto.setMatchType(LIKE);
         mockMvc.perform(
-                post("/api/v1/document-search/{documentDefinitionName}/fields",
+                post("/api/management/v1/document-search/{documentDefinitionName}/fields",
                     DOCUMENT_DEFINITION_NAME)
                     .content(objectMapper.writeValueAsString(searchFieldDto))
                     .contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -187,7 +187,7 @@ void shouldRespondWith400BadRequestOnSearchFieldPathValidationError() throws Exc
         var searchFieldDto = new SearchFieldDto("lastName", "doc:invalid.path", TEXT, SINGLE, LIKE, null, null);
 
         mockMvc.perform(
-                        post("/api/v1/document-search/{documentDefinitionName}/fields",
+                        post("/api/management/v1/document-search/{documentDefinitionName}/fields",
                                 DOCUMENT_DEFINITION_NAME)
                                 .content(objectMapper.writeValueAsString(searchFieldDto))
                                 .contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -203,14 +203,14 @@ void shouldRetrieveSearchFieldsByDocumentDefinitionName() throws Exception {
 
         var searchFieldDto = SearchFieldMapper.toDto(SEARCH_FIELD);
         mockMvc.perform(
-                        post("/api/v1/document-search/{documentDefinitionName}/fields",
+                        post("/api/management/v1/document-search/{documentDefinitionName}/fields",
                                 DOCUMENT_DEFINITION_NAME)
                                 .content(objectMapper.writeValueAsString(searchFieldDto))
                                 .contentType(MediaType.APPLICATION_JSON_VALUE))
                 .andDo(print())
                 .andExpect(status().isOk());
         mockMvc.perform(
-                        get("/api/v1/document-search/{documentDefinitionName}/fields",
+                        get("/api/management/v1/document-search/{documentDefinitionName}/fields",
                                 DOCUMENT_DEFINITION_NAME))
                 .andDo(print())
                 .andExpect(status().isOk())
@@ -227,14 +227,14 @@ void shouldRetrieveSearchFieldsByDocumentDefinitionName() throws Exception {
     void shouldNotRetrieveSearchFieldsWithoutPermissions() throws Exception {
         var searchFieldDto = SearchFieldMapper.toDto(SEARCH_FIELD);
         mockMvc.perform(
-                post("/api/v1/document-search/{documentDefinitionName}/fields",
+                post("/api/management/v1/document-search/{documentDefinitionName}/fields",
                     DOCUMENT_DEFINITION_NAME)
                     .content(objectMapper.writeValueAsString(searchFieldDto))
                     .contentType(MediaType.APPLICATION_JSON_VALUE))
             .andDo(print())
             .andExpect(status().isOk());
         mockMvc.perform(
-                get("/api/v1/document-search/{documentDefinitionName}/fields",
+                get("/api/management/v1/document-search/{documentDefinitionName}/fields",
                     DOCUMENT_DEFINITION_NAME))
             .andDo(print())
             .andExpect(status().isOk())
@@ -261,7 +261,7 @@ void shouldUpdateSearchField() throws Exception {
                 "someTitle");
 
         mockMvc.perform(
-                        put("/api/v1/document-search/{documentDefinitionName}/fields",
+                        put("/api/management/v1/document-search/{documentDefinitionName}/fields",
                                 DOCUMENT_DEFINITION_NAME)
                                 .content(objectMapper.writeValueAsString(List.of(searchFieldToUpdate)))
                                 .contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -286,7 +286,7 @@ void shouldReturnBadRequestOnUpdateSearchField() throws Exception {
         SearchFieldDto searchFieldDto = SearchFieldMapper.toDto(SEARCH_FIELD);
         searchFieldDto.setKey("   ");
         mockMvc.perform(
-                        put("/api/v1/document-search/{documentDefinitionName}/fields",
+                        put("/api/management/v1/document-search/{documentDefinitionName}/fields",
                                 DOCUMENT_DEFINITION_NAME)
                                 .content(objectMapper.writeValueAsString(List.of(searchFieldDto)))
                                 .contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -301,7 +301,7 @@ void shouldReturnChangeOrderingWhenUpdateSearchFields() throws Exception {
                 new SearchFieldDto("firstName", "doc:firstName", TEXT, SINGLE, LIKE, null, null)
         );
         mockMvc.perform(
-                        put("/api/v1/document-search/{documentDefinitionName}/fields",
+                        put("/api/management/v1/document-search/{documentDefinitionName}/fields",
                                 "person")
                                 .content(objectMapper.writeValueAsString(searchFields))
                                 .contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -319,7 +319,7 @@ void shouldReturnChangeOrderingWhenUpdateSearchFields() throws Exception {
     void shouldDeleteSearchField() throws Exception {
         SearchFieldDto searchFieldDto = SearchFieldMapper.toDto(SEARCH_FIELD);
         mockMvc.perform(
-                        post("/api/v1/document-search/{documentDefinitionName}/fields",
+                        post("/api/management/v1/document-search/{documentDefinitionName}/fields",
                                 DOCUMENT_DEFINITION_NAME)
                                 .content(objectMapper.writeValueAsString(searchFieldDto))
                                 .contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -329,7 +329,7 @@ void shouldDeleteSearchField() throws Exception {
                 DOCUMENT_DEFINITION_NAME, SEARCH_FIELD.getKey());
         assertTrue(searchField.isPresent());
         mockMvc.perform(
-                        delete("/api/v1/document-search/{documentDefinitionName}/fields",
+                        delete("/api/management/v1/document-search/{documentDefinitionName}/fields",
                                 DOCUMENT_DEFINITION_NAME).queryParam("key", SEARCH_FIELD.getKey())
                                 .contentType(MediaType.APPLICATION_JSON_VALUE)
                 )