From 1bb3124d0c2afb9c3c3845add880e853867273dc Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 21 Jul 2025 17:10:57 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=90=EB=8F=99?= =?UTF-8?q?=EB=B0=9C=EC=86=A1=20=EB=B0=B0=EC=B9=98=20=EC=8B=A4=ED=96=89=20?= =?UTF-8?q?=EC=8B=9C=20=EB=A1=9C=EA=B7=B8=20=EA=B8=B0=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/batch/BatchLogRunner.java | 4 +- .../adapters/persistence/BatchLogDao.java | 4 +- .../batchLog/ports/BatchLogPortIn.java | 2 +- .../batchLog/ports/BatchLogPortOut.java | 2 +- .../ports/application/BatchLogService.java | 4 +- .../adapters/web/AutoSchedulesController.java | 12 ++++ .../application/AutoSchedulesService.java | 63 +++++++++---------- .../domain/GetIncompleteHouseholdsCmd.java | 1 + .../GetIncompleteHouseholdsMapper.xml | 6 +- 9 files changed, 55 insertions(+), 43 deletions(-) diff --git a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java index f35a455c..59063baf 100644 --- a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java +++ b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java @@ -31,8 +31,8 @@ public class BatchLogRunner { safeLogger.warn("호스트 이름 조회 실패", e); } - // 실행 로그 insert (RUNNING) - Long logId = batchLogPortIn.create(batchType, hostName); + // dev 환경 + 실제 날짜에 실행 로그 insert (RUNNING) + Long logId = batchLogPortIn.create(batchType, hostName, "RUNNING"); try { action.run(); diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java index e60fa058..7c58a0a3 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java @@ -19,8 +19,8 @@ class BatchLogDao implements BatchLogPortOut { } @Override - public Long create(BatchLogType type, String hostName) { - BatchLogCmd cmd = new BatchLogCmd(null, type.name(), "RUNNING", LocalDateTime.now(), hostName); + public Long create(BatchLogType type, String hostName, String status) { + BatchLogCmd cmd = new BatchLogCmd(null, type.name(), status, LocalDateTime.now(), hostName); mapper.create(cmd); return cmd.getId(); } diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java index f2d8b013..ec82205b 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java @@ -4,7 +4,7 @@ import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; public interface BatchLogPortIn { boolean exists(BatchLogType type); - Long create(BatchLogType type, String hostName); + Long create(BatchLogType type, String hostName, String status); void createError(BatchLogType type, String hostName, String status, String errorMessage); void update(Long id, String hostName, String status, String errorMessage); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java index f480fb86..a46cbe30 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java @@ -4,7 +4,7 @@ import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; public interface BatchLogPortOut { boolean exists(BatchLogType type); - Long create(BatchLogType type, String hostName); + Long create(BatchLogType type, String hostName, String status); void createError(BatchLogType type, String hostName, String status, String errorMessage); void update(Long id, String hostName, String status, String errorMessage); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java index 9af233b0..91ba4e50 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java @@ -17,8 +17,8 @@ class BatchLogService implements BatchLogPortIn { } @Override - public Long create(BatchLogType type, String hostName) { - return portOut.create(type, hostName); + public Long create(BatchLogType type, String hostName, String status) { + return portOut.create(type, hostName, status); } @Override diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java index 7c46b1fd..5d05e934 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java @@ -4,6 +4,7 @@ import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,9 @@ public class AutoSchedulesController { private final AutoSchedulesPortIn portIn; private final BatchLogPortIn batchLogPortIn; private final java.util.Set runningTasks = java.util.concurrent.ConcurrentHashMap.newKeySet(); + // TODO(ks) : 문자발송 테스트 + @Value("${spring.profiles.active}") + private String activeProfiles; public AutoSchedulesController(AutoSchedulesPortIn portIn, BatchLogPortIn batchLogPortIn) { this.portIn = portIn; @@ -66,10 +70,18 @@ public class AutoSchedulesController { */ @Scheduled(cron = "0 0 17 * * ?") public void fetchSmsAutoSend() { + if ("dev".equals(activeProfiles)) { + log.info("fetchSmsAutoSend는 dev 환경에서만 실행됩니다. (현재: {})", activeProfiles); + return; + } + String lockKey = "fetchSmsAutoSend" + java.time.LocalDate.now(); try { String host = java.net.InetAddress.getLocalHost().getHostName(); + // [TEST] dev 환경에서 배치가 실제 실행되고 있는지 체크 + batchLogPortIn.create(BatchLogType.AUTO_SMS, host, "BATCH_RUNNING"); + // 중복 실행 방지를 위한 간단한 체크 if (isAlreadyRunning(lockKey)) { log.warn("fetchSmsAutoSend 이미 실행 중입니다. 중복 실행을 건너뜁니다."); 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 f22b8d19..d68c4879 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 @@ -34,8 +34,6 @@ class AutoSchedulesService implements AutoSchedulesPortIn { private final GetSmsAutoStatusPortIn getSmsAutoStatusPortIn; private final GetIncompleteHouseholdsPortIn getIncompleteHouseholdsPortIn; private final BatchLogRunner batchLogRunner; - - // TODO(ks) : 문자발송 테스트 @Value("${spring.profiles.active}") private String activeProfiles; @@ -48,44 +46,43 @@ class AutoSchedulesService implements AutoSchedulesPortIn { @Override @Transactional public Optional sendAutoSms() { - if ("dev".equals(activeProfiles)) { // TODO(ks) : 문자발송 테스트 - GetSmsAutoStatus getSmsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null); + GetSmsAutoStatus getSmsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null); - if (getSmsAutoStatus == null || Boolean.FALSE.equals(getSmsAutoStatus.getActive())) { - log.info("문자 발송 비활성화 상태"); + 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); return Optional.of(false); } - LocalDate today = LocalDate.now(); - int day = today.getDayOfMonth(); + LocalDate baseDate = (day == 1) ? today.minusMonths(1) : today; + String targetMonth = DateUiUtil.getMonthValue(baseDate); - 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); - } + // activeProfiles 가 'dev'인 경우일 때 테스트용 임가 데이터만 조회합니다. + List incompleteHouseholds = getIncompleteHouseholdsPortIn.operate( + new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), + dayRange.getToDay(), activeProfiles)); - 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); + 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); } return Optional.of(true); diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholdsCmd.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholdsCmd.java index 4180bc3e..0e4c52f0 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholdsCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholdsCmd.java @@ -13,4 +13,5 @@ public class GetIncompleteHouseholdsCmd { private String recordMonth; private int fromDay; private int toDay; + private String activeProfiles; } diff --git a/admin/src/main/resources/mappers/schedule/GetIncompleteHouseholdsMapper.xml b/admin/src/main/resources/mappers/schedule/GetIncompleteHouseholdsMapper.xml index 96fc5090..d8d38240 100644 --- a/admin/src/main/resources/mappers/schedule/GetIncompleteHouseholdsMapper.xml +++ b/admin/src/main/resources/mappers/schedule/GetIncompleteHouseholdsMapper.xml @@ -24,7 +24,9 @@ ) 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) : 문자발송 테스트 */ + + AND region_main_code = 'code.region.main.99' + AND phone != '010-1111-1111' + \ No newline at end of file