diff --git a/src/main/java/com/kri/notihub/server/scheduler/EmailBulkSendScheduler.java b/src/main/java/com/kri/notihub/server/scheduler/EmailBulkSendScheduler.java index 69434ec..b9b9e2e 100644 --- a/src/main/java/com/kri/notihub/server/scheduler/EmailBulkSendScheduler.java +++ b/src/main/java/com/kri/notihub/server/scheduler/EmailBulkSendScheduler.java @@ -9,11 +9,17 @@ import com.kri.notihub.server.dto.send.DestInfoDto; import com.kri.notihub.server.dto.send.SendInternalResultDto; import com.kri.notihub.server.persistence.entity.TBulkSendEntity; import com.kri.notihub.server.persistence.entity.TSendEntity; +import com.kri.notihub.server.persistence.entity.TTmplatEntity; import com.kri.notihub.server.persistence.repository.BulkSendRepository; import com.kri.notihub.server.persistence.repository.SendRepository; +import com.kri.notihub.server.persistence.repository.TemplateRepository; import com.kri.notihub.server.service.SendEmailService; import java.time.LocalDateTime; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.function.Function; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.PageRequest; @@ -27,6 +33,7 @@ public class EmailBulkSendScheduler { private final SendEmailService sendEmailService; private final SendRepository sendRepository; private final BulkSendRepository bulkSendRepository; + private final TemplateRepository templateRepository; @Value("${kri.email.bulk-send.batch-size:500}") private int batchSize; @@ -46,6 +53,8 @@ public class EmailBulkSendScheduler { PageRequest.of(0, Math.max(1, batchSize)) ); + Map templateMap = loadTemplateMap(standbyList); + for (TSendEntity send : standbyList) { if (!tryMarkSending(send)) { continue; @@ -61,10 +70,29 @@ public class EmailBulkSendScheduler { sendEmailService.afterPersistSendEntities(List.of(send)); } - sleepSilently(NotihubConst.EMAIL_DELAY); + sleepSilently(resolveDelay(send, templateMap)); } } + private Map loadTemplateMap(List standbyList) { + List tmplatIdxList = standbyList.stream() + .map(TSendEntity::getTmplatIdx) + .filter(Objects::nonNull) + .distinct() + .toList(); + + if (tmplatIdxList.isEmpty()) { + return Map.of(); + } + + return templateRepository.findAllById(tmplatIdxList).stream() + .collect(Collectors.toMap( + TTmplatEntity::getTmplatIdx, + Function.identity(), + (a, b) -> a + )); + } + private void recoverStaleSending() { LocalDateTime staleBefore = DateTimeUtil.nowKstLocalDateTime() .minusMinutes(Math.max(1, sendingStaleMinutes)); @@ -137,6 +165,18 @@ public class EmailBulkSendScheduler { } } + private long resolveDelay(TSendEntity send, Map templateMap) { + long templateDelay = 0L; + if (send != null && send.getTmplatIdx() != null) { + TTmplatEntity template = templateMap.get(send.getTmplatIdx()); + if (template != null && template.getDelayTime() != null) { + templateDelay = template.getDelayTime(); + } + } + + return Math.max(templateDelay, NotihubConst.EMAIL_DELAY); + } + private void sleepSilently(long ms) { if (ms <= 0) { return; diff --git a/src/main/java/com/kri/notihub/server/service/AbstractSendService.java b/src/main/java/com/kri/notihub/server/service/AbstractSendService.java index 17bba30..646852e 100644 --- a/src/main/java/com/kri/notihub/server/service/AbstractSendService.java +++ b/src/main/java/com/kri/notihub/server/service/AbstractSendService.java @@ -286,11 +286,6 @@ public abstract class AbstractSendService { ) ); - if (isEmailChannel()) { - // 발송 간 딜레이(Pringo rate-limit 대응) - long delay = Math.max(tmplat.getDelayTime(), NotihubConst.EMAIL_DELAY); - sleepSilently(delay); - } } }