[DDING-000] 전체 동아리 대상 피드 조회 쿼리 수정 (#349)

KoSeonJe · web-flow · commit 4b07e0c2ae7f · 2025-12-06T19:11:07.000+09:00
diff --git a/src/main/java/ddingdong/ddingdongBE/common/config/AsyncConfig.java b/src/main/java/ddingdong/ddingdongBE/common/config/AsyncConfig.java
@@ -10,12 +10,23 @@
 @EnableAsync
 public class AsyncConfig {
 
+    @Bean
+    public Executor generalAsyncExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(5);
+        executor.setMaxPoolSize(10);
+        executor.setQueueCapacity(100);
+        executor.setThreadNamePrefix("Async-");
+        executor.initialize();
+        return executor;
+    }
+
     @Bean
     public Executor emailAsyncExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setCorePoolSize(10);
         executor.setMaxPoolSize(10);
-        executor.setQueueCapacity(500);
+        executor.setQueueCapacity(5000);
         executor.setThreadNamePrefix("EmailAsync-");
         executor.initialize();
         return executor;
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/feed/api/FeedApi.java b/src/main/java/ddingdong/ddingdongBE/domain/feed/api/FeedApi.java
@@ -35,7 +35,7 @@ ClubFeedPageResponse getFeedPageByClub(
         content = @Content(schema = @Schema(implementation = NewestFeedPerClubPageResponse.class)))
     @ResponseStatus(HttpStatus.OK)
     @GetMapping("/feeds")
-    NewestFeedPerClubPageResponse getNewestFeedPerClub(
+    NewestFeedPerClubPageResponse getAllFeedPage(
         @RequestParam(value = "size", defaultValue = "9") int size,
         @RequestParam(value = "currentCursorId", defaultValue = "-1") Long currentCursorId
     );
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/feed/controller/FeedController.java b/src/main/java/ddingdong/ddingdongBE/domain/feed/controller/FeedController.java
@@ -28,11 +28,11 @@ public ClubFeedPageResponse getFeedPageByClub(
   }
 
   @Override
-  public NewestFeedPerClubPageResponse getNewestFeedPerClub(
+  public NewestFeedPerClubPageResponse getAllFeedPage(
       int size,
       Long currentCursorId
   ) {
-    NewestFeedPerClubPageQuery newestFeedPerClubPageQuery = facadeFeedService.getNewestFeedPerClubPage(size, currentCursorId);
+    NewestFeedPerClubPageQuery newestFeedPerClubPageQuery = facadeFeedService.getAllFeedPage(size, currentCursorId);
     return NewestFeedPerClubPageResponse.from(newestFeedPerClubPageQuery);
   }
 
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/feed/repository/FeedRepository.java b/src/main/java/ddingdong/ddingdongBE/domain/feed/repository/FeedRepository.java
@@ -40,32 +40,23 @@ Slice<Feed> findPageByClubIdOrderById(
 
     @Query(value = """
         select * from feed f
-        where f.id in
-        (select max(id)
-        from feed
-        where deleted_at is null
-        and (
-            f.feed_type != 'VIDEO'
-            or exists (
-                 select 1
-                    from (
-                        select id
-                            from file_meta_data
-                            where entity_id = f.id
-                            and domain_type = 'FEED_VIDEO'
-                    ) filtered_fm
-                    join vod_processing_job vpj
-                    on filtered_fm.id = vpj.file_meta_data_id
-                    where vpj.convert_job_status = 'COMPLETE'
-                    )
-            )
-        GROUP BY club_id)
-        and (:currentCursorId = -1 or id < :currentCursorId)
-        ORDER BY id DESC
-        limit :size
-        """,
-    nativeQuery = true)
-    Slice<Feed> findNewestPerClubPage(
+                   where f.deleted_at is null
+                   and (
+                       f.feed_type != 'VIDEO'
+                       or exists (
+                           select 1
+                           from file_meta_data fm
+                           join vod_processing_job vpj on fm.id = vpj.file_meta_data_id
+                           where fm.entity_id = f.id
+                           and fm.domain_type = 'FEED_VIDEO'
+                           and vpj.convert_job_status = 'COMPLETE'
+                       )
+                   )
+                   and (:currentCursorId = -1 or f.id < :currentCursorId)
+                   ORDER BY f.id DESC
+                   limit :size
+        """, nativeQuery = true)
+    Slice<Feed> getAllFeedPage(
         @Param("size") int size,
         @Param("currentCursorId") Long currentCursorId
     );
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/feed/service/FacadeFeedService.java b/src/main/java/ddingdong/ddingdongBE/domain/feed/service/FacadeFeedService.java
@@ -36,8 +36,8 @@ public ClubFeedPageQuery getFeedPageByClub(Long clubId, int size, Long currentCu
         return ClubFeedPageQuery.of(feedListQueries, pagingQuery);
     }
 
-    public NewestFeedPerClubPageQuery getNewestFeedPerClubPage(int size, Long currentCursorId) {
-        Slice<Feed> feedPage = feedService.getNewestFeedPerClubPage(size, currentCursorId);
+    public NewestFeedPerClubPageQuery getAllFeedPage(int size, Long currentCursorId) {
+        Slice<Feed> feedPage = feedService.getAllFeedPage(size, currentCursorId);
         if (feedPage == null) {
             return NewestFeedPerClubPageQuery.createEmpty();
         }
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/feed/service/FeedService.java b/src/main/java/ddingdong/ddingdongBE/domain/feed/service/FeedService.java
@@ -8,7 +8,7 @@ public interface FeedService {
 
     Slice<Feed> getFeedPageByClubId(Long clubId, int size, Long currentCursorId);
 
-    Slice<Feed> getNewestFeedPerClubPage(int size, Long currentCursorId);
+    Slice<Feed> getAllFeedPage(int size, Long currentCursorId);
 
     Feed getById(Long feedId);
 
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/feed/service/GeneralFeedService.java b/src/main/java/ddingdong/ddingdongBE/domain/feed/service/GeneralFeedService.java
@@ -27,8 +27,8 @@ public Slice<Feed> getFeedPageByClubId(Long clubId, int size, Long currentCursor
     }
 
     @Override
-    public Slice<Feed> getNewestFeedPerClubPage(int size, Long currentCursorId) {
-        Slice<Feed> feedPages = feedRepository.findNewestPerClubPage(size + 1, currentCursorId);
+    public Slice<Feed> getAllFeedPage(int size, Long currentCursorId) {
+        Slice<Feed> feedPages = feedRepository.getAllFeedPage(size + 1, currentCursorId);
         return buildSlice(feedPages, size);
     }
 
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/form/entity/FormResultSendingEmailInfo.java b/src/main/java/ddingdong/ddingdongBE/domain/form/entity/FormResultSendingEmailInfo.java
@@ -1,10 +1,11 @@
-package ddingdong.ddingdongBE.domain.form.service.event;
+package ddingdong.ddingdongBE.domain.form.entity;
 
 import ddingdong.ddingdongBE.email.entity.EmailContent;
 
-public record SendFormResultEmailEvent(
+public record FormResultSendingEmailInfo(
         Long emailSendHistoryId,
         String destinationEmail,
         String destinationName,
-        EmailContent emailContent) {
+        EmailContent emailContent
+) {
 }
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/form/infrastructure/SesFormResultEmailSender.java b/src/main/java/ddingdong/ddingdongBE/domain/form/infrastructure/SesFormResultEmailSender.java
@@ -1,5 +1,6 @@
 package ddingdong.ddingdongBE.domain.form.infrastructure;
 
+import ddingdong.ddingdongBE.domain.form.entity.FormResultSendingEmailInfo;
 import ddingdong.ddingdongBE.domain.form.service.FormResultEmailSender;
 import ddingdong.ddingdongBE.email.entity.EmailContent;
 import ddingdong.ddingdongBE.email.infrastructure.SesEmailSender;
@@ -22,12 +23,16 @@ public class SesFormResultEmailSender implements FormResultEmailSender {
     private final SesEmailSender sesEmailSender;
 
     @Override
-    public void sendResult(String destinationEmail, String destinationName, Long emailHistoryId, EmailContent emailContent) {
-        SendEmailRequest sendEmailRequest = createSendEmailRequest(destinationEmail, destinationName, emailContent);
-        sesEmailSender.sendResult(sendEmailRequest, emailHistoryId);
+    public void sendResult(FormResultSendingEmailInfo info) {
+        SendEmailRequest sendEmailRequest = createSendEmailRequest(
+                info.destinationEmail(),
+                info.destinationName(),
+                info.emailContent()
+        );
+        sesEmailSender.sendResult(sendEmailRequest, info.emailSendHistoryId());
     }
 
-    private SendEmailRequest createSendEmailRequest( String destinationEmail, String destinationName, EmailContent emailContent) {
+    private SendEmailRequest createSendEmailRequest(String destinationEmail, String destinationName, EmailContent emailContent) {
         return SendEmailRequest.builder()
                 .source(senderEmail)
                 .destination(Destination.builder()
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/form/service/FacadeCentralFormServiceImpl.java b/src/main/java/ddingdong/ddingdongBE/domain/form/service/FacadeCentralFormServiceImpl.java
@@ -29,7 +29,8 @@
 import ddingdong.ddingdongBE.domain.form.service.dto.query.MultipleFieldStatisticsQuery.OptionStatisticQuery;
 import ddingdong.ddingdongBE.domain.form.service.dto.query.SingleFieldStatisticsQuery;
 import ddingdong.ddingdongBE.domain.form.service.dto.query.SingleFieldStatisticsQuery.SingleStatisticsQuery;
-import ddingdong.ddingdongBE.domain.form.service.event.SendFormResultEmailEvent;
+import ddingdong.ddingdongBE.domain.form.entity.FormResultSendingEmailInfo;
+import ddingdong.ddingdongBE.domain.form.service.event.SendFormResultEvent;
 import ddingdong.ddingdongBE.domain.formapplication.entity.FormApplication;
 import ddingdong.ddingdongBE.domain.formapplication.service.FormAnswerService;
 import ddingdong.ddingdongBE.domain.formapplication.service.FormApplicationService;
@@ -191,11 +192,13 @@ public void sendApplicationResultEmail(SendApplicationResultEmailCommand command
                 command.target()
         );
         EmailContent emailContent = EmailContent.of(command.title(), command.message(), club);
-        formApplications.forEach(application -> {
+        List<FormResultSendingEmailInfo> formResultSendingEmailInfos = formApplications.stream()
+                .map(application -> {
                     EmailSendHistory emailSendHistory = emailSendHistoryService.save(EmailSendHistory.createPending(application));
-                    applicationEventPublisher.publishEvent(new SendFormResultEmailEvent(
-                            emailSendHistory.getId(), application.getEmail(), application.getName(), emailContent));
-                });
+                    return new FormResultSendingEmailInfo(emailSendHistory.getId(), application.getEmail(), application.getName(), emailContent);
+                })
+                .toList();
+        applicationEventPublisher.publishEvent(new SendFormResultEvent(formResultSendingEmailInfos));
     }
 
     @Transactional
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/form/service/FormResultEmailSender.java b/src/main/java/ddingdong/ddingdongBE/domain/form/service/FormResultEmailSender.java
@@ -1,8 +1,8 @@
 package ddingdong.ddingdongBE.domain.form.service;
 
-import ddingdong.ddingdongBE.email.entity.EmailContent;
+import ddingdong.ddingdongBE.domain.form.entity.FormResultSendingEmailInfo;
 
 public interface FormResultEmailSender {
 
-    void sendResult(String destinationEmail, String destinationName, Long emailHistoryId, EmailContent emailContent);
+    void sendResult(FormResultSendingEmailInfo formResultSendingEmailInfo);
 }
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/form/service/event/FormApplicationSendEmailEventHandler.java b/src/main/java/ddingdong/ddingdongBE/domain/form/service/event/FormApplicationSendEmailEventHandler.java
@@ -1,6 +1,10 @@
 package ddingdong.ddingdongBE.domain.form.service.event;
 
+import ddingdong.ddingdongBE.domain.form.entity.FormResultSendingEmailInfo;
 import ddingdong.ddingdongBE.domain.form.service.FormResultEmailSender;
+import ddingdong.ddingdongBE.email.service.EmailSendHistoryService;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
@@ -14,16 +18,26 @@
 public class FormApplicationSendEmailEventHandler {
 
     private final FormResultEmailSender formResultEmailSender;
+    private final EmailSendHistoryService emailSendHistoryService;
+    private final Executor emailAsyncExecutor;
 
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
-    @Async("emailAsyncExecutor")
-    public void sendBulkResult(SendFormResultEmailEvent event) {
-        log.info("지원 결과 이메일 전송 이벤트 핸들링 성공 : {} : {}", event.destinationEmail(), event.destinationName());
-        formResultEmailSender.sendResult(
-                event.destinationEmail(),
-                event.destinationName(),
-                event.emailSendHistoryId(),
-                event.emailContent()
-        );
+    @Async("generalAsyncExecutor")
+    public void sendBulkResult(SendFormResultEvent event) {
+        event.formResultSendingEmailInfos()
+                .forEach(info -> CompletableFuture.runAsync(
+                                () -> sendEmail(info), emailAsyncExecutor
+                        )
+                );
+    }
+
+    private void sendEmail(final FormResultSendingEmailInfo info) {
+        try {
+            log.info("지원 결과 이메일 전송 이벤트 핸들링 성공 : {} : {}", info.destinationEmail(), info.destinationName());
+            formResultEmailSender.sendResult(info);
+        } catch (Exception e) {
+            log.error("이메일 전송 실패 : {} : {}", info.destinationEmail(), info.destinationName(), e);
+            emailSendHistoryService.markNonRetryableError(info.emailSendHistoryId());
+        }
     }
 }
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/form/service/event/SendFormResultEvent.java b/src/main/java/ddingdong/ddingdongBE/domain/form/service/event/SendFormResultEvent.java
@@ -0,0 +1,10 @@
+package ddingdong.ddingdongBE.domain.form.service.event;
+
+import ddingdong.ddingdongBE.domain.form.entity.FormResultSendingEmailInfo;
+import java.util.List;
+
+public record SendFormResultEvent(
+        List<FormResultSendingEmailInfo> formResultSendingEmailInfos
+) {
+
+}
diff --git a/src/main/java/ddingdong/ddingdongBE/email/entity/EmailSendStatus.java b/src/main/java/ddingdong/ddingdongBE/email/entity/EmailSendStatus.java
@@ -10,7 +10,7 @@ public enum EmailSendStatus {
 
     PENDING("Pending"),
     SENDING("Sending"),
-    TEMPORARY_FAILURE("Tempporary Failure"),
+    TEMPORARY_FAILURE("Temporary Failure"),
     PERMANENT_FAILURE("Permanent Failure"),
     DELIVERY_SUCCESS("Delivery"),
     BOUNCE_REJECT("Bounce"),
diff --git a/src/main/java/ddingdong/ddingdongBE/sse/controller/SseConnectionController.java b/src/main/java/ddingdong/ddingdongBE/sse/controller/SseConnectionController.java
@@ -14,6 +14,7 @@ public class SseConnectionController implements SseConnectionApi {
 
     private final SseConnectionService sseConnectionService;
 
+    //TODO :  API의 헤더에 X-Accel-Buffering: no 설정해, nginx 버퍼링 제거하기
     @Override
     public SseEmitter subscribe(PrincipalDetails principalDetails) {
         User user = principalDetails.getUser();
diff --git a/src/main/java/ddingdong/ddingdongBE/sse/service/SseConnectionService.java b/src/main/java/ddingdong/ddingdongBE/sse/service/SseConnectionService.java
@@ -27,15 +27,21 @@ public SseEmitter subscribe(String id, Long timeout) {
         sseConnectionRepository.save(id, sseEmitter);
 
         // 연결 완료 콜백
-        sseEmitter.onCompletion(() -> sseConnectionRepository.deleteById(id));
+        sseEmitter.onCompletion(() -> {
+            log.info("sse connection complete");
+            sseConnectionRepository.deleteById(id);
+        });
 
         // 연결 타임아웃 콜백
-        sseEmitter.onTimeout(sseEmitter::complete);
+        sseEmitter.onTimeout(() -> {
+            log.info("sse connection timeout");
+            sseEmitter.complete();
+        });
 
         // 연결 에러 콜백
         sseEmitter.onError((ex) -> {
             log.warn("SSE Connection error: {}", ex.getMessage());
-            sseConnectionRepository.deleteById(id);
+            sseEmitter.complete();
         });
 
         try {
diff --git a/src/test/java/ddingdong/ddingdongBE/common/fixture/FeedFixture.java b/src/test/java/ddingdong/ddingdongBE/common/fixture/FeedFixture.java
@@ -0,0 +1,32 @@
+package ddingdong.ddingdongBE.common.fixture;
+
+import ddingdong.ddingdongBE.domain.club.entity.Club;
+import ddingdong.ddingdongBE.domain.feed.entity.Feed;
+import ddingdong.ddingdongBE.domain.feed.entity.FeedType;
+
+public class FeedFixture {
+
+    public static Feed createImageFeed(Club club, String content) {
+        return Feed.builder()
+                .club(club)
+                .feedType(FeedType.IMAGE)
+                .activityContent(content)
+                .build();
+    }
+
+    public static Feed createVideoFeed(Club club, String content) {
+        return Feed.builder()
+                .club(club)
+                .feedType(FeedType.VIDEO)
+                .activityContent(content)
+                .build();
+    }
+
+    public static Feed createFeed(Club club, FeedType feedType, String content) {
+        return Feed.builder()
+                .club(club)
+                .feedType(feedType)
+                .activityContent(content)
+                .build();
+    }
+}
diff --git a/src/test/java/ddingdong/ddingdongBE/common/fixture/VodProcessingJobFixture.java b/src/test/java/ddingdong/ddingdongBE/common/fixture/VodProcessingJobFixture.java
@@ -0,0 +1,40 @@
+package ddingdong.ddingdongBE.common.fixture;
+
+import com.github.f4b6a3.uuid.UuidCreator;
+import ddingdong.ddingdongBE.domain.filemetadata.entity.DomainType;
+import ddingdong.ddingdongBE.domain.filemetadata.entity.FileMetaData;
+import ddingdong.ddingdongBE.domain.filemetadata.entity.FileStatus;
+import ddingdong.ddingdongBE.domain.vodprocessing.entity.ConvertJobStatus;
+import ddingdong.ddingdongBE.domain.vodprocessing.entity.VodProcessingJob;
+
+public class VodProcessingJobFixture {
+
+    public static FileMetaData createFileMetaData(Long feedId) {
+        return FileMetaData.builder()
+                .id(UuidCreator.getTimeOrderedEpoch())
+                .fileKey("test-key-" + feedId)
+                .fileName("test-" + feedId + ".mp4")
+                .domainType(DomainType.FEED_VIDEO)
+                .entityId(feedId)
+                .fileStatus(FileStatus.COUPLED)
+                .build();
+    }
+
+    public static VodProcessingJob createCompleteVodProcessingJob(FileMetaData fileMetaData) {
+        return VodProcessingJob.builder()
+                .fileMetaData(fileMetaData)
+                .convertJobId(UuidCreator.getTimeOrderedEpoch().toString())
+                .userId("testUser")
+                .convertJobStatus(ConvertJobStatus.COMPLETE)
+                .build();
+    }
+
+    public static VodProcessingJob createPendingVodProcessingJob(FileMetaData fileMetaData) {
+        return VodProcessingJob.builder()
+                .fileMetaData(fileMetaData)
+                .convertJobId(UuidCreator.getTimeOrderedEpoch().toString())
+                .userId("testUser")
+                .convertJobStatus(ConvertJobStatus.PENDING)
+                .build();
+    }
+}
diff --git a/src/test/java/ddingdong/ddingdongBE/domain/feed/repository/FeedRepositoryTest.java b/src/test/java/ddingdong/ddingdongBE/domain/feed/repository/FeedRepositoryTest.java
diff --git a/src/test/java/ddingdong/ddingdongBE/domain/form/infrastructure/SesFormResultEmailSenderTest.java b/src/test/java/ddingdong/ddingdongBE/domain/form/infrastructure/SesFormResultEmailSenderTest.java

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,11 @@ public ClubFeedPageResponse getFeedPageByClub(`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
`31`		`- public NewestFeedPerClubPageResponse getNewestFeedPerClub(`
	`31`	`+ public NewestFeedPerClubPageResponse getAllFeedPage(`
`32`	`32`	`int size,`
`33`	`33`	`Long currentCursorId`
`34`	`34`	`) {`
`35`		`- NewestFeedPerClubPageQuery newestFeedPerClubPageQuery = facadeFeedService.getNewestFeedPerClubPage(size, currentCursorId);`
	`35`	`+ NewestFeedPerClubPageQuery newestFeedPerClubPageQuery = facadeFeedService.getAllFeedPage(size, currentCursorId);`
`36`	`36`	`return NewestFeedPerClubPageResponse.from(newestFeedPerClubPageQuery);`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ public ClubFeedPageQuery getFeedPageByClub(Long clubId, int size, Long currentCu`
`36`	`36`	`return ClubFeedPageQuery.of(feedListQueries, pagingQuery);`
`37`	`37`	`}`
`38`	`38`
`39`		`- public NewestFeedPerClubPageQuery getNewestFeedPerClubPage(int size, Long currentCursorId) {`
`40`		`- Slice<Feed> feedPage = feedService.getNewestFeedPerClubPage(size, currentCursorId);`
	`39`	`+ public NewestFeedPerClubPageQuery getAllFeedPage(int size, Long currentCursorId) {`
	`40`	`+ Slice<Feed> feedPage = feedService.getAllFeedPage(size, currentCursorId);`
`41`	`41`	`if (feedPage == null) {`
`42`	`42`	`return NewestFeedPerClubPageQuery.createEmpty();`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ public Slice<Feed> getFeedPageByClubId(Long clubId, int size, Long currentCursor`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`		`- public Slice<Feed> getNewestFeedPerClubPage(int size, Long currentCursorId) {`
`31`		`- Slice<Feed> feedPages = feedRepository.findNewestPerClubPage(size + 1, currentCursorId);`
	`30`	`+ public Slice<Feed> getAllFeedPage(int size, Long currentCursorId) {`
	`31`	`+ Slice<Feed> feedPages = feedRepository.getAllFeedPage(size + 1, currentCursorId);`
`32`	`32`	`return buildSlice(feedPages, size);`
`33`	`33`	`}`
`34`	`34`