fix: emailQueue 위치 EmailAsyncService 내부로 변경 #375

kgu-clab · Jun 14, 2024 · 4275acd · 4275acd
1 parent 7ac4c49
commit 4275acd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/main/java/page/clab/api/global/common/email/application/EmailAsyncService.java b/src/main/java/page/clab/api/global/common/email/application/EmailAsyncService.java
@@ -18,8 +18,8 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-
-import static page.clab.api.global.common.email.application.EmailService.emailQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 
 @Service
 @Slf4j
@@ -33,6 +33,8 @@ public class EmailAsyncService {
 
     private static final int MAX_BATCH_SIZE = 10;
 
+    private static final BlockingQueue<EmailTask> emailQueue = new LinkedBlockingQueue<>();
+
     @Async
     public void sendEmailAsync(String to, String subject, String content, List<File> files, EmailTemplateType emailTemplateType) throws MessagingException {
         log.debug("Sending email to: {}", to);

diff --git a/src/main/java/page/clab/api/global/common/email/application/EmailService.java b/src/main/java/page/clab/api/global/common/email/application/EmailService.java
@@ -12,7 +12,6 @@
 import page.clab.api.domain.member.application.MemberService;
 import page.clab.api.domain.member.domain.Member;
 import page.clab.api.domain.member.dto.response.MemberResponseDto;
-import page.clab.api.global.common.email.domain.EmailTask;
 import page.clab.api.global.common.email.domain.EmailTemplateType;
 import page.clab.api.global.common.email.dto.request.EmailDto;
 import page.clab.api.global.common.email.exception.MessageSendingFailedException;
@@ -23,8 +22,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
 
 @Service
 @RequiredArgsConstructor
@@ -40,8 +37,6 @@ public class EmailService {
     @Value("${resource.file.path}")
     private String filePath;
 
-    protected static final BlockingQueue<EmailTask> emailQueue = new LinkedBlockingQueue<>();
-
     public List<String> broadcastEmail(EmailDto emailDto, List<MultipartFile> multipartFiles) {
         List<File> convertedFiles = multipartFiles != null && !multipartFiles.isEmpty()
                 ? convertMultipartFiles(multipartFiles)