From 5b50fe92a802a4ee3aa6c6cb24fab2af1766b4ef Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Fri, 11 Jul 2025 16:39:52 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=B0=B0=EC=B9=98=EC=9D=B4=EB=A0=A5=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/batch/BatchLogRunner.java | 35 +++++++++ .../adapters/persistence/BatchLogDao.java | 31 ++++++++ .../adapters/persistence/BatchLogMapper.java | 11 +++ .../batchLog/ports/BatchLogPortIn.java | 9 +++ .../batchLog/ports/BatchLogPortOut.java | 9 +++ .../ports/application/BatchLogService.java | 28 +++++++ .../ports/application/domain/BatchLog.java | 21 +++++ .../ports/application/domain/BatchLogCmd.java | 18 +++++ .../application/domain/BatchLogType.java | 12 +++ .../persistence/AutoSchedulesDao.java | 26 +------ .../persistence/AutoSchedulesMapper.java | 4 +- .../adapters/web/AutoSchedulesController.java | 23 ++---- .../ports/AutoSchedulesPortIn.java | 1 - .../ports/AutoSchedulesPortOut.java | 2 - .../application/AutoSchedulesService.java | 76 +++++++------------ .../domain/CreateSmsAutoSendCmd.java | 18 ----- .../mms/adapters/persistence/MMSDao.java | 7 +- .../mappers/batchLog/BatchLogMapper.xml | 34 +++++++++ .../mappers/schedule/AutoSchedulesMapper.xml | 33 +------- 19 files changed, 255 insertions(+), 143 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java delete mode 100644 admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/domain/CreateSmsAutoSendCmd.java create mode 100644 admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml 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 new file mode 100644 index 00000000..7b5ffb8f --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java @@ -0,0 +1,35 @@ +package app.module.admin.config.application.batch; + +import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +@Slf4j +public class BatchLogRunner { + private final BatchLogPortIn batchLogPortIn; + + public void run(BatchLogType batchType, Runnable action) { + // 이미 실행 중인지 확인 + if (batchLogPortIn.exists(batchType)) { + log.warn("[{}] 배치가 이미 실행 중 입니다.", batchType.name()); + return; + } + + // 실행 로그 insert (RUNNING) + Long logId = batchLogPortIn.create(batchType); + + try { + action.run(); + // 성공 처리 + batchLogPortIn.update(logId, "SUCCESS", null); + } catch (Exception e) { + // 실패 처리 + batchLogPortIn.update(logId, "FAIL", e.getMessage()); + log.error("[{}] 배치 실패: {}", batchType.name(), e.getMessage(), e); + } + } +} 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 new file mode 100644 index 00000000..0388b1f6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.batchLog.adapters.persistence; + +import app.module.admin.usecase.batchLog.ports.BatchLogPortOut; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogCmd; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; +import java.time.LocalDateTime; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class BatchLogDao implements BatchLogPortOut { + private final BatchLogMapper mapper; + + @Override + public boolean exists(BatchLogType type) { + return mapper.exists(type.name()); + } + + @Override + public Long create(BatchLogType type) { + BatchLogCmd cmd = new BatchLogCmd(null, type.name(), "RUNNING", LocalDateTime.now()); + mapper.create(cmd); + return cmd.getId(); + } + + @Override + public void update(Long id, String status, String errorMessage) { + mapper.update(id, status, errorMessage); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java new file mode 100644 index 00000000..cf204385 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.batchLog.adapters.persistence; + +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BatchLogMapper { + boolean exists(String type); + Long create(BatchLogCmd cmd); + void update(Long id, String status, String errorMessage); +} 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 new file mode 100644 index 00000000..1c2d1947 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.batchLog.ports; + +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; + +public interface BatchLogPortIn { + boolean exists(BatchLogType type); + Long create(BatchLogType type); + void update(Long id, 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 new file mode 100644 index 00000000..916ff343 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.batchLog.ports; + +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; + +public interface BatchLogPortOut { + boolean exists(BatchLogType type); + Long create(BatchLogType type); + void update(Long id, 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 new file mode 100644 index 00000000..426060aa --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java @@ -0,0 +1,28 @@ +package app.module.admin.usecase.batchLog.ports.application; + +import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; +import app.module.admin.usecase.batchLog.ports.BatchLogPortOut; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class BatchLogService implements BatchLogPortIn { + private final BatchLogPortOut portOut; + + @Override + public boolean exists(BatchLogType type) { + return portOut.exists(type); + } + + @Override + public Long create(BatchLogType type) { + return portOut.create(type); + } + + @Override + public void update(Long id, String status, String errorMessage) { + portOut.update(id, status, errorMessage); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java new file mode 100644 index 00000000..fc4d1d75 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.batchLog.ports.application.domain; + +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class BatchLog { + private Long id; + private String type; + private String status; + private LocalDateTime startAt; + private LocalDateTime endAt; + private String errorMessage; + private LocalDateTime createdAt; +} diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java new file mode 100644 index 00000000..5074fe5b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.batchLog.ports.application.domain; + +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class BatchLogCmd { + private Long id; + private String type; + private String status; + private LocalDateTime startAt; +} diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java new file mode 100644 index 00000000..5e7f5a24 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.batchLog.ports.application.domain; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum BatchLogType { + AUTO_SMS, + MONTHLY_STATUS, + CARRYOVER; +} diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java index 420526d7..43a8cab0 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java @@ -1,14 +1,12 @@ package app.module.admin.usecase.schedule.autoSchedules.adapters.persistence; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortOut; -import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd; +import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import java.util.Optional; - @Slf4j @Repository @RequiredArgsConstructor @@ -24,24 +22,9 @@ class AutoSchedulesDao implements AutoSchedulesPortOut { return Optional.of(true); } catch (Exception e) { - // 예외 발생 시 false 반환 - return Optional.of(false); - } + log.error("[AutoSchedule][createMonthlyInputStatus] message: {}", e.getMessage(), e); - } - - @Override - @Transactional - public Optional sendAutoSms(CreateSmsAutoSendCmd cmd) { - try { - mapper.createSmsAutoSend(cmd); - - return Optional.of(true); - } catch (Exception e) { - log.info(e.getMessage()); - - // 예외 발생 시 false 반환 - return Optional.of(false); + throw new RuntimeException("월별 입력 항목 관리 생성 중 오류: " + e.getMessage(), e); } } @@ -55,8 +38,7 @@ class AutoSchedulesDao implements AutoSchedulesPortOut { } catch (Exception e) { log.error("[AutoSchedule][monthlyCarryOver] message: {}", e.getMessage(), e); - // 예외 발생 시 false 반환 - return Optional.of(false); + throw new RuntimeException("일계부 월초이월금 생성 중 오류: " + e.getMessage(), e); } } } diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesMapper.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesMapper.java index 984ccafd..5c6abc8a 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesMapper.java @@ -1,11 +1,9 @@ package app.module.admin.usecase.schedule.autoSchedules.adapters.persistence; -import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd; import org.apache.ibatis.annotations.Mapper; @Mapper public interface AutoSchedulesMapper { - void createMonthlyInputStatus(); - void createSmsAutoSend(CreateSmsAutoSendCmd cmd); + String createMonthlyInputStatus(); String createMonthlyCarryOver(); } 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 5ee03e7a..c2d9d35a 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 @@ -1,9 +1,6 @@ package app.module.admin.usecase.schedule.autoSchedules.adapters.web; -import app.module.admin.config.application.util.DateUiUtil; -import app.module.admin.config.application.util.model.DayRange; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn; -import java.time.LocalDate; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -17,13 +14,19 @@ public class AutoSchedulesController { this.portIn = portIn; } - // 매 월 1일 1초 마다 실행되는 스케줄러 + /** + * 월별입력상태 등록 + * 매 월 1일 1초 마다 실행되는 스케줄러 + */ @Scheduled(cron = "1 0 0 1 * *") public void fetchArticlesPeriodically() { portIn.operate(); } - // 매일 오후 5시 마다 실행되는 스케줄러 + /** + * 문자자동발송 등록 + * 매일 오후 5시 마다 실행되는 스케줄러 + */ @Scheduled(cron = "0 0 17 * * ?") public void fetchSmsAutoSend() { portIn.sendAutoSms(); @@ -37,14 +40,4 @@ public class AutoSchedulesController { public void fetchMonthlyCarryOver() { portIn.monthlyCarryOver(); } - - /** - * TODO 스케쥴 있다면.. 추가. - */ - - // 매일 오후 5시 마다 실행되는 스케줄러 - @Scheduled(cron = "0 1 * * * ?") - public void fetchSmsAutoSenTest() { - portIn.sendAutoSmsTest(); - } } diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java index 4317bf4b..7720745e 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java @@ -7,5 +7,4 @@ public interface AutoSchedulesPortIn { Optional operate(); Optional sendAutoSms(); Optional monthlyCarryOver(); - Optional sendAutoSmsTest(); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortOut.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortOut.java index c91b9179..1d9b5328 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortOut.java @@ -1,11 +1,9 @@ package app.module.admin.usecase.schedule.autoSchedules.ports; -import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd; import java.util.Optional; public interface AutoSchedulesPortOut { Optional operate(); - Optional sendAutoSms(CreateSmsAutoSendCmd cmd); Optional monthlyCarryOver(); } \ No newline at end of file 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 e5626845..e74033ea 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 @@ -1,38 +1,42 @@ package app.module.admin.usecase.schedule.autoSchedules.ports.application; +import app.module.admin.config.application.batch.BatchLogRunner; import app.module.admin.config.application.util.DateUiUtil; import app.module.admin.config.application.util.model.DayRange; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortOut; -import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncompleteHouseholdsPortIn; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; +import app.module.mms.ports.MMSPortIn; +import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; import java.time.LocalDate; import java.util.List; - -import app.module.mms.ports.MMSPortIn; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - import java.util.Optional; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @Service @RequiredArgsConstructor +@Slf4j class AutoSchedulesService implements AutoSchedulesPortIn { private final AutoSchedulesPortOut portOut; private final MMSPortIn mmsPortIn; private final GetSmsAutoStatusPortIn getSmsAutoStatusPortIn; private final GetIncompleteHouseholdsPortIn getIncompleteHouseholdsPortIn; + private final BatchLogRunner batchLogRunner; @Override public Optional operate() { - return portOut.operate(); + batchLogRunner.run(BatchLogType.MONTHLY_STATUS, portOut::operate); + return Optional.of(true); } @Override @@ -40,63 +44,40 @@ class AutoSchedulesService implements AutoSchedulesPortIn { public Optional sendAutoSms() { GetSmsAutoStatus getSmsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null); - // 문자 자동 발송 활성화 상태 체크 if (getSmsAutoStatus == null || Boolean.FALSE.equals(getSmsAutoStatus.getActive())) { - System.out.println("문자 발송 비활성화 상태"); + log.info("문자 발송 비활성화 상태"); return Optional.of(false); } LocalDate today = LocalDate.now(); int day = today.getDayOfMonth(); - // 발송일 조건: 8일, 15일, 22일, 1일(다음 달 대상자) if (day == 8 || day == 15 || day == 22 || day == 1) { - // 발송 대상 날짜 범위 구하기 DayRange dayRange = DateUiUtil.getDayRange(today).orElse(null); - if (dayRange == null) return Optional.of(false); + if (dayRange == null) { + log.error("잘못된 날짜({})에 문자 자동 발송 로직이 실행됨 - 발송 대상일이 아님", today); + return Optional.of(false); + } - // 대상 월 계산 (1일 이면 이전 달 / 1일이 아니면 현재 달 yyyyMM 을 가져온다.) LocalDate baseDate = (day == 1) ? today.minusMonths(1) : today; String targetMonth = DateUiUtil.getMonthValue(baseDate); - // dayRange 날짜 범위의 일계부 미등록한 임가 목록 조회 List incompleteHouseholds = getIncompleteHouseholdsPortIn.operate( new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), dayRange.getToDay()) ); - // 미등록 임가가 있을 경우에만 실행 - if(!CollectionUtils.isEmpty(incompleteHouseholds)) { - portOut.sendAutoSms(new CreateSmsAutoSendCmd( - incompleteHouseholds, - getSmsAutoStatus.getSendPhone(), - getSmsAutoStatus.getMessage() - )); + if (!CollectionUtils.isEmpty(incompleteHouseholds)) { + batchLogRunner.run(BatchLogType.AUTO_SMS, () -> { + mmsPortIn.sendAutoSms(new CreateSmsAutoSendCmd( + incompleteHouseholds, + getSmsAutoStatus.getSendPhone(), + getSmsAutoStatus.getMessage() + )); + }); } - } - - return Optional.of(true); - } - - @Override - public Optional sendAutoSmsTest() { - String targetMonth = "202507"; - DayRange dayRange = new DayRange(1, 7); - GetSmsAutoStatus getSmsAutoStatus = new GetSmsAutoStatus(true, "테스트", "01012345678", null, null); - - // dayRange 날짜 범위의 일계부 미등록한 임가 목록 조회 - List incompleteHouseholds = getIncompleteHouseholdsPortIn.operate( - new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), dayRange.getToDay()) - ); - - System.out.println(incompleteHouseholds); - - // 미등록 임가가 있을 경우에만 실행 - if(!CollectionUtils.isEmpty(incompleteHouseholds)) { - mmsPortIn.sendAutoSms(new app.module.mms.ports.application.domain.CreateSmsAutoSendCmd( - incompleteHouseholds, - getSmsAutoStatus.getSendPhone(), - getSmsAutoStatus.getMessage() - )); + } else { + log.info("문자 발송 날짜 아님."); + return Optional.of(false); } return Optional.of(true); @@ -104,6 +85,7 @@ class AutoSchedulesService implements AutoSchedulesPortIn { @Override public Optional monthlyCarryOver() { - return portOut.monthlyCarryOver(); + batchLogRunner.run(BatchLogType.CARRYOVER, portOut::monthlyCarryOver); + return Optional.of(true); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/domain/CreateSmsAutoSendCmd.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/domain/CreateSmsAutoSendCmd.java deleted file mode 100644 index 4fc03a07..00000000 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/domain/CreateSmsAutoSendCmd.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.admin.usecase.schedule.autoSchedules.ports.application.domain; - -import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; -import java.util.List; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class CreateSmsAutoSendCmd { - private List sendHouseholds; - private String sendPhone; - private String message; -} diff --git a/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java index 7dbc2379..25a9b065 100644 --- a/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java +++ b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java @@ -19,16 +19,13 @@ public class MMSDao implements MMSPortOut { @Transactional public Optional sendAutoSms(CreateSmsAutoSendCmd cmd) { try { - log.debug("@@@ sendAutoSmsTest"); - mapper.createSmsAutoSend(cmd); return Optional.of(true); } catch (Exception e) { - log.info(e.getMessage()); + log.error(e.getMessage()); - // 예외 발생 시 false 반환 - return Optional.of(false); + throw new RuntimeException("문자 자동 발송 생성 중 오류: " + e.getMessage(), e); } } } diff --git a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml new file mode 100644 index 00000000..f974fba9 --- /dev/null +++ b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + SELECT nextval('batch_log_id_seq') + + + INSERT INTO batch_log (id, type, status, start_at, created_at) + VALUES (#{id}, #{type}, #{status}, #{startAt}, now()) + + + + + UPDATE batch_log + SET status = #{status}, + error_message = #{errorMessage}, + end_at = now() + WHERE id = #{id} + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml b/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml index 5c862315..cfda9212 100644 --- a/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml +++ b/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml @@ -3,38 +3,11 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - select fn_monthly_input_status() - - /* createSmsAutoSend : 문자 발송 insert */ - INSERT INTO biz_msg - ( - MSG_TYPE, - CMID, - REQUEST_TIME, - SEND_TIME, - DEST_PHONE, - SEND_PHONE, - MSG_BODY - ) - VALUES - - ( - 5, - TO_CHAR(NOW(), 'YYYYMMDDHH24MISS') || '_' || #{item.householdNum}, - NOW(), - NOW(), - #{item.phone}, - #{sendPhone}, - #{message} - ) - - - - select fn_monthly_carry_over(null) - - + \ No newline at end of file From 1d5e7e89f8fbe3897f5d1507daf8e661905b9684 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Fri, 11 Jul 2025 17:09:45 +0900 Subject: [PATCH 2/2] =?UTF-8?q?batch=5Flog=5Fseq=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml index f974fba9..cf760fd7 100644 --- a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml +++ b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml @@ -16,7 +16,7 @@ - SELECT nextval('batch_log_id_seq') + SELECT nextval('batch_log_seq') INSERT INTO batch_log (id, type, status, start_at, created_at)