feat: 결과 집계 / 독촉 / 최후통첩 event api 이용한 연동 추가

Author: leesanghuu

src/main/java/com/workingdead/chatbot/kakao/client/KakaoChatClientImpl.java

@@ -15,9 +15,9 @@ public class KakaoChatClientImpl implements KakaoChatClient {
 
     public KakaoChatClientImpl(
             RestClient.Builder builder,
-            @Value("${kakao.bot.base-url}") String baseUrl,
-            @Value("${kakao.bot.bot-id}") String botId,
-            @Value("${kakao.rest.api-key}") String restApiKey
+            @Value("${kakao.bot-base-url}") String baseUrl,
+            @Value("${kakao.bot-id}") String botId,
+            @Value("${kakao.rest-api-key}") String restApiKey
     ) {
         this.botId = botId;
         this.restClient = builder

src/main/java/com/workingdead/chatbot/kakao/controller/KakaoSkillController.java

@@ -11,6 +11,11 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import com.workingdead.meet.dto.ParticipantDtos.ParticipantStatusRes;
+import com.workingdead.meet.service.ParticipantService;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 카카오 i 오픈빌더 스킬 서버 컨트롤러
@@ -27,6 +32,7 @@ public class KakaoSkillController {
 
     private final KakaoWendyService kakaoWendyService;
     private final ObjectMapper objectMapper;
+    private final ParticipantService participantService;
 
 
     /**
@@ -255,6 +261,120 @@ public ResponseEntity<KakaoResponse> handleHelp(@RequestBody KakaoRequest reques
         return ResponseEntity.ok(kakaoWendyService.help());
     }
 
+    /**
+     * 독촉 스킬 (이벤트 API로 트리거되는 전용 블록)
+     * - Event API data로 voteId, timing(NUDGE_30M/NUDGE_2H/...)을 전달받아
+     *   스킬 응답에서 멘션 + 고정 문구(simpleText)를 생성합니다.
+     */
+    @Operation(summary = "독촉 (이벤트 트리거)")
+    @PostMapping("/notify/remind")
+    public ResponseEntity<KakaoResponse> handleRemind(@RequestBody KakaoRequest request) {
+        Long voteId = parseLongParam(request.getParam("voteId"));
+        String timing = safe(request.getParam("timing"));
+
+        if (voteId == null) {
+            return ResponseEntity.ok(KakaoResponse.simpleText("voteId가 없어 독촉 메시지를 만들 수 없어요."));
+        }
+
+        // 미투표자 botUserKey 목록 조회
+        List<ParticipantStatusRes> statuses = participantService.getParticipantStatusByVoteId(voteId);
+        List<String> nonVoterKeys = statuses.stream()
+                .filter(s -> !Boolean.TRUE.equals(s.submitted()))
+                .map(ParticipantStatusRes::botUserKey)
+                .filter(Objects::nonNull)
+                .filter(k -> !k.isBlank())
+                .collect(Collectors.toList());
+
+        if (nonVoterKeys.isEmpty()) {
+            return ResponseEntity.ok(KakaoResponse.simpleText("이미 모두 투표를 완료했어요! :D"));
+        }
+
+        String message = buildRemindMessage(timing);
+        return ResponseEntity.ok(buildMentionSimpleText(nonVoterKeys, message));
+    }
+
+    /**
+     * 최후통첩 스킬 (이벤트 API로 트리거되는 전용 블록)
+     */
+    @Operation(summary = "최후통첩 (이벤트 트리거)")
+    @PostMapping("/notify/final")
+    public ResponseEntity<KakaoResponse> handleFinal(@RequestBody KakaoRequest request) {
+        Long voteId = parseLongParam(request.getParam("voteId"));
+
+        if (voteId == null) {
+            return ResponseEntity.ok(KakaoResponse.simpleText("voteId가 없어 최후통첩 메시지를 만들 수 없어요."));
+        }
+
+        List<ParticipantStatusRes> statuses = participantService.getParticipantStatusByVoteId(voteId);
+        List<String> nonVoterKeys = statuses.stream()
+                .filter(s -> !Boolean.TRUE.equals(s.submitted()))
+                .map(ParticipantStatusRes::botUserKey)
+                .filter(Objects::nonNull)
+                .filter(k -> !k.isBlank())
+                .collect(Collectors.toList());
+
+        if (nonVoterKeys.isEmpty()) {
+            return ResponseEntity.ok(KakaoResponse.simpleText("이미 모두 투표를 완료했어요! :D"));
+        }
+
+        // PRD 2.4 최후통첩 메시지 동적 조립 (링크 제외)
+        String message = kakaoWendyService.buildFinalUltimatumMessage(voteId);
+
+        return ResponseEntity.ok(buildMentionSimpleText(nonVoterKeys, message));
+    }
+
+    /**
+     * 멘션 + simpleText 응답 생성
+     * - text 본문에는 #{mentions.user1} 형태의 플레이스홀더를 넣고
+     * - extra.mentions에 key(user1) -> botUserKey 값을 매핑합니다.
+     */
+    private KakaoResponse buildMentionSimpleText(List<String> botUserKeys, String message) {
+        // 카카오 멘션은 너무 길면 UX가 깨지므로 상한을 둡니다(필요 시 조정)
+        int limit = Math.min(botUserKeys.size(), 10);
+
+        Map<String, String> mentions = new LinkedHashMap<>();
+        StringBuilder sb = new StringBuilder();
+
+        for (int i = 0; i < limit; i++) {
+            String key = "user" + (i + 1);
+            mentions.put(key, botUserKeys.get(i));
+            // KakaoResponse 규약: #{mentions.key}
+            sb.append(KakaoResponse.buildMentionText(key)).append(" ");
+        }
+
+        sb.append("\n\n");
+        sb.append(message);
+
+        return KakaoResponse.simpleTextWithMentions(sb.toString().trim(), mentions);
+    }
+
+    private String buildRemindMessage(String timing) {
+        // timing 값은 NotificationType.name() (예: NUDGE_30M)
+        if (timing == null) {
+            return "투표가 시작됐어요! 다른 분들을 위해 빠른 참여 부탁드려요 :D";
+        }
+        return switch (timing) {
+            case "NUDGE_30M" -> "투표가 시작됐어요! 다른 분들을 위해 빠른 참여 부탁드려요 :D";
+            case "NUDGE_2H" -> "투표가 시작됐어요! 다른 분들을 위해 빠른 참여 부탁드려요 :D";
+            case "NUDGE_6H" -> "다들 투표를 기다리고 있어요🤔";
+            case "NUDGE_12H" -> "웬디 기다리다 지쳐버림....🥺 혹시 대머리신가요....?";
+            default -> "투표가 시작됐어요! 다른 분들을 위해 빠른 참여 부탁드려요 :D";
+        };
+    }
+
+    private static Long parseLongParam(String raw) {
+        try {
+            if (raw == null || raw.isBlank()) return null;
+            return Long.parseLong(raw.trim());
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private static String safe(String s) {
+        return (s == null) ? null : s.trim();
+    }
+
     /**
      * 헬스체크 (카카오 스킬 서버 상태 확인용)
      */

src/main/java/com/workingdead/chatbot/kakao/dto/KakaoResponse.java

@@ -282,9 +282,28 @@ public static Button messageButton(String label, String messageText) {
                 .build();
     }
 
+    /**
+     * 단순 텍스트 + 멘션(extra.mentions) 응답 생성
+     * - text에는 buildMentionText("user1") -> "#{mentions.user1}" 형태로 삽입하세요.
+     * - mentions 맵은 key(예: user1) -> botUserKey(value) 로 넣습니다.
+     */
+    public static KakaoResponse simpleTextWithMentions(String text, Map<String, String> mentions) {
+        return KakaoResponse.builder()
+                .version("2.0")
+                .template(Template.builder()
+                        .outputs(List.of(
+                                Output.builder()
+                                        .simpleText(SimpleText.builder().text(text).build())
+                                        .build()
+                        ))
+                        .build())
+                .extra((mentions == null || mentions.isEmpty()) ? null : Extra.builder().mentions(mentions).build())
+                .build();
+    }
+
     /**
      * 텍스트 + 퀵리플라이 + 멘션(extra.mentions) 응답 생성
-     * text에 #{mentions.key} 형식으로 멘션 삽입 가능
+     * text에는 buildMentionText("user1") -> "#{mentions.user1}" 형식으로 멘션을 삽입합니다.
      */
     public static KakaoResponse textWithQuickRepliesAndMentions(
             String text,

src/main/java/com/workingdead/chatbot/kakao/scheduler/KakaoWendyScheduler.java

@@ -1,94 +1,114 @@
 package com.workingdead.chatbot.kakao.scheduler;
 
+import com.workingdead.meet.entity.NotificationType;
+import com.workingdead.meet.entity.Vote;
+import com.workingdead.meet.entity.Vote.VoteStatus;
+import com.workingdead.meet.repository.VoteRepository;
 import com.workingdead.chatbot.kakao.service.KakaoNotifier;
-import com.workingdead.chatbot.kakao.service.KakaoNotifier.RemindTiming;
+import com.workingdead.meet.service.VoteNotificationService;
+import com.workingdead.meet.service.VoteStatsService;
+import com.workingdead.meet.service.VoteStatsService.VoteStats;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.time.Duration;
+import java.time.Instant;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.*;
 
 /**
- * 카카오 챗봇용 스케줄러
+ * 카카오 챗봇 투표 알림 스케줄러 (DB 기반)
  *
- * Discord WendyScheduler와 동일한 타이밍으로 알림을 전송합니다.
- * sessionKey(그룹챗이면 botGroupKey, 개인챗이면 userKey) 기반으로 스케줄을 관리합니다.
- **/
+ * - In-memory ScheduledFuture 사용 ❌
+ * - 매 1분마다 ACTIVE 투표를 조회하여
+ *   PRD 기준(집계 / 독촉 / 최후통첩 / 완료)을 판단
+ * - vote_notification 테이블로 중복 발송 방지
+ */
 @Component
 @Slf4j
 public class KakaoWendyScheduler {
 
-    private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(2);
+    private final VoteRepository voteRepository;
     private final KakaoNotifier notifier;
-    private final Map<String, List<ScheduledFuture<?>>> userTasks = new ConcurrentHashMap<>();
+    private final VoteNotificationService notificationService;
+    private final VoteStatsService voteStatsService;
 
-    public KakaoWendyScheduler(KakaoNotifier notifier) {
+    public KakaoWendyScheduler(
+            VoteRepository voteRepository,
+            KakaoNotifier notifier,
+            VoteNotificationService notificationService,
+            VoteStatsService voteStatsService
+    ) {
+        this.voteRepository = voteRepository;
         this.notifier = notifier;
+        this.notificationService = notificationService;
+        this.voteStatsService = voteStatsService;
     }
 
     /**
-     * 스케줄 시작 (투표 생성 후 호출)
+     * 1분 주기로 ACTIVE 투표를 스캔
      */
-    public void startSchedule(String sessionKey) {
-        stopSchedule(sessionKey);
+    @Scheduled(fixedDelay = 60_000)
+    public void tick() {
+        List<Vote> activeVotes = voteRepository.findAllByStatus(VoteStatus.ACTIVE);
+        for (Vote vote : activeVotes) {
+            try {
+                processVote(vote);
+            } catch (Exception e) {
+                log.error("[Kakao Scheduler] Failed to process voteId={}", vote.getId(), e);
+            }
+        }
+    }
 
-        CopyOnWriteArrayList<ScheduledFuture<?>> tasks = new CopyOnWriteArrayList<>();
+    private void processVote(Vote vote) {
+        Instant now = Instant.now();
+        Duration elapsed = Duration.between(vote.getCreatedAt(), now);
 
-        // 1) 결과 집계 시작: 3분
-        tasks.add(scheduler.schedule(
-                () -> notifier.shareVoteStatus(sessionKey),
-                3, TimeUnit.MINUTES
-        ));
+        VoteStats stats = voteStatsService.getStats(vote.getId());
 
-        // 2) 미투표자 독촉
-        tasks.add(scheduler.schedule(
-                () -> notifier.remindNonVoters(sessionKey, RemindTiming.MIN_30),
-                30, TimeUnit.MINUTES
-        ));
-        tasks.add(scheduler.schedule(
-                () -> notifier.remindNonVoters(sessionKey, RemindTiming.HOUR_2),
-                2, TimeUnit.HOURS
-        ));
-        tasks.add(scheduler.schedule(
-                () -> notifier.remindNonVoters(sessionKey, RemindTiming.HOUR_6),
-                6, TimeUnit.HOURS
-        ));
-        tasks.add(scheduler.schedule(
-                () -> notifier.remindNonVoters(sessionKey, RemindTiming.HOUR_12),
-                12, TimeUnit.HOURS
-        ));
+        // === 1. 모든 인원이 투표 완료 (PRD 2.5) ===
+        if (stats.allVoted()) {
+            if (notificationService.markSentIfFirst(vote.getId(), NotificationType.DONE_ALL_VOTED)) {
+                notifier.sendAllVoted(vote);
+                vote.close();
+                log.info("[Kakao Scheduler] All voted. voteId={} closed", vote.getId());
+            }
+            return;
+        }
 
-        // 3) 최후통첩: 24시간
-        tasks.add(scheduler.schedule(
-                () -> notifier.sendFinalNotice(sessionKey),
-                24, TimeUnit.HOURS
-        ));
-        // 4) 최후통첩 후 60분 내 미응답 시 확정
-        tasks.add(scheduler.schedule(
-                () -> notifier.finalizeIfNoResponse(sessionKey),
-                25, TimeUnit.HOURS // 24h + 1h
-        ));
+        // === 2. 결과 집계 (PRD 2.2)
+        // 기본: 3분 경과 후
+        // 예외: 3분 전이라도 과반 달성 시
+        boolean shouldAggregate = elapsed.toMinutes() >= 3
+                || (elapsed.toMinutes() < 3 && stats.majorityReached());
 
-        userTasks.put(sessionKey, tasks);
-        log.info("[Kakao Scheduler] Schedule started: {}", sessionKey);
-    }
+        if (shouldAggregate) {
+            if (notificationService.markSentIfFirst(vote.getId(), NotificationType.AGGREGATION_3M)) {
+                notifier.shareVoteStatus(vote);
+            }
+        }
 
-    /**
-     * 스케줄 중지 (세션 종료 또는 재투표 시 호출)
-     */
-    public void stopSchedule(String sessionKey) {
-        List<ScheduledFuture<?>> tasks = userTasks.remove(sessionKey);
-        if (tasks != null) {
-            tasks.forEach(task -> task.cancel(false));
-            log.info("[Kakao Scheduler] Schedule stopped: {}", sessionKey);
+        // === 3. 독촉 (PRD 2.3) ===
+        if (stats.hasNonVoters()) {
+            checkAndNudge(vote, elapsed, 30, NotificationType.NUDGE_30M);
+            checkAndNudge(vote, elapsed, 120, NotificationType.NUDGE_2H);
+            checkAndNudge(vote, elapsed, 360, NotificationType.NUDGE_6H);
+            checkAndNudge(vote, elapsed, 720, NotificationType.NUDGE_12H);
+        }
+
+        // === 4. 최후통첩 (PRD 2.4) ===
+        if (elapsed.toHours() >= 24 && stats.hasNonVoters()) {
+            if (notificationService.markSentIfFirst(vote.getId(), NotificationType.ULTIMATUM_24H)) {
+                notifier.sendFinalNotice(vote);
+            }
         }
     }
 
-    /**
-     * 활성 스케줄 여부 확인
-     */
-    public boolean hasActiveSchedule(String sessionKey) {
-        return userTasks.containsKey(sessionKey);
+    private void checkAndNudge(Vote vote, Duration elapsed, long minutes, NotificationType type) {
+        if (elapsed.toMinutes() >= minutes) {
+            if (notificationService.markSentIfFirst(vote.getId(), type)) {
+                notifier.remindNonVoters(vote, type);
+            }
+        }
     }
 }