feat(rest): create new endpoint to delete ModerationRequests by id.

Signed-off-by: Nikesh kumar <[email protected]>

rest/resource-server/src/docs/asciidoc/moderationRequests.adoc

@@ -146,3 +146,15 @@ include::{snippets}/should_document_get_moderationrequests_submission/curl-reque
 
 ===== Example response
 include::{snippets}/should_document_get_moderationrequests_submission/http-response.adoc[]
+
+[[resources-moderationRequest-delete]]
+==== Delete Moderation Requests
+
+A `DELETE` method will delete the moderation request.
+
+===== Example request
+include::{snippets}/should_document_get_moderationrequests_delete/curl-request.adoc[]
+
+===== Example response
+include::{snippets}/should_document_get_moderationrequests_delete/http-response.adoc[]
+

rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/moderationrequest/ModerationRequestController.java

@@ -28,6 +28,7 @@
 import org.eclipse.sw360.datahandler.resourcelists.ResourceClassNotFoundException;
 import org.eclipse.sw360.datahandler.thrift.ModerationState;
 import org.eclipse.sw360.datahandler.thrift.PaginationData;
+import org.eclipse.sw360.datahandler.thrift.RequestStatus;
 import org.eclipse.sw360.datahandler.thrift.components.Component;
 import org.eclipse.sw360.datahandler.thrift.components.Release;
 import org.eclipse.sw360.datahandler.thrift.moderation.DocumentType;
@@ -52,6 +53,7 @@
 import org.springframework.hateoas.server.RepresentationModelProcessor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
 
@@ -342,4 +344,32 @@ private ResponseEntity<CollectionModel<ModerationRequest>> getModerationResponse
         HttpStatus status = resources == null ? HttpStatus.NO_CONTENT : HttpStatus.OK;
         return new ResponseEntity<>(resources, status);
     }
+
+    @Operation(
+            summary = "Delete moderation request.",
+            description = "Delete delete moderation request of the service.",
+            tags = {"ModerationRequest"}
+    )
+    @PreAuthorize("hasAuthority('WRITE')")
+    @RequestMapping(value = MODERATION_REQUEST_URL + "/delete", method = RequestMethod.DELETE)
+    public ResponseEntity deleteModerationRequest(HttpServletRequest request, @RequestBody List<String> ids,
+            ModerationRequest moderationRequest) throws TException {
+        User sw360User = restControllerHelper.getSw360UserFromAuthentication();
+        HttpStatus status;
+        List<RequestStatus> requestStatusList = new ArrayList<>();
+        for (String id : ids) {
+            moderationRequest = sw360ModerationRequestService.getModerationRequestById(id);
+            RequestStatus requestStatus = sw360ModerationRequestService.deleteModerationRequestInfo(sw360User, id,
+                    moderationRequest);
+            requestStatusList.add(requestStatus);
+        }
+        for (RequestStatus requestStatus : requestStatusList) {
+            if (requestStatus != RequestStatus.SUCCESS) {
+                status = HttpStatus.INTERNAL_SERVER_ERROR;
+                return new ResponseEntity<>("Some requests failed", status);
+            }
+        }
+        status = HttpStatus.OK;
+        return new ResponseEntity<>(requestStatusList, status);
+    }
 }

rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/moderationrequest/Sw360ModerationRequestService.java

@@ -23,6 +23,7 @@
 import org.eclipse.sw360.datahandler.thrift.ModerationState;
 import org.eclipse.sw360.datahandler.thrift.PaginationData;
 import org.eclipse.sw360.datahandler.thrift.RemoveModeratorRequestStatus;
+import org.eclipse.sw360.datahandler.thrift.RequestStatus;
 import org.eclipse.sw360.datahandler.thrift.SW360Exception;
 import org.eclipse.sw360.datahandler.thrift.moderation.ModerationRequest;
 import org.eclipse.sw360.datahandler.thrift.moderation.ModerationService;
