Change pull request status to NEEDS_WORK instead of resetting approval.

Author: tommywo

src/main/java/org/sonar/plugins/stash/StashIssueReportingPostJob.java

@@ -142,7 +142,7 @@ private void postInfoAndPRsActions(
       if (shouldApprovePullRequest(config.getApprovalSeverityThreshold(), issueReport)) {
         stashRequestFacade.approvePullRequest(pr, stashClient);
       } else {
-        stashRequestFacade.resetPullRequestApproval(pr, stashClient);
+        stashRequestFacade.markPullRequestNeedsWork(pr, stashClient);
       }
     }
   }

src/main/java/org/sonar/plugins/stash/StashRequestFacade.java

@@ -93,24 +93,26 @@ public void approvePullRequest(PullRequestRef pr, StashClient stashClient) {
     }
   }
 
+
   /**
-   * Reset pull-request approval
+   * Mark that pull-request NEEDS WORK
    */
-  public void resetPullRequestApproval(PullRequestRef pr, StashClient stashClient) {
+  public void markPullRequestNeedsWork(PullRequestRef pr, StashClient stashClient) {
     try {
-      stashClient.resetPullRequestApproval(pr);
+      stashClient.markPullRequestNeedsWork(pr);
 
       // squid:S2629 : no evaluation required if the logging level is not activated
       if (LOGGER.isInfoEnabled()) {
-        LOGGER.info("Pull-request {} ({}/{}) NOT APPROVED by user \"{}\"",
-            pr.pullRequestId(), pr.project(), pr.repository(), stashClient.getLogin());
+        LOGGER.info("Pull-request {} ({}/{}) marked NEEDS WORK by user \"{}\"",
+                    pr.pullRequestId(), pr.project(), pr.repository(), stashClient.getLogin());
       }
 
     } catch (StashClientException e) {
-      LOGGER.error("Unable to reset pull-request approval", e);
+      LOGGER.error("Unable to set NEEDS WORK status on pull-request", e);
     }
   }
 
+
   /**
    * Add a reviewer to the current pull-request.
    */

src/main/java/org/sonar/plugins/stash/client/StashClient.java

@@ -64,6 +64,9 @@ public class StashClient implements AutoCloseable {
   private static final String API_ONE_PR_ALL_COMMENTS = API_ONE_PR + "/comments";
   private static final String API_ONE_PR_DIFF = API_ONE_PR + "/diff?withComments=true";
   private static final String API_ONE_PR_APPROVAL = API_ONE_PR + "/approve";
+
+  private static final String API_ONE_PR_NEEDS_WORK = API_ONE_PR + "/participants/{4}";
+
   private static final String API_ONE_PR_COMMENT_PATH = API_ONE_PR + "/comments?path={4}&start={5,number,#}";
 
   private static final String API_ONE_PR_ONE_COMMENT = API_ONE_PR_ALL_COMMENTS + "/{4}?version={5}";
@@ -97,6 +100,11 @@ public String getLogin() {
     return credentials.getLogin();
   }
 
+
+  public String getUserSlug() {
+    return credentials.getUserSlug();
+  }
+
   public void postCommentOnPullRequest(PullRequestRef pr, String report)
   throws StashClientException {
 
@@ -267,6 +275,23 @@ public void approvePullRequest(PullRequestRef pr) throws StashClientException {
          MessageFormat.format(PULL_REQUEST_APPROVAL_POST_ERROR_MESSAGE, pr.repository(), pr.pullRequestId()));
   }
 
+
+  public void markPullRequestNeedsWork(PullRequestRef pr ) throws StashClientException {
+    String request = MessageFormat.format(API_ONE_PR_NEEDS_WORK,
+                                          baseUrl,
+                                          pr.project(),
+                                          pr.repository(),
+                                          pr.pullRequestId(),
+                                          credentials.getUserSlug());
+    JsonObject json = new JsonObject();
+    json.put("status","NEEDS_WORK");
+
+    put(request,
+         json,
+         MessageFormat.format(PULL_REQUEST_APPROVAL_POST_ERROR_MESSAGE, pr.repository(), pr.pullRequestId()));
+  }
+
+
   public void resetPullRequestApproval(PullRequestRef pr) throws StashClientException {
     String request = MessageFormat.format(API_ONE_PR_APPROVAL,
                                           baseUrl,

src/test/java/org/sonar/plugins/stash/StashIssueReportingPostJobTest.java

@@ -121,7 +121,7 @@ public void testExecuteOn() throws Exception {
     verify(stashRequestFacade, times(0))
         .approvePullRequest(eq(pr), (StashClient) Mockito.anyObject());
     verify(stashRequestFacade, times(0))
-        .resetPullRequestApproval(eq(pr), (StashClient) Mockito.anyObject());
+        .markPullRequestNeedsWork(eq(pr), (StashClient) Mockito.anyObject());
   }
 
   @Test
@@ -162,7 +162,7 @@ public void testExecuteOnWithNoPluginActivation() throws Exception {
     verify(stashRequestFacade, times(0))
         .approvePullRequest(eq(pr), (StashClient) Mockito.anyObject());
     verify(stashRequestFacade, times(0))
-        .resetPullRequestApproval(eq(pr), (StashClient) Mockito.anyObject());
+        .markPullRequestNeedsWork(eq(pr), (StashClient) Mockito.anyObject());
   }
 
   @Test
@@ -183,11 +183,11 @@ public void testExecuteOnWithNoStashUserDefined() throws Exception {
     verify(stashRequestFacade, times(0))
         .approvePullRequest(eq(pr), (StashClient) Mockito.anyObject());
     verify(stashRequestFacade, times(0))
-        .resetPullRequestApproval(eq(pr), (StashClient) Mockito.anyObject());
+        .markPullRequestNeedsWork(eq(pr), (StashClient) Mockito.anyObject());
   }
 
   @Test
-  public void testExecuteOnWithResetCommentActivated() throws Exception {
+  public void testExecuteOnWithResetmvnCommentActivated() throws Exception {
     when(config.resetComments()).thenReturn(true);
 
     myJob = new StashIssueReportingPostJob(config, stashRequestFacade, server);
@@ -221,7 +221,7 @@ public void testExecuteOnWithNoDiffReport() throws Exception {
     verify(stashRequestFacade, times(0))
         .approvePullRequest(eq(pr), (StashClient) Mockito.anyObject());
     verify(stashRequestFacade, times(0))
-        .resetPullRequestApproval(eq(pr), (StashClient) Mockito.anyObject());
+        .markPullRequestNeedsWork(eq(pr), (StashClient) Mockito.anyObject());
   }
 
   @Test

src/test/java/org/sonar/plugins/stash/StashRequestFacadeTest.java

@@ -783,20 +783,20 @@ public void testApprovePullRequestException() throws Exception {
 
 
   @Test
-  public void addResetPullRequestApproval() throws Exception {
+  public void addMarkNeedsWorkPullRequestApproval() throws Exception {
 
-    myFacade.resetPullRequestApproval(pr, stashClient);
-    verify(stashClient, times(1)).resetPullRequestApproval(pr);
+    myFacade.markPullRequestNeedsWork(pr, stashClient);
+    verify(stashClient, times(1)).markPullRequestNeedsWork(pr);
   }
 
 
   @Test
-  public void addResetPullRequestApprovalException() throws Exception {
+  public void markPullRequestNeedsWorkException() throws Exception {
 
     StashClient StaCli = mock(StashClient.class);
-    doThrow(StashClientException.class).when(StaCli).resetPullRequestApproval(any());
+    doThrow(StashClientException.class).when(StaCli).markPullRequestNeedsWork(any());
 
-    myFacade.resetPullRequestApproval(pr, StaCli);
+    myFacade.markPullRequestNeedsWork(pr, StaCli);
   }