diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java index 3dabd73a..f22b8d19 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java @@ -15,6 +15,7 @@ import app.module.mms.ports.MMSPortIn; import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -34,6 +35,10 @@ class AutoSchedulesService implements AutoSchedulesPortIn { private final GetIncompleteHouseholdsPortIn getIncompleteHouseholdsPortIn; private final BatchLogRunner batchLogRunner; + // TODO(ks) : 문자발송 테스트 + @Value("${spring.profiles.active}") + private String activeProfiles; + @Override public Optional operate() { batchLogRunner.run(BatchLogType.MONTHLY_STATUS, portOut::operate); @@ -43,42 +48,44 @@ class AutoSchedulesService implements AutoSchedulesPortIn { @Override @Transactional public Optional sendAutoSms() { - GetSmsAutoStatus getSmsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null); + if ("dev".equals(activeProfiles)) { // TODO(ks) : 문자발송 테스트 + GetSmsAutoStatus getSmsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null); - if (getSmsAutoStatus == null || Boolean.FALSE.equals(getSmsAutoStatus.getActive())) { - log.info("문자 발송 비활성화 상태"); - return Optional.of(false); - } - - LocalDate today = LocalDate.now(); - int day = today.getDayOfMonth(); - - if (day == 8 || day == 15 || day == 22 || day == 1) { - DayRange dayRange = DateUiUtil.getDayRange(today).orElse(null); - if (dayRange == null) { - log.error("잘못된 날짜({})에 문자 자동 발송 로직이 실행됨 - 발송 대상일이 아님", today); + if (getSmsAutoStatus == null || Boolean.FALSE.equals(getSmsAutoStatus.getActive())) { + log.info("문자 발송 비활성화 상태"); return Optional.of(false); } - LocalDate baseDate = (day == 1) ? today.minusMonths(1) : today; - String targetMonth = DateUiUtil.getMonthValue(baseDate); + LocalDate today = LocalDate.now(); + int day = today.getDayOfMonth(); - List incompleteHouseholds = getIncompleteHouseholdsPortIn.operate( - new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), dayRange.getToDay()) - ); + if (day == 8 || day == 15 || day == 22 || day == 1) { + DayRange dayRange = DateUiUtil.getDayRange(today).orElse(null); + if (dayRange == null) { + log.error("잘못된 날짜({})에 문자 자동 발송 로직이 실행됨 - 발송 대상일이 아님", today); + return Optional.of(false); + } - if (!CollectionUtils.isEmpty(incompleteHouseholds)) { - batchLogRunner.run(BatchLogType.AUTO_SMS, () -> { - mmsPortIn.sendAutoSms(new CreateSmsAutoSendCmd( - incompleteHouseholds, - getSmsAutoStatus.getSendPhone(), - getSmsAutoStatus.getMessage() - )); - }); + LocalDate baseDate = (day == 1) ? today.minusMonths(1) : today; + String targetMonth = DateUiUtil.getMonthValue(baseDate); + + List incompleteHouseholds = getIncompleteHouseholdsPortIn.operate( + new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), dayRange.getToDay()) + ); + + if (!CollectionUtils.isEmpty(incompleteHouseholds)) { + batchLogRunner.run(BatchLogType.AUTO_SMS, () -> { + mmsPortIn.sendAutoSms(new CreateSmsAutoSendCmd( + incompleteHouseholds, + getSmsAutoStatus.getSendPhone(), + getSmsAutoStatus.getMessage() + )); + }); + } + } else { + log.info("문자 발송 날짜 아님."); + return Optional.of(false); } - } else { - log.info("문자 발송 날짜 아님."); - return Optional.of(false); } return Optional.of(true); diff --git a/admin/src/main/resources/mappers/schedule/GetIncompleteHouseholdsMapper.xml b/admin/src/main/resources/mappers/schedule/GetIncompleteHouseholdsMapper.xml index d9052d99..96fc5090 100644 --- a/admin/src/main/resources/mappers/schedule/GetIncompleteHouseholdsMapper.xml +++ b/admin/src/main/resources/mappers/schedule/GetIncompleteHouseholdsMapper.xml @@ -24,5 +24,7 @@ ) AND dr.all_status NOT IN ('DONE', 'TODAY_NONE') ) + AND region_main_code = 'code.region.main.99' /* TODO(ks) : 문자발송 테스트 */ + AND phone != '010-1111-1111' /* TODO(ks) : 문자발송 테스트 */ \ No newline at end of file