@@ -49,7 +50,7 @@ public class Sw360ModerationRequestService {
     private String thriftServerUrl;
 
     public static boolean isOpenModerationRequest(@NotNull ModerationRequest moderationRequest) {
-        return moderationRequest.getModerationState() == ModerationState.PENDING || moderationRequest.getModerationState() == ModerationState.INPROGRESS;
+        return moderationRequest.getModerationState() == ModerationState.PENDING || moderationRequest.getModerationState() == ModerationState.INPROGRESS || moderationRequest.getModerationState() == ModerationState.APPROVED;
     }
 
     private ModerationService.Iface getThriftModerationClient() throws TTransportException {
@@ -253,4 +254,15 @@ public ModerationState assignRequest(@NotNull ModerationRequest request, @NotNul
         getThriftModerationClient().setInProgress(request.getId(), reviewer);
         return ModerationState.INPROGRESS;
     }
+
+    public RequestStatus deleteModerationRequestInfo(@NotNull User sw360User, @NotNull String id, @NotNull ModerationRequest moderationRequest)
+            throws TTransportException, TException {
+        if (moderationRequest.getModerators().contains(sw360User.getEmail())) {
+            throw new AccessDeniedException("User is not assigned as a moderator for the request.");
+        } else if (!isOpenModerationRequest(moderationRequest)) {
+            throw new InvalidParameterException("Moderation request is not in open state.");
+        } else {
+            return getThriftModerationClient().deleteModerationRequest(id,sw360User);
+        }
+    }
 }

rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ModerationRequestSpecTest.java

@@ -13,6 +13,7 @@
 import org.apache.thrift.TException;
 import org.eclipse.sw360.datahandler.thrift.ModerationState;
 import org.eclipse.sw360.datahandler.thrift.PaginationData;
+import org.eclipse.sw360.datahandler.thrift.RequestStatus;
 import org.eclipse.sw360.datahandler.thrift.Visibility;
 import org.eclipse.sw360.datahandler.thrift.components.ComponentType;
 import org.eclipse.sw360.datahandler.thrift.components.ECCStatus;
@@ -52,8 +53,10 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.when;
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.linkWithRel;
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.links;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
@@ -62,6 +65,7 @@
 import static org.springframework.restdocs.payload.PayloadDocumentation.subsectionWithPath;
 import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
 import static org.springframework.restdocs.request.RequestDocumentation.requestParameters;
+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.request.MockMvcRequestBuilders.patch;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -84,6 +88,9 @@ public class ModerationRequestSpecTest extends TestRestDocsSpecBase {
     @MockBean
     private Sw360ModerationRequestService moderationRequestServiceMock;
 
+    @MockBean
+    private ModerationRequest moderationRequest;
+
     @Before
     public void before() throws TException, IOException {
         Set<String> moderatorList = new HashSet<>();
@@ -129,7 +136,7 @@ public void before() throws TException, IOException {
         project2Deletions.setProjectType(ProjectType.CUSTOMER);
         project2Deletions.setVisbility(Visibility.BUISNESSUNIT_AND_MODERATORS);
 
-        ModerationRequest moderationRequest = new ModerationRequest();
+        moderationRequest = new ModerationRequest();
         moderationRequest.setId("MR-101");
         moderationRequest.setTimestamp(System.currentTimeMillis() / 1000L - 172800);
         moderationRequest.setDocumentId("R-101");
@@ -494,4 +501,18 @@ public void should_document_get_moderationrequests_submission() throws Exception
                                 subsectionWithPath("_links").description("<<resources-index-links,Links>> to other resources")
                         )));
     }
+
+    @Test
+    public void should_document_get_moderationrequests_delete() throws Exception {
+        String accessToken = TestHelper.getAccessToken(mockMvc, testUserId, testUserPassword);
+        when(moderationRequestServiceMock.getModerationRequestById(anyString())).thenReturn(new ModerationRequest());
+        when(moderationRequestServiceMock.deleteModerationRequestInfo(any(User.class), anyString(), any(ModerationRequest.class)))
+                .thenReturn(RequestStatus.SUCCESS);
+        mockMvc.perform(delete("/api/moderationrequest/delete/")
+                .content("[\"id1\", \"id2\"]")
+                .header("Authorization", "Bearer " + accessToken)
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaTypes.HAL_JSON))
+                .andExpect(status().isOk());
+    }
 }