Extened CreatePullRequest features (#146)

* Added check for existing PR

* Use PullRequest class for object

* Added body as optional input

Author: Puffy1215

src/main/java/com/gitee/jenkins/gitee/api/GiteeClient.java

@@ -1,5 +1,7 @@
 package com.gitee.jenkins.gitee.api;
 
+import java.util.List;
+
 import com.gitee.jenkins.gitee.api.model.*;
 
 public interface GiteeClient {
@@ -11,6 +13,8 @@ public interface GiteeClient {
 
     User getCurrentUser();
 
-    void createPullRequest(String owner, String repo, String title, String base, String head);
+    void createPullRequest(PullRequest pr);
+
+    List<PullRequest> getPullRequest(PullRequest pr);
 
 }

src/main/java/com/gitee/jenkins/gitee/api/impl/GiteeApiProxy.java

@@ -1,6 +1,8 @@
 package com.gitee.jenkins.gitee.api.impl;
 
 
+import java.util.List;
+
 import com.gitee.jenkins.gitee.api.model.*;
 
 
@@ -9,6 +11,7 @@ interface GiteeApiProxy {
     void createPullRequestNote(String owner, String repo, Integer pullRequestId, String body);
     void headCurrentUser();
     void acceptPullRequest(String owner, String repo, Integer pullRequestId);
-    void createPullRequest(String owner, String repo, String title, String base, String head);
+    void createPullRequest(String owner, String repo, String title, String base, String head, String body);
+    List<PullRequest> getPullRequest(String owner, String repo, String base, String head);
     User getCurrentUser();
 }

src/main/java/com/gitee/jenkins/gitee/api/impl/GiteeV5ApiProxy.java

@@ -1,5 +1,7 @@
 package com.gitee.jenkins.gitee.api.impl;
 
+import java.util.List;
+
 import com.gitee.jenkins.gitee.api.model.*;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
@@ -38,7 +40,17 @@ void createPullRequest(@PathParam("ownerPath") String ownerPath,
                             @PathParam("repoPath") String repoPath,
                             @FormParam("title") String title,
                             @FormParam("base") String base,
-                            @FormParam("head") String head);
+                            @FormParam("head") String head,
+                            @FormParam("body") String body);
+
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    @Path("/repos/{ownerPath}/{repoPath}/pulls")
+    List<PullRequest> getPullRequest(@PathParam("ownerPath") String ownerPath,
+                                @PathParam("repoPath") String repoPath,
+                                @QueryParam("base") String base,
+                                @QueryParam("head") String head);
 
     @HEAD
     @Produces(MediaType.APPLICATION_JSON)

src/main/java/com/gitee/jenkins/gitee/api/impl/ResteasyGiteeClient.java

@@ -1,6 +1,8 @@
 package com.gitee.jenkins.gitee.api.impl;
 
 
+import java.util.List;
+
 import com.gitee.jenkins.gitee.api.GiteeClient;
 import com.gitee.jenkins.gitee.api.model.*;
 import com.google.common.base.Function;
@@ -35,8 +37,13 @@ public void createPullRequestNote(PullRequest mr, String body) {
     }
 
     @Override
-    public void createPullRequest(String owner, String repo, String title, String base, String head) {
-        api.createPullRequest(owner, repo, title, base, head);
+    public void createPullRequest(PullRequest pr) {
+        api.createPullRequest(pr.getRepoOwner(), pr.getRepoPath(), pr.getTitle(), pr.getTargetBranch(), pr.getSourceBranch(), pr.getDescription());
+    }
+
+    @Override
+    public List<PullRequest> getPullRequest(PullRequest pr) {
+        return api.getPullRequest(pr.getRepoOwner(), pr.getRepoPath(), pr.getTargetBranch(), pr.getSourceBranch());
     }
 
     @Override

src/main/java/com/gitee/jenkins/publisher/GiteeCreatePullRequestPublisher.java

@@ -9,6 +9,8 @@
 import org.kohsuke.stapler.DataBoundSetter;
 
 import com.gitee.jenkins.gitee.api.GiteeClient;
+import com.gitee.jenkins.gitee.api.model.PullRequest;
+import com.gitee.jenkins.gitee.api.model.builder.generated.PullRequestBuilder;
 import com.gitee.jenkins.util.LoggerUtil;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -35,6 +37,7 @@ public class GiteeCreatePullRequestPublisher extends Notifier implements MatrixA
     private String title;
     private String base;
     private String head;
+    private String body;
     private boolean addDatetime;
 
     @DataBoundConstructor
@@ -69,6 +72,10 @@ public boolean getAddDatetime() {
         return addDatetime;
     }
 
+    public String getBody() {
+        return body;
+    }
+
     @DataBoundSetter
     public void setRepo(String repo) {
         this.repo = repo;
@@ -99,6 +106,11 @@ public void setAddDatetime(boolean addDatetime) {
         this.addDatetime = addDatetime;
     }
 
+    @DataBoundSetter
+    public void setBody(String body) {
+        this.body = body;
+    }
+
     @Override
     public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener)
             throws InterruptedException, IOException {
@@ -115,7 +127,25 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         }
 
         if (build.getResult() == Result.SUCCESS) {
-            client.createPullRequest(owner, repo, pullRequestTitle, base, head);
+            PullRequest pr = PullRequestBuilder.pullRequest()
+                    .withRepoOwner(owner)
+                    .withRepoPath(repo)
+                    .withTitle(pullRequestTitle)
+                    .withSourceBranch(head)
+                    .withTargetBranch(base)
+                    .withDescription(body)
+                    .build();
+            
+            if (!client.getPullRequest(pr).isEmpty()) {
+                LOGGER.log(Level.INFO, "Pull request {0} -> {1} already exists", LoggerUtil.toArray(head, base));
+                if (launcher != null) {
+                    launcher.getListener().getLogger().println("Pull request {0} -> {1} already exists");
+                }
+                
+                return true;
+            }
+
+            client.createPullRequest(pr);
             LOGGER.log(Level.INFO, "Pull request {0} generated, {1} -> {2}", LoggerUtil.toArray(title, head, base));
         }
 

src/main/resources/com/gitee/jenkins/publisher/GiteeCreatePullRequestPublisher/config.jelly

@@ -19,4 +19,7 @@
     <f:entry title="${%Source.branch}" field="head">
         <f:textbox name="head" field="head"/>
     </f:entry>
+    <f:entry title="${%body}" field="body">
+        <f:textbox name="body" field="body"/>
+    </f:entry>
 </j:jelly>

src/main/resources/com/gitee/jenkins/publisher/GiteeCreatePullRequestPublisher/config.properties

@@ -3,4 +3,5 @@ Owner.name=Owner name
 Title.of.pull.request=Title of pull request
 Add.datetime=Add datetime (keep unique)
 Target.branch=Target branch
-Source.branch=Source branch
+Source.branch=Source branch
+body=Description

src/main/resources/com/gitee/jenkins/publisher/GiteeCreatePullRequestPublisher/config_zh_CN.properties

@@ -3,4 +3,5 @@ Owner.name=\u6240\u6709\u8005\u59d3\u540d
 Title.of.pull.request=Pull Request \u6807\u9898
 Add.datetime=\u6dfb\u52a0\u65e5\u671f\u65f6\u95f4\u0028\u4fdd\u6301\u552f\u4e00\u0029 
 Target.branch=\u76ee\u6807\u5206\u652f 
-Source.branch=\u6e90\u5206\u652f 
+Source.branch=\u6e90\u5206\u652f
+body=\u63cf\u8ff0

src/test/java/com/gitee/jenkins/publisher/GiteeCreatePullRequestPublisherTest.java

@@ -20,6 +20,8 @@
 import org.mockserver.client.MockServerClient;
 import org.mockserver.junit.jupiter.MockServerExtension;
 import org.mockserver.model.HttpRequest;
+import org.mockserver.model.MediaType;
+import org.mockserver.verify.VerificationTimes;
 
 import hudson.model.BuildListener;
 import hudson.model.Result;
@@ -58,6 +60,9 @@ void matrixAggregatable() throws Exception {
     @Test
     void success() throws InterruptedException, IOException {
         HttpRequest createPullRequestStatus = prepareCreatePullRequest("v5");
+        HttpRequest getPullRequest = prepareGetPullRequest("v5");
+        mockServerClient.when(getPullRequest)
+                .respond(response().withStatusCode(200).withBody("[]").withContentType(MediaType.APPLICATION_JSON));
         mockServerClient.when(createPullRequestStatus).respond(response().withStatusCode(200));
 
         GiteeCreatePullRequestPublisher p = new GiteeCreatePullRequestPublisher();
@@ -71,6 +76,29 @@ void success() throws InterruptedException, IOException {
         mockServerClient.verify(createPullRequestStatus);
     }
 
+    @Test
+    void pullRequestExists() throws InterruptedException, IOException {
+        HttpRequest createPullRequestStatus = prepareCreatePullRequest("v5");
+        mockServerClient.when(createPullRequestStatus).respond(response().withStatusCode(200));
+
+        HttpRequest getPullRequest = prepareGetPullRequest("v5");
+
+        GiteeCreatePullRequestPublisher p = new GiteeCreatePullRequestPublisher();
+        p.setRepo(REPO_PATH);
+        p.setOwner(OWNER_PATH);
+        p.setBase("base");
+        p.setHead("head");
+        p.setTitle("title");
+
+        mockServerClient.when(getPullRequest)
+                .respond(response().withStatusCode(200).withBody(
+                        String.format("[{ \"base\":\"%s\", \"head\":\"%s\" }]", p.getBase(), p.getHead()))
+                        .withContentType(MediaType.APPLICATION_JSON));
+        
+        p.perform(mockSimpleBuild(GITEE_CONNECTION_V5, Result.SUCCESS), null, listener);
+        mockServerClient.verify(createPullRequestStatus, VerificationTimes.never());
+    }
+
     @Test
     void failed() throws InterruptedException, IOException {
         GiteeCreatePullRequestPublisher p = new GiteeCreatePullRequestPublisher();
@@ -91,4 +119,11 @@ private HttpRequest prepareCreatePullRequest(String apiLevel) {
                 .withHeader("PRIVATE-TOKEN", "secret");
     }
 
+    private HttpRequest prepareGetPullRequest(String apiLevel) {
+        return request()
+                .withPath(String.format("/gitee/api/%s/repos/%s/%s/pulls", apiLevel, OWNER_PATH, REPO_PATH))
+                .withMethod("GET")
+                .withHeader("PRIVATE-TOKEN", "secret");
+    }
+
 }

src/test/java/com/gitee/jenkins/trigger/handler/pull/PullRequestHookTriggerHandlerImplTest.java

@@ -36,6 +36,7 @@
 import hudson.util.OneShotEvent;
 import java.io.File;
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.lib.Constants;
@@ -997,8 +998,13 @@ public User getCurrentUser() {
         }
 
         @Override
-        public void createPullRequest(String owner, String repo, String title, String base, String head) {
-                throw new UnsupportedOperationException("Unimplemented method 'createPullRequest'");
+        public void createPullRequest(PullRequest pr) {
+            throw new UnsupportedOperationException("Unimplemented method 'createPullRequest'");
+        }
+
+        @Override
+        public List<PullRequest> getPullRequest(PullRequest pr) {
+            throw new UnsupportedOperationException("Unimplemented method 'createPullRequest'");
         }
     }