chore: Modify pull-request and commit Message

readme-generator · Oct 25, 2022 · 4aee92c · 4aee92c
1 parent 8c80300
commit 4aee92c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/kr/markdown/alreadyme/service/AppService.java b/src/main/java/kr/markdown/alreadyme/service/AppService.java
@@ -137,11 +137,11 @@ public PullRequest pullRequest(Request requestDto) throws Exception {
         String masterBranchName = git.getRepository().getBranch();
         JGitUtil.checkout(git, String.valueOf(requestDto.getId()));
         JGitUtil.add(git, ".");
-        JGitUtil.commit(git, "feat: Add README.md by ALREADYME-BOT", name, email);
+        JGitUtil.commit(git, "feat: Add README.md by " + id, name, email);
         JGitUtil.push(git, id, token);
 
         //GitPullRequest
-        String pullRequestUrl = GithubApiUtil.gitPullRequest(readmeItem.getGithubOriginalUrl(), token, git.getRepository().getBranch(), masterBranchName);
+        String pullRequestUrl = GithubApiUtil.gitPullRequest(readmeItem.getGithubOriginalUrl(), token, git.getRepository().getBranch(), masterBranchName, id);
 
         //Delete Local & Remote Repository
         JGitUtil.close(git);

diff --git a/src/main/java/kr/markdown/alreadyme/utils/GithubApiUtil.java b/src/main/java/kr/markdown/alreadyme/utils/GithubApiUtil.java
@@ -34,7 +34,7 @@ public static String gitFork(String githubUrl, String token) {
         return null;
     }
 
-    public static String gitPullRequest(String githubUrl, String token, String branchName, String masterBranchName) {
+    public static String gitPullRequest(String githubUrl, String token, String branchName, String masterBranchName, String githubId) {
         try {
             HttpClient httpClient = HttpClientBuilder.create().build();
             HttpPost httpPost = new HttpPost("https://api.github.com/repos"+ exportGitRepoPath(githubUrl)+"/pulls");
@@ -44,9 +44,9 @@ public static String gitPullRequest(String githubUrl, String token, String branc
 
             ObjectMapper mapper = new ObjectMapper();
             ObjectNode node = mapper.createObjectNode();
-            node.put("title", "Add README.md by ALREADYME-BOT");
-            node.put("body", "This text was created by ALREADYME-BOT\nhttps://github.com/ALREADYME-BOT");
-            node.put("head", "ALREADYME-BOT:" + branchName);
+            node.put("title", "Add README.md by " + githubId);
+            node.put("body", "This text was created by " + githubId + "\n" + "https://github.com/" + githubId);
+            node.put("head", githubId + ":" + branchName);
             node.put("base", masterBranchName);
 
             httpPost.setEntity(new StringEntity(node.toString(), "UTF-8"));
@@ -56,7 +56,6 @@ public static String gitPullRequest(String githubUrl, String token, String branc
 
             ObjectMapper resMapper = new ObjectMapper();
             JsonNode resNode = resMapper.readTree(jsonStr);
-            System.out.println(jsonStr);
             return resNode.get("html_url").asText();
 
         } catch (Exception e) {