[release] analytics: 댓글 페이지네이션 방식 토큰방식으로 변경

analytics-service/src/main/java/kt/aivle/analytics/adapter/in/web/HistoricalAnalyticsController.java

@@ -1,7 +1,5 @@
 package kt.aivle.analytics.adapter.in.web;
 
-import java.util.List;
-
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,7 +12,6 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import kt.aivle.analytics.adapter.in.web.dto.response.AccountMetricsResponse;
 import kt.aivle.analytics.adapter.in.web.dto.response.EmotionAnalysisResponse;
-import kt.aivle.analytics.adapter.in.web.dto.response.PostCommentsResponse;
 import kt.aivle.analytics.adapter.in.web.dto.response.PostMetricsResponse;
 import kt.aivle.analytics.application.port.in.AnalyticsQueryUseCase;
 import kt.aivle.common.code.CommonResponseCode;
@@ -55,20 +52,6 @@ public ResponseEntity<ApiResponse<AccountMetricsResponse>> getHistoricalAccountM
         return ResponseEntity.ok(ApiResponse.of(CommonResponseCode.OK, response));
     }
 
-    @Operation(summary = "히스토리 게시물 댓글 조회", description = "게시물 댓글 히스토리를 페이지네이션으로 조회합니다.")
-    @GetMapping("/posts/comments")
-    public ResponseEntity<ApiResponse<List<PostCommentsResponse>>> getHistoricalPostComments(
-            @RequestParam("date") String dateStr,
-            @RequestParam("accountId") Long accountId,
-            @RequestParam(value = "postId", required = false) Long postId,
-            @RequestParam(value = "page", defaultValue = "0") Integer page,
-            @RequestParam(value = "size", defaultValue = "20") Integer size,
-            @RequestHeader("X-USER-ID") Long userId) {
-
-        List<PostCommentsResponse> response = analyticsQueryUseCase.getHistoricalPostComments(userId, dateStr, accountId, postId, page, size);
-
-        return ResponseEntity.ok(ApiResponse.of(CommonResponseCode.OK, response));
-    }
 
     @Operation(summary = "히스토리 게시물 감정분석 조회", description = "특정 날짜의 게시물 댓글 감정분석 결과와 키워드를 조회합니다.")
     @GetMapping("/posts/emotion-analysis")

analytics-service/src/main/java/kt/aivle/analytics/adapter/in/web/RealtimeAnalyticsController.java

@@ -1,7 +1,5 @@
 package kt.aivle.analytics.adapter.in.web;
 
-import java.util.List;
-
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,7 +11,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import kt.aivle.analytics.adapter.in.web.dto.response.AccountMetricsResponse;
-import kt.aivle.analytics.adapter.in.web.dto.response.PostCommentsResponse;
+import kt.aivle.analytics.adapter.in.web.dto.response.PostCommentsPageResponse;
 import kt.aivle.analytics.adapter.in.web.dto.response.PostMetricsResponse;
 import kt.aivle.analytics.adapter.in.web.dto.response.ReportResponse;
 import kt.aivle.analytics.application.port.in.AnalyticsQueryUseCase;
@@ -56,16 +54,16 @@ public ResponseEntity<ApiResponse<AccountMetricsResponse>> getRealtimeAccountMet
         return ResponseEntity.ok(ApiResponse.of(CommonResponseCode.OK, response));
     }
 
-    @Operation(summary = "실시간 게시물 댓글 조회", description = "특정 게시물의 실시간 댓글을 페이지네이션으로 조회합니다.")
+    @Operation(summary = "실시간 게시물 댓글 조회", description = "특정 게시물의 실시간 댓글을 YouTube API 네이티브 페이지네이션으로 조회합니다.")
     @GetMapping("/posts/comments")
