Merge pull request #120 from cholog-project/feat/smtp-mock

dradnats1012 · web-flow · commit cc4053b8a175 · 2025-03-03T20:57:44.000+09:00
Feat/ smtp Spring Batch를 사용한 이메일 전송 - Mock
diff --git a/build.gradle b/build.gradle
@@ -60,6 +60,10 @@ dependencies {
 	// redisson
 	implementation 'org.redisson:redisson-spring-boot-starter:3.35.0'
 
+	// batch
+	implementation 'org.springframework.boot:spring-boot-starter-batch'
+
+
 	// QueryDSL (Jakarta 기반)
 	implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
 	annotationProcessor 'com.querydsl:querydsl-apt:5.0.0:jakarta'
diff --git a/src/main/java/com/example/braveCoward/BraveCowardApplication.java b/src/main/java/com/example/braveCoward/BraveCowardApplication.java
@@ -1,11 +1,15 @@
 package com.example.braveCoward;
 
+import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableScheduling
+@EnableAsync
+@EnableBatchProcessing
 public class BraveCowardApplication {
 
     public static void main(String[] args) {
diff --git a/src/main/java/com/example/braveCoward/batchinsert/email/EmailPlanReader.java b/src/main/java/com/example/braveCoward/batchinsert/email/EmailPlanReader.java
@@ -0,0 +1,36 @@
+package com.example.braveCoward.batchinsert.email;
+
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.springframework.batch.core.configuration.annotation.StepScope;
+import org.springframework.batch.item.ItemReader;
+import org.springframework.stereotype.Component;
+
+import com.example.braveCoward.model.Plan;
+import com.example.braveCoward.repository.PlanRepository;
+
+@Component
+@StepScope
+public class EmailPlanReader implements ItemReader<Plan> {
+    private final Iterator<Plan> planIterator;
+    private static final List<Plan.Status> VALID_STATUSES = Arrays.asList(Plan.Status.NOT_STARTED,
+        Plan.Status.IN_PROGRESS);
+
+    public EmailPlanReader(PlanRepository planRepository){
+        long start = System.currentTimeMillis();
+        List<Plan> plans = planRepository.findPlansWithUsers(LocalDate.now(), VALID_STATUSES);
+        System.out.println(plans.size());
+        long end = System.currentTimeMillis();
+        System.out.println("plan 조회 시간 : " + (end - start) + "ms");
+
+        this.planIterator = plans.iterator();
+    }
+
+    @Override
+    public Plan read(){
+        return planIterator.hasNext() ? planIterator.next() :null;
+    }
+}
diff --git a/src/main/java/com/example/braveCoward/batchinsert/email/EmailProcessor.java b/src/main/java/com/example/braveCoward/batchinsert/email/EmailProcessor.java
@@ -0,0 +1,17 @@
+package com.example.braveCoward.batchinsert.email;
+
+import org.springframework.batch.item.ItemProcessor;
+import org.springframework.stereotype.Component;
+
+import com.example.braveCoward.model.Plan;
+import com.example.braveCoward.model.User;
+
+@Component
+public class EmailProcessor implements ItemProcessor<Plan, String> {
+
+    @Override
+    public String process(Plan plan){
+        User user = plan.getTeamMember().getUser();
+        return user.getEmail();
+    }
+}
diff --git a/src/main/java/com/example/braveCoward/batchinsert/email/EmailWriter.java b/src/main/java/com/example/braveCoward/batchinsert/email/EmailWriter.java
@@ -0,0 +1,26 @@
+package com.example.braveCoward.batchinsert.email;
+
+import org.springframework.batch.core.configuration.annotation.StepScope;
+import org.springframework.batch.item.Chunk;
+import org.springframework.batch.item.ItemWriter;
+import org.springframework.stereotype.Component;
+
+import com.example.braveCoward.mock.MockEmailService;
+
+@Component
+@StepScope
+public class EmailWriter implements ItemWriter<String> {
+
+    private final MockEmailService mockEmailService;
+
+    public EmailWriter(MockEmailService mockEmailService){
+        this.mockEmailService = mockEmailService;
+    }
+
+    @Override
+    public void write(Chunk<? extends String> emails){
+        for (String email : emails){
+            mockEmailService.sendMockEmail(email);
+        }
+    }
+}
diff --git a/src/main/java/com/example/braveCoward/config/EmailBatchConfig.java b/src/main/java/com/example/braveCoward/config/EmailBatchConfig.java
@@ -0,0 +1,73 @@
+package com.example.braveCoward.config;
+
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.Step;
+import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
+import org.springframework.batch.core.configuration.annotation.JobScope;
+import org.springframework.batch.core.job.builder.JobBuilder;
+import org.springframework.batch.core.launch.support.RunIdIncrementer;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.builder.StepBuilder;
+import org.springframework.batch.item.ItemProcessor;
+import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.ItemWriter;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.task.TaskExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import com.example.braveCoward.model.Plan;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Configuration
+@EnableBatchProcessing
+public class EmailBatchConfig {
+
+    private final String JOB_NAME = "emailJob";
+    private final String STEP_NAME = "emailStep";
+
+    @Bean
+    public Job emailJob(
+        JobRepository jobRepository,
+        Step emailStep
+    ) {
+        return new JobBuilder(JOB_NAME, jobRepository)
+            .incrementer(new RunIdIncrementer())
+            .start(emailStep)
+            .build();
+    }
+
+    @Bean
+    @JobScope
+    public Step emailStep(
+        JobRepository jobRepository,
+        PlatformTransactionManager transactionManager,
+        ItemReader<Plan> emailReader,
+        ItemProcessor<Plan, String> emailProcessor,
+        ItemWriter<String> emailWriter,
+        @Qualifier("emailBatchExecutor") TaskExecutor emailBatchExecutor
+    ) {
+        return new StepBuilder(STEP_NAME, jobRepository)
+            .<Plan, String>chunk(4, transactionManager) // 10개씩 처리
+            .reader(emailReader)
+            .processor(emailProcessor)
+            .writer(emailWriter)
+            .taskExecutor(emailBatchExecutor) // 병렬 처리 적용
+            .build();
+    }
+
+    @Bean(name = "emailBatchExecutor")
+    public TaskExecutor emailBatchExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(8);
+        executor.setMaxPoolSize(16);
+        executor.setQueueCapacity(40);
+        executor.setThreadNamePrefix("EmailBatchThread-");
+        executor.initialize();
+        return executor;
+    }
+}
diff --git a/src/main/java/com/example/braveCoward/controller/AlarmController.java b/src/main/java/com/example/braveCoward/controller/AlarmController.java
@@ -4,6 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.example.braveCoward.mock.MockEmailService;
 import com.example.braveCoward.service.AlarmService;
 import com.example.braveCoward.service.PlanNotificationScheduler;
 
@@ -21,5 +22,22 @@ public String sendScheduledEmailNow() {
         planNotificationScheduler.sendPlanNotifications();
         return "스케줄링된 이메일이 즉시 실행되었습니다.";
     }
+
+    @GetMapping("/send-one-email")
+    public String sendOneEmail() {
+        planNotificationScheduler.sendOneEmail();
+        return "스케줄링된 이메일이 즉시 실행되었습니다.";
+    }
+
+    @GetMapping("/send-ten-email")
+    public String sendtenEmail() {
+        planNotificationScheduler.sendTenEmail();
+        return "스케줄링된 이메일이 즉시 실행되었습니다.";
+    }
+
+    @GetMapping("/send-mock-email")
+    public void sendMockEmailNotification(){
+        planNotificationScheduler.sendMockEmailNotification();
+    }
 }
 
diff --git a/src/main/java/com/example/braveCoward/controller/BatchController.java b/src/main/java/com/example/braveCoward/controller/BatchController.java
@@ -0,0 +1,41 @@
+package com.example.braveCoward.controller;
+
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.web.bind.annotation.*;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequestMapping("/batch")
+public class BatchController {
+
+    private final JobLauncher jobLauncher;
+    private final Job emailJob;
+
+    public BatchController(JobLauncher jobLauncher, Job emailJob) {
+        this.jobLauncher = jobLauncher;
+        this.emailJob = emailJob;
+    }
+
+    @GetMapping("/sendEmails")
+    public String sendEmails() {
+        try {
+            JobParameters params = new JobParametersBuilder()
+                .addLong("time", System.currentTimeMillis())
+                .toJobParameters();
+
+            JobExecution jobExecution = jobLauncher.run(emailJob, params);
+            log.info("📨 이메일 전송 Batch 실행됨. 실행 ID: {}", jobExecution.getId());
+
+            return "✅ Spring Batch Job 실행됨! (Execution ID: " + jobExecution.getId() + ")";
+        } catch (Exception e) {
+            log.error("배치 실행 실패: {}", e.getMessage());
+            return "Spring Batch 실행 실패: " + e.getMessage();
+        }
+    }
+}
diff --git a/src/main/java/com/example/braveCoward/mock/MockEmailService.java b/src/main/java/com/example/braveCoward/mock/MockEmailService.java
@@ -0,0 +1,24 @@
+package com.example.braveCoward.mock;
+
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MockEmailService {
+    private static final Logger logger = LoggerFactory.getLogger(MockEmailService.class);
+
+    @Async ("emailBatchExecutor")
+    public void sendMockEmail(String email) {
+        try {
+            TimeUnit.MILLISECONDS.sleep(4500); // 4.5초 대기
+            logger.info("Mock 이메일 전송 완료: {}", email);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            logger.error("이메일 전송 실패: {}", email, e);
+        }
+    }
+}
diff --git a/src/main/java/com/example/braveCoward/repository/PlanRepository.java b/src/main/java/com/example/braveCoward/repository/PlanRepository.java
@@ -4,6 +4,7 @@
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.repository.Repository;
 
 import com.example.braveCoward.model.Plan;
@@ -27,6 +28,11 @@ public interface PlanRepository extends Repository<Plan, Long> {
     List<Plan> findByEndDateAndStatusIn(@Param("targetDate") LocalDate targetDate,
         @Param("statuses") List<Plan.Status> statuses);
 
+    @EntityGraph(attributePaths = {"teamMember.user"})
+    @Query("SELECT p FROM Plan p WHERE p.endDate = :targetDate AND p.status IN :statuses")
+    List<Plan> findPlansWithUsers(@Param("targetDate") LocalDate targetDate,
+        @Param("statuses") List<Plan.Status> statuses);
+
     Page<Plan> findAllByProjectId(Long projectId, Pageable pageable);
 
     List<Plan> findByEndDate(LocalDate endDate);
diff --git a/src/main/java/com/example/braveCoward/service/PlanNotificationScheduler.java b/src/main/java/com/example/braveCoward/service/PlanNotificationScheduler.java
@@ -1,5 +1,6 @@
 package com.example.braveCoward.service;
 
+import com.example.braveCoward.mock.MockEmailService;
 import com.example.braveCoward.model.Plan;
 import com.example.braveCoward.model.User;
 import com.example.braveCoward.repository.PlanRepository;
@@ -18,6 +19,7 @@
 public class PlanNotificationScheduler {
     private final PlanRepository planRepository;
     private final AlarmService alarmService;
+    private final MockEmailService mockEmailService;
 
     private static final List<Plan.Status> VALID_STATUSES = Arrays.asList(Plan.Status.NOT_STARTED,
         Plan.Status.IN_PROGRESS);
@@ -42,7 +44,7 @@ public NotificationRule(int daysOffset, String messageTemplate) {
 
     // plan 마감 알림 전송 공통 메서드
     private void sendEmailNotification(LocalDate date, String messageTemplate) {
-        List<Plan> plans = planRepository.findByEndDateAndStatusIn(date, VALID_STATUSES);
+        List<Plan> plans = planRepository.findPlansWithUsers(date, VALID_STATUSES);
 
         for (Plan plan : plans) {
             User user = plan.getTeamMember().getUser();
@@ -63,4 +65,37 @@ public void sendPlanNotifications() {
             sendEmailNotification(today.plusDays(rule.daysOffset), rule.messageTemplate);
         }
     }
+
+    public void sendOneEmail() {
+        Plan plan = planRepository.findById(2L)
+            .orElseThrow(() -> new IllegalArgumentException("Plan을 찾을 수 없습니다!"));
+
+        String messageTemplate = "시간 측정용 메일 전송";
+        User user = plan.getTeamMember().getUser();
+        String description = messageTemplate
+            .replace("{title}", plan.getTitle())
+            .replace("{date}", plan.getEndDate().toString());
+
+        alarmService.sendEmailToUser(user, description);
+    }
+
+    public void sendTenEmail(){
+        for(int i = 0; i < 10; i++){
+            sendOneEmail();
+        }
+    }
+
+    public void sendMockEmailNotification() {
+        LocalDate date = LocalDate.now();
+        long start = System.currentTimeMillis();
+        List<Plan> plans = planRepository.findPlansWithUsers(date, VALID_STATUSES);
+        System.out.println(plans.size());
+        long end = System.currentTimeMillis();
+        System.out.println("plan 조회 시간 : " + (end - start) + "ms");
+
+        for (Plan plan : plans) {
+            User user = plan.getTeamMember().getUser();
+            mockEmailService.sendMockEmail(user.getEmail());
+        }
+    }
 }
