Use plurals for the attachments endpoint that related to a feature and add testcases

Author: mprins

src/main/java/org/tailormap/api/controller/AttachmentsController.java

@@ -76,7 +76,7 @@ public AttachmentsController(EditUtil editUtil, FeatureSourceFactoryHelper featu
    */
   @PutMapping(
       path = {
-        "${tailormap-api.base-path}/{viewerKind}/{viewerName}/layer/{appLayerId}/feature/{featureId}/attachment"
+        "${tailormap-api.base-path}/{viewerKind}/{viewerName}/layer/{appLayerId}/feature/{featureId}/attachments"
       },
       consumes = MediaType.MULTIPART_FORM_DATA_VALUE,
       produces = MediaType.APPLICATION_JSON_VALUE)
@@ -99,7 +99,7 @@ public ResponseEntity<Serializable> addAttachment(
     Set<@Valid AttachmentAttributeType> attachmentAttrSet =
         tmFeatureType.getSettings().getAttachmentAttributes();
     if (attachmentAttrSet == null || attachmentAttrSet.isEmpty()) {
-      throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Feature type does not support attachments");
+      throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Layer does not support attachments");
     }
 
     AttachmentAttributeType attachmentAttributeType = attachmentAttrSet.stream()
@@ -111,7 +111,7 @@ public ResponseEntity<Serializable> addAttachment(
         .findFirst()
         .orElseThrow(() -> new ResponseStatusException(
             HttpStatus.BAD_REQUEST,
-            "Feature type does not support attachments for attribute "
+            "Layer does not support attachments for attribute "
                 + attachment.getAttributeName()
                 + " with mime type "
                 + attachment.getMimeType()
@@ -141,7 +141,7 @@ public ResponseEntity<Serializable> addAttachment(
    */
   @GetMapping(
       path = {
-        "${tailormap-api.base-path}/{viewerKind}/{viewerName}/layer/{appLayerId}/feature/{featureId}/attachment"
+        "${tailormap-api.base-path}/{viewerKind}/{viewerName}/layer/{appLayerId}/feature/{featureId}/attachments"
       },
       produces = MediaType.APPLICATION_JSON_VALUE)
   @Transactional
@@ -256,7 +256,7 @@ private void checkFeatureTypeSupportsAttachments(TMFeatureType tmFeatureType) th
     Set<@Valid AttachmentAttributeType> attachmentAttrSet =
         tmFeatureType.getSettings().getAttachmentAttributes();
     if (attachmentAttrSet == null || attachmentAttrSet.isEmpty()) {
-      throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Feature type does not support attachments");
+      throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Layer does not support attachments");
     }
   }
 }

src/main/resources/openapi/viewer-api.yaml

@@ -1718,7 +1718,7 @@ paths:
               schema:
                 $ref: './status-responses.yaml#/components/schemas/ErrorResponse'
 
-  /{viewerKind}/{viewerName}/layer/{appLayerId}/feature/{featureId}/attachment:
+  /{viewerKind}/{viewerName}/layer/{appLayerId}/feature/{featureId}/attachments:
     summary: 'Attachment operations on a single feature.'
     description: 'Attachment operations on a single feature referenced by the featureId.'
     parameters:

src/test/java/org/tailormap/api/controller/AttachmentsControllerIntegrationTest.java

@@ -7,6 +7,7 @@
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -20,6 +21,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -71,13 +73,19 @@ class AttachmentsControllerIntegrationTest {
   private static Stream<Arguments> testUrls() {
     return Stream.of(
         Arguments.of(
-            "/app/default/layer/lyr:snapshot-geoserver:postgis:begroeidterreindeel/feature/21f95499702e3a5d05230d2ae596ea1c/attachment"),
+            "/app/default/layer/lyr:snapshot-geoserver:postgis:begroeidterreindeel/feature/21f95499702e3a5d05230d2ae596ea1c/attachments"),
         Arguments.of(
-            "/app/default/layer/lyr:snapshot-geoserver:oracle:WATERDEEL/feature/93294fda97a19c37080849c5c1fddbf3/attachment"),
+            "/app/default/layer/lyr:snapshot-geoserver:oracle:WATERDEEL/feature/93294fda97a19c37080849c5c1fddbf3/attachments"),
         Arguments.of(
-            "/app/default/layer/lyr:snapshot-geoserver:sqlserver:wegdeel/feature/2d323d3d98a2101c01ef1c6274085254/attachment"));
+            "/app/default/layer/lyr:snapshot-geoserver:sqlserver:wegdeel/feature/2d323d3d98a2101c01ef1c6274085254/attachments"));
   }
 
+  private static final String layerNotEditableUrl =
+      "/app/default/layer/lyr:snapshot-geoserver:postgis:bak/feature/dbbe3dd9c3e45f1261faf5f74c67e19e/attachments";
+
+  private static final String attachmentsNotSupportedUrl =
+      "/app/default/layer/lyr:snapshot-geoserver:postgis:osm_polygon/feature/299933373/attachments";
+
   @BeforeAll
   void initialize() {
     mockMvc = MockMvcBuilders.webAppContextSetup(context).build();
@@ -138,6 +146,60 @@ void addAttachmentUnauthorised(String url) throws Exception {
         .andExpect(status().isUnauthorized());
   }
 
+  @Order(1)
+  @Test
+  @WithMockUser(
+      username = "tm-admin",
+      authorities = {ADMIN})
+  void addAttachmentsNotSupported() throws Exception {
+    String url = apiBasePath + attachmentsNotSupportedUrl;
+
+    byte[] svgBytes = new ClassPathResource("test/lichtpunt.svg").getContentAsByteArray();
+
+    MockMultipartFile svgFile = new MockMultipartFile("attachment", "lichtpunt.svg", "image/svg+xml", svgBytes);
+
+    mockMvc.perform(MockMvcRequestBuilders.multipart(url)
+            .file(attachmentMetadata)
+            .file(svgFile)
+            .with(request -> {
+              request.setMethod("PUT");
+              return request;
+            })
+            .with(setServletPath(url))
+            .accept(MediaType.APPLICATION_JSON))
+        .andExpect(status().isBadRequest())
+        .andDo(print())
+        .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
+        .andExpect(jsonPath("$.message").value("Layer does not support attachments"));
+  }
+
+  @Order(1)
+  @Test
+  @WithMockUser(
+      username = "tm-admin",
+      authorities = {ADMIN})
+  void addAttachmentsToNonEditableLayer() throws Exception {
+    String url = apiBasePath + layerNotEditableUrl;
+
+    byte[] svgBytes = new ClassPathResource("test/lichtpunt.svg").getContentAsByteArray();
+
+    MockMultipartFile svgFile = new MockMultipartFile("attachment", "lichtpunt.svg", "image/svg+xml", svgBytes);
+
+    mockMvc.perform(MockMvcRequestBuilders.multipart(url)
+            .file(attachmentMetadata)
+            .file(svgFile)
+            .with(request -> {
+              request.setMethod("PUT");
+              return request;
+            })
+            .with(setServletPath(url))
+            .accept(MediaType.APPLICATION_JSON))
+        .andExpect(status().isBadRequest())
+        .andDo(print())
+        .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
+        .andExpect(jsonPath("$.message").value("Layer is not editable"));
+  }
+
   @Order(2)
   @ParameterizedTest
   @MethodSource("testUrls")