-    public ResponseEntity<ApiResponse<List<PostCommentsResponse>>> getRealtimePostComments(
+    public ResponseEntity<ApiResponse<PostCommentsPageResponse>> getRealtimePostComments(
             @RequestParam("accountId") Long accountId,
             @RequestParam(value = "postId", required = false) Long postId,
-            @RequestParam(value = "page", defaultValue = "0") Integer page,
-            @RequestParam(value = "size", defaultValue = "20") Integer size,
+            @RequestParam(value = "pageToken", required = false) String pageToken,
+            @RequestParam(value = "size", defaultValue = "5") Integer size,
             @RequestHeader("X-USER-ID") Long userId) {
 
-        List<PostCommentsResponse> response = analyticsQueryUseCase.getRealtimePostComments(userId, accountId, postId, page, size);
+        PostCommentsPageResponse response = analyticsQueryUseCase.getRealtimePostComments(userId, accountId, postId, pageToken, size);
 
         return ResponseEntity.ok(ApiResponse.of(CommonResponseCode.OK, response));
     }

analytics-service/src/main/java/kt/aivle/analytics/adapter/in/web/dto/response/PostCommentsPageResponse.java

@@ -0,0 +1,46 @@
+package kt.aivle.analytics.adapter.in.web.dto.response;
+
+import java.util.List;
+
+import lombok.Builder;
+import lombok.Getter;
+
+/**
+ * YouTube API 페이지네이션을 지원하는 댓글 응답 DTO
+ */
+@Getter
+@Builder
+public class PostCommentsPageResponse {
+
+    /**
+     * 댓글 데이터 목록
+     */
+    private List<PostCommentsResponse> data;
+
+    /**
+     * 다음 페이지 요청용 토큰 (YouTube API)
+     */
+    private String nextPageToken;
+
+    /**
+     * 다음 페이지 존재 여부
+     */
+    private boolean hasNextPage;
+
+    /**
+     * 현재 페이지의 댓글 수
+     */
+    private int currentPageSize;
+
+    /**
+     * 빈 페이지 응답 생성
+     */
+    public static PostCommentsPageResponse empty() {
+        return PostCommentsPageResponse.builder()
+            .data(List.of())
+            .nextPageToken(null)
+            .hasNextPage(false)
+            .currentPageSize(0)
+            .build();
+    }
+}

analytics-service/src/main/java/kt/aivle/analytics/adapter/in/websocket/ReportWebSocketHandler.java

@@ -13,6 +13,7 @@
 import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.handler.TextWebSocketHandler;
 
+import kt.aivle.analytics.adapter.in.web.dto.response.ReportResponse;
 import kt.aivle.analytics.adapter.in.websocket.dto.MessageType;
 import kt.aivle.analytics.adapter.in.websocket.dto.ReportRequestMessage;
 import kt.aivle.analytics.adapter.in.websocket.dto.WebSocketResponseMessage;
@@ -29,7 +30,7 @@ public class ReportWebSocketHandler extends TextWebSocketHandler {
     private final ObjectMapper objectMapper;
 
     private final AtomicLong taskCounter = new AtomicLong(0);
-    private final ConcurrentHashMap<String, CompletableFuture<Void>> activeTasks = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, CompletableFuture<ReportResponse>> activeTasks = new ConcurrentHashMap<>();
 
     @Override
     public void afterConnectionEstablished(WebSocketSession session) throws Exception {
@@ -79,31 +80,39 @@ private void processReportAsync(WebSocketSession session, ReportRequestMessage r
         log.info("[WebSocket] AI 분석 보고서 생성 요청 - postId: {}, accountId: {}, storeId: {}", 
             request.getPostId(), request.getAccountId(), request.getStoreId());
 
+        // 중복 요청 방지: 이미 진행 중인 작업이 있는지 확인
+        if (!activeTasks.isEmpty()) {
+            log.info("[WebSocket] 이미 진행 중인 작업이 있습니다. 요청을 무시합니다. - sessionId: {}", session.getId());
+            return; // 조용히 무시
+        }
+
         // 진행률 전송 시작
-        sendMessage(session, WebSocketResponseMessage.progress(0, "AI 분석 보고서 생성을 시작합니다..."));
+        sendMessage(session, WebSocketResponseMessage.progress(10, "AI 분석 보고서 생성을 시작합니다..."));
 
         // accountId로 userId 조회 후 AI 분석 진행
         // userId는 sns_account 테이블에서 조회하여 사용
-        analyticsQueryUseCase.generateReportAsync(
+        CompletableFuture<ReportResponse> reportFuture = analyticsQueryUseCase.generateReportAsync(
             request.getAccountId(), 
             request.getPostId(), 
-            request.getStoreId()
+            request.getStoreId(),
+            (progress, message) -> {
+                // 진행률 콜백으로 WebSocket 메시지 전송
+                sendMessage(session, WebSocketResponseMessage.progress(progress, message));
+            }
         )
-        .thenAccept(wsMessage -> {
-            // WebSocket 메시지를 직접 전송
-            sendMessage(session, wsMessage);
-        })
-        .exceptionally(throwable -> {
-            log.error("[WebSocket] AI 분석 처리 오류: {}", throwable.getMessage(), throwable);
-            sendMessage(session, WebSocketResponseMessage.error("AI 분석 처리 오류: " + throwable.getMessage()));
-            return null;
-        })
-        .whenComplete((result, throwable) -> {
-            activeTasks.remove(taskId);
+        .whenComplete((reportResponse, throwable) -> {
             if (throwable != null) {
-                log.error("[WebSocket] 작업 완료 오류: {}", throwable.getMessage());
+                // 에러 발생 시
+                log.error("[WebSocket] AI 분석 처리 오류: {}", throwable.getMessage(), throwable);
+                sendMessage(session, WebSocketResponseMessage.error("AI 분석 처리 오류: " + throwable.getMessage()));
+            } else {
+                // 성공 시 최종 완료 메시지 전송
+                sendMessage(session, WebSocketResponseMessage.complete(reportResponse, "AI 분석 보고서가 완성되었습니다!"));
             }
 
+            // 작업 정리
+            activeTasks.remove(taskId);
+
             // 완료 후 연결 유지를 위한 지연 (캐싱된 데이터 처리 시 중요)
             if (isSessionActive(session)) {
                 try {
@@ -114,8 +123,8 @@ private void processReportAsync(WebSocketSession session, ReportRequestMessage r
             }
         });
 
-        // 작업 추적
-        activeTasks.put(taskId, CompletableFuture.completedFuture(null));
+        // 작업 추적 - 실제 CompletableFuture를 저장
+        activeTasks.put(taskId, reportFuture);
     }
 
     private void sendMessage(WebSocketSession session, WebSocketResponseMessage<?> message) {
@@ -127,9 +136,8 @@ private void sendMessage(WebSocketSession session, WebSocketResponseMessage<?> m
             }
 
             String jsonMessage = objectMapper.writeValueAsString(message);
-            log.info("[WebSocket] 메시지 전송: {}", jsonMessage);
             session.sendMessage(new TextMessage(jsonMessage));
-            log.debug("[WebSocket] 메시지 전송: {}", jsonMessage);
+            log.info("[WebSocket] 메시지 전송: {}", jsonMessage);
         } catch (IOException e) {
             log.error("[WebSocket] 메시지 전송 실패: {}", e.getMessage(), e);
         }

analytics-service/src/main/java/kt/aivle/analytics/adapter/out/infrastructure/YouTubeApiAdapter.java

@@ -19,6 +19,7 @@
 import org.springframework.stereotype.Component;
 
 import kt.aivle.analytics.adapter.in.web.dto.response.AccountMetricsResponse;
+import kt.aivle.analytics.adapter.in.web.dto.response.PostCommentsPageResponse;
 import kt.aivle.analytics.adapter.in.web.dto.response.PostCommentsResponse;
 import kt.aivle.analytics.adapter.in.web.dto.response.PostMetricsResponse;
 import kt.aivle.analytics.application.port.out.infrastructure.ExternalApiPort;
@@ -102,86 +103,39 @@ public VideoStatistics getVideoStatistics(String videoId) {
     }
 
     @Override
-    public List<PostCommentsResponse> getVideoComments(String videoId) {
-        return getVideoCommentsWithLimit(videoId, 20); // 기본 20개로 제한
-    }
-
-    @Override
-    public List<PostCommentsResponse> getVideoCommentsWithLimit(String videoId, int limit) {
+    public PostCommentsPageResponse getVideoCommentsWithPagination(String videoId, String pageToken, int maxResults) {
         try {
             YouTube.CommentThreads.List request = getYouTubeClient().commentThreads()
                 .list(List.of("snippet"))
                 .setKey(apiKey)
                 .setVideoId(videoId)
-                .setMaxResults(Math.min(limit, 100L)); // 최대 100개, 요청된 개수와 비교하여 작은 값 사용
-
-            CommentThreadListResponse response = request.execute();
-
-            if (response.getItems() == null) {
-                return List.of();
-            }
-
-            return response.getItems().stream()
-                .limit(limit) // 추가로 limit 적용
-                .map(this::toPostCommentsResponse)
-                .collect(Collectors.toList());
-
-        } catch (IOException e) {
-            handleYouTubeApiError(e, "video comments");
-            return List.of();
-        }
-    }
-
-    @Override
-    public List<PostCommentsResponse> getVideoCommentsWithPagination(String videoId, String pageToken) {
-        try {
-            YouTube.CommentThreads.List request = getYouTubeClient().commentThreads()
-                .list(List.of("snippet"))
-                .setKey(apiKey)
-                .setVideoId(videoId)
-                .setMaxResults(100L);
+                .setMaxResults(Math.min(maxResults, 100L));
 
             if (pageToken != null) {
                 request.setPageToken(pageToken);
             }
 
             CommentThreadListResponse response = request.execute();
 
-            if (response.getItems() == null) {
-                return List.of();
-            }
-
-            return response.getItems().stream()
-                .map(this::toPostCommentsResponse)
-                .collect(Collectors.toList());
-
-        } catch (IOException e) {
-            handleYouTubeApiError(e, "video comments with pagination");
-            return List.of();
-        }
-    }
-
-    @Override
-    public String getNextPageToken(String videoId, String currentPageToken) {
-        try {
-            YouTube.CommentThreads.List request = getYouTubeClient().commentThreads()
-                .list(List.of("snippet"))
-                .setKey(apiKey)
-                .setVideoId(videoId)
-                .setMaxResults(100L);
-
-            if (currentPageToken != null) {
-                request.setPageToken(currentPageToken);
-            }
-
-            CommentThreadListResponse response = request.execute();
-            return response.getNextPageToken();
+            List<PostCommentsResponse> comments = response.getItems() != null 
+                ? response.getItems().stream()
+                    .map(this::toPostCommentsResponse)
+                    .collect(Collectors.toList())
+                : List.of();
+
+            return PostCommentsPageResponse.builder()
+                .data(comments)
+                .nextPageToken(response.getNextPageToken())
+                .hasNextPage(response.getNextPageToken() != null)
+                .currentPageSize(comments.size())
+                .build();
 
         } catch (IOException e) {
-            handleYouTubeApiError(e, "get next page token");
-            return null;
+            handleYouTubeApiError(e, "video comments with pagination response");
+            return PostCommentsPageResponse.empty();
         }
     }
+
 
     // AI 분석은 별도 AiAnalysisAdapter에서 처리
 

analytics-service/src/main/java/kt/aivle/analytics/application/port/in/AnalyticsQueryUseCase.java

@@ -1,14 +1,12 @@
 package kt.aivle.analytics.application.port.in;
 
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 import kt.aivle.analytics.adapter.in.web.dto.response.AccountMetricsResponse;
 import kt.aivle.analytics.adapter.in.web.dto.response.EmotionAnalysisResponse;
-import kt.aivle.analytics.adapter.in.web.dto.response.PostCommentsResponse;
+import kt.aivle.analytics.adapter.in.web.dto.response.PostCommentsPageResponse;
 import kt.aivle.analytics.adapter.in.web.dto.response.PostMetricsResponse;
 import kt.aivle.analytics.adapter.in.web.dto.response.ReportResponse;
-import kt.aivle.analytics.adapter.in.websocket.dto.WebSocketResponseMessage;
 
 public interface AnalyticsQueryUseCase {
 
@@ -17,20 +15,18 @@ public interface AnalyticsQueryUseCase {
 
     AccountMetricsResponse getRealtimeAccountMetrics(Long userId, Long accountId);
 
-    List<PostCommentsResponse> getRealtimePostComments(Long userId, Long accountId, Long postId, Integer page, Integer size);
+    PostCommentsPageResponse getRealtimePostComments(Long userId, Long accountId, Long postId, String pageToken, Integer size);
 
     // 히스토리 데이터 조회 (date 파라미터 필수)
     PostMetricsResponse getHistoricalPostMetrics(Long userId, String dateStr, Long accountId, Long postId);
 
     AccountMetricsResponse getHistoricalAccountMetrics(Long userId, String dateStr, Long accountId);
 
-    List<PostCommentsResponse> getHistoricalPostComments(Long userId, String dateStr, Long accountId, Long postId, Integer page, Integer size);
-
     EmotionAnalysisResponse getHistoricalEmotionAnalysis(Long userId, String dateStr, Long accountId, Long postId);
 
     // AI 보고서 생성 (캐시 포함)
     ReportResponse generateReport(Long userId, Long accountId, Long postId, Long storeId);
 
     // 통합된 비동기 AI 보고서 생성 (WebSocket용) - 캐시 확인 포함
-    CompletableFuture<WebSocketResponseMessage<ReportResponse>> generateReportAsync(Long accountId, Long postId, Long storeId);
+    CompletableFuture<ReportResponse> generateReportAsync(Long accountId, Long postId, Long storeId, ProgressCallback callback);
 }

analytics-service/src/main/java/kt/aivle/analytics/application/port/in/ProgressCallback.java

@@ -0,0 +1,6 @@
+package kt.aivle.analytics.application.port.in;
+
+@FunctionalInterface
+public interface ProgressCallback {
+    void onProgress(int percentage, String message);
+}