fix commit status api url

Author: gy2006

core/src/main/java/com/flowci/core/git/client/GithubAPIClient.java

@@ -12,6 +12,7 @@
 import com.flowci.exception.CIException;
 import com.flowci.exception.UnsupportedException;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.util.UriTemplate;
 
 import java.net.URI;
@@ -56,13 +57,18 @@ public void writeCommitStatus(GitCommitStatus commit, Secret secret) {
         body.description = commit.getDesc();
 
         try {
-            var api = String.format(CommitStatusAPI, repo.getOwner(), repo.getOwner(), commit.getId());
+            var api = String.format(CommitStatusAPI, repo.getOwner(), repo.getName(), commit.getId());
             var request = getRequestBuilder(api, tokenSecret.getTokenData())
                     .POST(HttpRequest.BodyPublishers.ofString(objectMapper.writeValueAsString(body)))
                     .build();
 
             httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString())
-                    .thenAccept(r -> log.info("Update commit status on {} is {}", commit.getUrl(), r.statusCode()));
+                    .thenAccept(r -> {
+                        log.info("Update commit status on {} is {}", commit.getUrl(), r.statusCode());
+                        if (r.statusCode() != HttpStatus.OK.value()) {
+                            log.debug(r.body());
+                        }
+                    });
 
         } catch (JsonProcessingException e) {
             throw new CIException("Unable to convert github commit body to json: " + e.getMessage());

core/src/main/java/com/flowci/core/git/domain/GitRepo.java

@@ -13,5 +13,5 @@ public class GitRepo {
 
     private String owner;
 
-    private String repo;
+    private String name;
 }

core/src/main/java/com/flowci/core/job/service/JobServiceImpl.java

@@ -289,7 +289,7 @@ public Job rerun(Flow flow, Job job) {
                 continue;
             }
 
-            if (Objects.equals(key, COMMIT_ID)) {
+            if (Objects.equals(key, COMMIT_ID) || Objects.equals(key, SOURCE) || Objects.equals(key, EVENT)) {
                 continue;
             }
 

core/src/test/java/com/flowci/core/test/git/GitHubClientTest.java

@@ -15,16 +15,16 @@ public void should_extract_owner_repo_from_commit_url() {
 
         GitRepo repo = GithubAPIClient.getRepo(commit);
         Assert.assertEquals("gy2006", repo.getOwner());
-        Assert.assertEquals("ci-test", repo.getRepo());
+        Assert.assertEquals("ci-test", repo.getName());
 
         commit.setUrl("[email protected]:gy2006/ci-test.git");
         repo = GithubAPIClient.getRepo(commit);
         Assert.assertEquals("gy2006", repo.getOwner());
-        Assert.assertEquals("ci-test", repo.getRepo());
+        Assert.assertEquals("ci-test", repo.getName());
 
         commit.setUrl("ssh://[email protected]:gy2006/ci-test.git");
         repo = GithubAPIClient.getRepo(commit);
         Assert.assertEquals("gy2006", repo.getOwner());
-        Assert.assertEquals("ci-test", repo.getRepo());
+        Assert.assertEquals("ci-test", repo.getName());
     }
 }