add request body annotation

cho-log · Jul 10, 2024 · f060004 · f060004
1 parent 7796b62
commit f060004
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/cholog/github/GithubApi.java b/src/main/java/cholog/github/GithubApi.java
@@ -4,6 +4,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
         name = "github",
@@ -26,6 +27,6 @@ PullRequestMergeResult mergePullRequest(
             @PathVariable("owner") String owner,
             @PathVariable("repo") String repository,
             @PathVariable("pull_number") int pullNumber,
-            PullRequestMergeRequest mergeRequest
+            @RequestBody PullRequestMergeRequest mergeRequest
     );
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -13,3 +13,15 @@ cholog:
     commands:
       pr-merge:
         channel-id:
+        allow-organizations:
+          - next-step
+        allow-repositories:
+          - java-ladder-func-playground
+          - java-calculator-unit-playground
+          - java-racingcar-simple-playground
+          - java-lotto-clean-playground
+          - spring-basic-roomescape-playground
+          - spring-roomescape-playground
+        disallow-branches:
+          - main
+          - master