Repository 웹 훅 제거 후 App 웹 훅으로 이전

Repository 웹 훅에서 App 웹 훅 변경으로 인한 Installation ID 환경 변수 제거 후 Payload DTO에 추가

Author: Jwhyee

.github/workflows/deploy.yml

@@ -12,7 +12,6 @@ jobs:
       GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
       API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
       APP_ID: ${{ secrets.APP_ID }}
-      APP_INSTALLATION_ID: ${{ secrets.APP_INSTALLATION_ID }}
       APP_PEM: ${{ secrets.APP_PEM }}
     steps:
       - name: Clean GitHub Actions cache only
@@ -86,7 +85,6 @@ jobs:
       GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
       API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
       APP_ID: ${{ secrets.APP_ID }}
-      APP_INSTALLATION_ID: ${{ secrets.APP_INSTALLATION_ID }}
       APP_PEM: ${{ secrets.APP_PEM }}
 
     steps:

src/main/kotlin/com/project/codereview/batch/FailedTaskManager.kt

@@ -15,7 +15,7 @@ class FailedTaskManager {
         val part: GithubDiffUtils.FileDiff
     ) {
         fun toGithubReviewDto(review: String): GithubReviewDto {
-            return GithubReviewDto(payload.pull_request, part, review)
+            return GithubReviewDto(payload.pull_request, part, payload.installation.id, review)
         }
     }
 

src/main/kotlin/com/project/codereview/batch/FailedTaskRetryScheduler.kt

@@ -23,7 +23,6 @@ class FailedTaskRetryScheduler(
             val batchSize = 10
             val batch = failedTaskManager.pollBatch(batchSize)
             if (batch.isEmpty()) {
-                logger.info("[Retry Skip] queue is empty")
                 return@launch
             }
 

src/main/kotlin/com/project/codereview/client/github/GithubAppTokenProvider.kt

@@ -13,7 +13,6 @@ import java.util.*
 @Component
 class GithubAppTokenProvider(
     @param:Value("\${app.github.app.app-id}") private val appId: String,
-    @param:Value("\${app.github.app.installation-id}") private val installationId: String,
     @param:Value("\${app.github.app.private-key}") private val appPem: String
 ) {
     @Volatile private var cachedToken: String? = null
@@ -39,7 +38,7 @@ class GithubAppTokenProvider(
             .compact()
     }
 
-    fun getInstallationToken(): String {
+    fun getInstallationToken(installationId: String): String {
         val now = Instant.now()
         if (cachedToken != null && expiresAt?.isAfter(now.plusSeconds(30)) == true) {
             return cachedToken!!                         // 만료 30초 전까지 재사용

src/main/kotlin/com/project/codereview/client/github/GithubReviewClient.kt

@@ -19,7 +19,6 @@ class GithubReviewClient(
     val client = WebClient.builder()
         .baseUrl("https://api.github.com")
         .defaultHeader("Accept", "application/vnd.github+json")
-        .defaultHeader("Authorization", "Bearer ${tokenProvider.getInstallationToken()}")
         .build()
 
     suspend fun addReviewComment(
@@ -31,6 +30,7 @@ class GithubReviewClient(
 
         client.post()
             .uri(uri)
+            .header("Authorization", "Bearer ${tokenProvider.getInstallationToken(dto.installationId)}")
             .bodyValue(dto.toReviewCommentRequest())
             .retrieve()
             .bodyToMono(String::class.java)

src/main/kotlin/com/project/codereview/core/controller/CodeReviewController.kt

@@ -43,7 +43,10 @@ class CodeReviewController(
         // PR 생성 시에만 리뷰 진행
         when (event) {
             "pull_request" -> when (GithubActionType(payload.action)) {
-                GithubActionType.OPENED -> codeReviewService.review(payload)
+                GithubActionType.OPENED,
+                GithubActionType.REOPENED -> {
+                    codeReviewService.review(payload)
+                }
                 else -> logger.info("Ignored pull_request event: ${payload.action}")
             }
             else -> logger.debug("Unhandled GitHub event: $event")

src/main/kotlin/com/project/codereview/core/dto/GithubPayloadDtos.kt

@@ -8,9 +8,15 @@ import com.fasterxml.jackson.module.kotlin.readValue
 data class GithubPayload(
     val action: String,
     val number: String,
+    val installation: InstallationPayload,
     val pull_request: PullRequestPayload
 )
 
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class InstallationPayload(
+    val id: String
+)
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class PullRequestPayload(
     val url: String,

src/main/kotlin/com/project/codereview/core/dto/GithubReviewDto.kt

@@ -7,6 +7,7 @@ import com.project.codereview.client.github.GithubReviewClient
 data class GithubReviewDto(
     val payload: PullRequestPayload,
     val diff: GithubDiffUtils.FileDiff,
+    val installationId: String,
     val review: String
 ) {
     fun toReviewCommentRequest() = GithubReviewClient.ReviewCommentRequest(

src/main/kotlin/com/project/codereview/core/service/ReviewWorker.kt

@@ -20,7 +20,7 @@ class ReviewWorker(
         runCatching {
             val review = googleGeminiClient.chat(filePath, prompt)
             if (review != null) {
-                githubReviewClient.addReviewComment(GithubReviewDto(task.payload, task.part, review))
+                githubReviewClient.addReviewComment(GithubReviewDto(task.payload, task.part, payload.installation.id, review))
             }
         }.onFailure {
             failedTaskManager.add(FailedTaskManager.OriginalTask(payload, task.part), prompt)

src/main/resources/application.yaml

@@ -6,7 +6,6 @@ app:
   github:
     app:
       app-id: ${APP_ID}
-      installation-id: ${APP_INSTALLATION_ID}
       private-key: ${APP_PEM}
     webhook:
       secret-key: ${WEBHOOK_SECRET}