Gemini와 Github 에러 처리 방식 분기

Gemini와 Github 에러 처리 방식 분기

Author: Jwhyee

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

@@ -28,15 +28,20 @@ class CodeReviewController(
     ): ResponseEntity<String> {
         if (sig256 == null) {
             logger.warn("Missing signature header for GitHub webhook")
-            return unauthorized("Missing signature")
+            return fail("Missing signature")
         }
         // 서명 검증
         if (!GithubSignature.isValid(sig256, secret, rawBody)) {
             logger.warn("Invalid signature detected from GitHub webhook")
-            return unauthorized("Invalid signature")
+            return fail("Invalid signature")
+        }
+
+        val payload = try {
+            parsePayload(rawBody)
+        } catch (e: Exception) {
+            return fail("Invalid payload : ${e.message}", HttpStatus.NOT_ACCEPTABLE)
         }
 
-        val payload = parsePayload(rawBody)
         val action = GithubActionType(payload.action)
         logger.info("payload = {}, action = {}", payload, action)
 
@@ -55,7 +60,8 @@ class CodeReviewController(
         return ResponseEntity.ok("Request completed")
     }
 
-    private fun unauthorized(
-        message: String
-    ) = ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(message)
+    private fun fail(
+        message: String,
+        status: HttpStatus = HttpStatus.UNAUTHORIZED
+    ) = ResponseEntity.status(status).body(message)
 }

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

@@ -5,6 +5,7 @@ import com.project.codereview.client.github.GithubReviewClient
 import com.project.codereview.client.google.GoogleGeminiClient
 import com.project.codereview.core.dto.GithubPayload
 import com.project.codereview.core.dto.GithubReviewDto
+import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
 @Service
@@ -13,16 +14,38 @@ class ReviewWorker(
     private val githubReviewClient: GithubReviewClient,
     private val failedTaskManager: FailedTaskManager
 ) {
+    private val logger = LoggerFactory.getLogger(ReviewWorker::class.java)
+
     suspend fun process(payload: GithubPayload, task: DiffTaskPreparer.ReviewTask) {
         val prompt = "```diff\n${task.part.content}\n```"
         val filePath = task.part.filePath
 
+        val reviewResult = runCatching {
+            googleGeminiClient.chat(filePath, prompt)
+        }.onFailure { e ->
+            logger.warn("[Gemini error] - $payload, $task")
+            logger.warn("[Gemini error] - {}", e.message)
+            handleGeminiError(e.message ?: "", prompt, payload, task)
+        }
+
+        val review = reviewResult.getOrNull() ?: return
+
         runCatching {
-            val review = googleGeminiClient.chat(filePath, prompt)
-            if (review != null) {
-                githubReviewClient.addReviewComment(GithubReviewDto(task.payload, task.part, payload.installation.id, review))
-            }
-        }.onFailure {
+            githubReviewClient.addReviewComment(GithubReviewDto(task.payload, task.part, payload.installation.id, review))
+        }.onFailure { e ->
+            logger.warn("[Github error] - $payload, $task")
+            logger.warn("[Github error] - cause {}", e.message)
+        }
+    }
+
+    private fun handleGeminiError(
+        e: String,
+        prompt: String,
+        payload: GithubPayload,
+        task: DiffTaskPreparer.ReviewTask
+    ) {
+        val isTooManyRequestError = e.contains("429 Too Many Requests") || e.contains("429")
+        if (isTooManyRequestError) {
             failedTaskManager.add(FailedTaskManager.OriginalTask(payload, task.part), prompt)
         }
     }