Merge pull request #274 from prgrms-web-devcourse-final-project/fix/async-report-bug(WR9-157)

Fix/async report bug(wr9 157)

Author: yhd1101

src/main/java/io/crops/warmletter/domain/report/event/AIResultReadyEvent.java

@@ -0,0 +1,5 @@
+package io.crops.warmletter.domain.report.event;
+
+import java.util.Map;
+
+public record AIResultReadyEvent(Long reportId, Map<String, String> result) {}

src/main/java/io/crops/warmletter/domain/report/event/ReportEventHandler.java

@@ -0,0 +1,24 @@
+package io.crops.warmletter.domain.report.event;
+
+import io.crops.warmletter.domain.report.service.ReportService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+@Component
+@RequiredArgsConstructor
+public class ReportEventHandler {
+
+    private final ReportService reportService;
+
+    @Async
+    @EventListener
+  //  @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    public void handleAIResultReady(AIResultReadyEvent event) {
+        reportService.updateReportWithAIResult(event.reportId(), event.result());
+    }
+
+}

src/main/java/io/crops/warmletter/domain/report/service/ReportAsyncProcessor.java

@@ -0,0 +1,24 @@
+package io.crops.warmletter.domain.report.service;
+
+import io.crops.warmletter.domain.report.enums.ReasonType;
+import io.crops.warmletter.domain.report.event.AIResultReadyEvent;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class ReportAsyncProcessor {
+
+    private final ReportModerationService reportModerationService;
+    private final ApplicationEventPublisher eventPublisher;
+
+    @Async
+    public void processReportInBackground(Long reportId, String content, ReasonType reasonType, String reason) {
+        Map<String, String> result = reportModerationService.moderateText(content, reasonType, reason);
+        eventPublisher.publishEvent(new AIResultReadyEvent(reportId, result));
+    }
+}

src/main/java/io/crops/warmletter/domain/report/service/ReportService.java

@@ -17,7 +17,6 @@
 import io.crops.warmletter.domain.report.dto.response.ReportsResponse;
 import io.crops.warmletter.domain.report.dto.response.UpdateReportResponse;
 import io.crops.warmletter.domain.report.entity.Report;
-import io.crops.warmletter.domain.report.enums.ReasonType;
 import io.crops.warmletter.domain.report.enums.ReportStatus;
 import io.crops.warmletter.domain.report.enums.ReportType;
 import io.crops.warmletter.domain.report.exception.DuplicateReportException;
@@ -33,10 +32,11 @@
 import io.crops.warmletter.domain.timeline.enums.AlarmType;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.scheduling.annotation.Async;
+
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -45,7 +45,9 @@
 import java.util.Map;
 import java.util.Optional;
 
+
 @Service
+@Slf4j
 @RequiredArgsConstructor
 public class ReportService {
 
@@ -55,7 +57,7 @@ public class ReportService {
     private final EventCommentRepository eventCommentRepository;
     private final MemberRepository memberRepository;
     private final ShareProposalRepository shareProposalRepository;
-    private final ReportModerationService reportModerationService;
+    private final ReportAsyncProcessor reportAsyncProcessor;
 
     private final AuthFacade authFacde;
 
@@ -101,7 +103,6 @@ public Page<ReportsResponse> getAllReports(String reportType, String status, Pag
     @Transactional
     public ReportResponse createReport(CreateReportRequest request) {
         Long memberId = authFacde.getCurrentUserId();
-        //Long memberId = 1L;
         Map<String, String> reportedContentMap = new HashMap<>();
         validateRequest(request, memberId, reportedContentMap);
         String reportedContent = reportedContentMap.get("content");
@@ -125,19 +126,12 @@ public ReportResponse createReport(CreateReportRequest request) {
         }
         Report report = builder.build();
         Report savedReport = reportRepository.save(report);
-
-        processReportInBackground(savedReport.getId(), reportedContent, request.getReasonType(), request.getReason());
+        reportAsyncProcessor.processReportInBackground(savedReport.getId(), reportedContent, request.getReasonType(), request.getReason());
 
         return new ReportResponse(savedReport);
     }
 
     // 신고 AI 판별 비동기 처리
-    @Async
-    public void processReportInBackground(Long reportId, String reportedContent, ReasonType reasonType, String reason) {
-        Map<String, String> moderationResult = reportModerationService.moderateText(reportedContent, reasonType, reason);
-        updateReportWithAIResult(reportId, moderationResult);
-    }
-
     @Transactional
     public void updateReportWithAIResult(Long reportId, Map<String, String> moderationResult) {
         Report report = reportRepository.findById(reportId)

src/test/java/io/crops/warmletter/domain/report/event/ReportEventHandlerTest.java

@@ -0,0 +1,36 @@
+package io.crops.warmletter.domain.report.event;
+
+import io.crops.warmletter.domain.report.service.ReportService;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import static org.mockito.Mockito.verify;
+import java.util.Map;
+
+@ExtendWith(MockitoExtension.class)
+public class ReportEventHandlerTest {
+    @Mock
+    ReportService reportService;
+
+    @InjectMocks
+    ReportEventHandler reportEventHandler;
+
+    @Test
+    @DisplayName("hanlder 테스트")
+    void handleAIResultReady_ShouldInvokeReportService() {
+        // Given
+        Long reportId = 1L;
+        Map<String, String> aiResult = Map.of("status", "RESOLVED");
+
+        AIResultReadyEvent event = new AIResultReadyEvent(reportId, aiResult);
+
+        // When
+        reportEventHandler.handleAIResultReady(event);
+
+        // Then
+        verify(reportService).updateReportWithAIResult(reportId, aiResult);
+    }
+}

src/test/java/io/crops/warmletter/domain/report/service/ReportAsyncProcessorTest.java

@@ -0,0 +1,54 @@
+package io.crops.warmletter.domain.report.service;
+import io.crops.warmletter.domain.report.enums.ReasonType;
+import io.crops.warmletter.domain.report.event.AIResultReadyEvent;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.context.ApplicationEventPublisher;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class ReportAsyncProcessorTest {
+
+    @Mock
+    ReportModerationService reportModerationService;
+
+    @Mock
+    ApplicationEventPublisher eventPublisher;
+
+    @InjectMocks
+    ReportAsyncProcessor reportAsyncProcessor;
+
+    @Test
+    void processReportInBackground_shouldModerateTextAndPublishEvent() {
+        // Given
+        Long reportId = 1L;
+        String content = "신고 대상 콘텐츠";
+        ReasonType reasonType = ReasonType.ETC;
+        String reason = "기타 사유";
+
+        Map<String, String> mockResult = Map.of("status", "RESOLVED");
+        when(reportModerationService.moderateText(content, reasonType, reason)).thenReturn(mockResult);
+
+        // When
+        reportAsyncProcessor.processReportInBackground(reportId, content, reasonType, reason);
+
+        // Then
+        verify(reportModerationService).moderateText(content, reasonType, reason);
+
+        // 이벤트 검증 (캡처해서 값까지 확인)
+        ArgumentCaptor<AIResultReadyEvent> captor = ArgumentCaptor.forClass(AIResultReadyEvent.class);
+        verify(eventPublisher).publishEvent(captor.capture());
+
+        AIResultReadyEvent event = captor.getValue();
+        assertThat(event.reportId()).isEqualTo(reportId);
+        assertThat(event.result()).isEqualTo(mockResult);
+    }
+}