Fixes #718

Author: oharsta

server/src/main/java/invite/crm/CRMController.java

@@ -39,6 +39,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -391,10 +392,15 @@ public ResponseEntity<List<CRMOrganisation>> organisations() {
     @Operation(summary = "Delete CRM organisation")
     @SecurityRequirement(name = API_HEADER_SCHEME_NAME)
     @PreAuthorize("hasRole('CRM')")
-    public ResponseEntity<Void> deleteOrganisation(@RequestBody CRMOrganisation crmOrganisation) {
+    public ResponseEntity<Map<String, String>> deleteOrganisation(@RequestBody CRMOrganisation crmOrganisation) {
         Optional<Organisation> optionalOrganisation = organisationRepository.findByCrmOrganisationId(crmOrganisation.getOrganisationId());
-        optionalOrganisation.ifPresent(organisation -> organisationRepository.delete(organisation));
-        return ResponseEntity.status(204).build();
+        return optionalOrganisation
+                .map(organisation -> {
+                    organisationRepository.delete(organisation);
+                    return ResponseEntity.ok(Map.of("status", "deleted"));
+                }).orElseGet(() -> ResponseEntity.status(HttpStatus.BAD_REQUEST).body(
+                        Map.of("status",
+                                String.format("Organisation with crmOrganisationId %s not found", crmOrganisation.getOrganisationId()))));
     }
 
     @PostMapping(value = "/crm/api/v1/invite/send", produces = MediaType.APPLICATION_JSON_VALUE)

server/src/test/java/invite/crm/CRMControllerTest.java

@@ -30,6 +30,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.getAllServeEvents;
 import static invite.security.SecurityConfig.API_KEY_HEADER;
 import static io.restassured.RestAssured.given;
+import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.jupiter.api.Assertions.*;
 
 class CRMControllerTest extends AbstractMailTest {
@@ -872,11 +873,26 @@ void deleteOrganisation() {
                 .body(new CRMOrganisation(CRM_ORGANIZATION_ID, "abbr", "name"))
                 .delete("/crm/api/v1/organisations")
                 .then()
-                .statusCode(204);
+                .statusCode(200)
+                .body("status", equalTo("deleted"));
         Optional<Organisation> optionalOrganisation = organisationRepository.findByCrmOrganisationId(CRM_ORGANIZATION_ID);
         assertTrue(optionalOrganisation.isEmpty());
     }
 
+    @Test
+    void deleteOrganisationNotFound() {
+        given()
+                .when()
+                .accept(ContentType.JSON)
+                .header(API_KEY_HEADER, "secret")
+                .contentType(ContentType.JSON)
+                .body(new CRMOrganisation("nope", "abbr", "name"))
+                .delete("/crm/api/v1/organisations")
+                .then()
+                .statusCode(400)
+                .body("status", equalTo("Organisation with crmOrganisationId nope not found"));
+    }
+
     @Test
     void removeCRMRoles() throws JsonProcessingException {
         this.seedCRMData();