[hotfix] fix: Slack 내에 json 변환 로직 변경

Team-Recordy · Dec 17, 2024 · 2458cea · 2458cea
1 parent 5cb7530
commit 2458cea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/org/recordy/server/slack/controller/SlackController.java b/src/main/java/org/recordy/server/slack/controller/SlackController.java
@@ -30,6 +30,9 @@ public ResponseEntity<Void> handleInteractiveMessage(HttpServletRequest request)
             String actionId = slack.getActionId();
 
             if (actionId.contains("report")) {
+                if (slack.getApprovalStatus() == null || slack.getReportId() == null || slack.getThreadTimestamp() == null) {
+                    throw new SlackException(ErrorMessage.SLACK_INTERACTION_FAILED);
+                }
                 reportService.resolve(slack.getReportId(), slack.getApprovalStatus(), slack.getThreadTimestamp());
             }
 

diff --git a/src/main/java/org/recordy/server/slack/domain/Slack.java b/src/main/java/org/recordy/server/slack/domain/Slack.java
@@ -24,16 +24,19 @@ public Slack(HttpServletRequest request) {
         String encodedPayload = (String) request.getAttribute("slackPayload");
         System.out.println("Encoded Slack payload = " + encodedPayload);
 
-        if (encodedPayload == null) {
+        if (encodedPayload == null || encodedPayload.isBlank()) {
             throw new SlackException(ErrorMessage.SLACK_INTERACTION_FAILED);
         }
 
         // URL 디코딩
-        String payload = URLDecoder.decode(encodedPayload, StandardCharsets.UTF_8);
-        System.out.println("Decoded Slack payload = " + payload);
+        String decodedPayload = URLDecoder.decode(encodedPayload, StandardCharsets.UTF_8);
+        System.out.println("Decoded Slack payload = " + decodedPayload);
+
+        // "payload=" 제거
+        String jsonPayload = decodedPayload.substring(8); // "payload=" 이후의 값 추출
 
         // JSON 파싱
-        JSONObject json = new JSONObject(payload);
+        JSONObject json = new JSONObject(jsonPayload);
 
         JSONObject action = json.getJSONArray("actions").getJSONObject(0);
         JSONObject value = new JSONObject(action.getString("value"));