From bbebedf1da5036049d40ab7d5c285abc74024f49 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 7 Jul 2025 17:49:27 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EB=AC=B8=EC=9E=90=20=EB=B0=9C=EC=86=A1?= =?UTF-8?q?=20=EC=9E=91=EC=97=85=20=EC=A4=91=20(1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/application/util/DateUiUtil.java | 41 +++++++++++++ .../application/util/model/DayRange.java | 13 ++++ .../persistence/GetSmsAutoStatusDao.java | 19 ++++++ .../persistence/GetSmsAutoStatusMapper.java | 10 ++++ .../ports/GetSmsAutoStatusPortIn.java | 8 +++ .../ports/GetSmsAutoStatusPortOut.java | 8 +++ .../application/GetSmsAutoStatusService.java | 20 +++++++ .../application/domain/GetSmsAutoStatus.java | 19 ++++++ .../domain/GetSmsAutoStatusCmd.java | 13 ++++ .../persistence/UpdateSmsAutoStatusDao.java | 20 +++++++ .../UpdateSmsAutoStatusMapper.java | 9 +++ .../ports/UpdateSmsAutoStatusPortIn.java | 7 +++ .../ports/UpdateSmsAutoStatusPortOut.java | 7 +++ .../UpdateSmsAutoStatusService.java | 18 ++++++ .../domain/UpdateSmsAutoStatusCmd.java | 14 +++++ .../persistence/AutoSchedulesDao.java | 18 ++++++ .../persistence/AutoSchedulesMapper.java | 3 +- .../adapters/web/AutoSchedulesController.java | 9 +++ .../ports/AutoSchedulesPortIn.java | 1 + .../ports/AutoSchedulesPortOut.java | 2 + .../application/AutoSchedulesService.java | 60 +++++++++++++++++++ .../domain/CreateSmsAutoSendCmd.java | 18 ++++++ .../GetIncompleteHouseholdsDao.java | 19 ++++++ .../GetIncompleteHouseholdsMapper.java | 11 ++++ .../ports/GetIncompleteHouseholdsPortIn.java | 9 +++ .../ports/GetIncompleteHouseholdsPortOut.java | 9 +++ .../GetIncompleteHouseholdsService.java | 20 +++++++ .../domain/GetIncompleteHouseholds.java | 17 ++++++ .../domain/GetIncompleteHouseholdsCmd.java | 16 +++++ .../dashboard/GetSmsAutoStatusMapper.xml | 16 +++++ .../dashboard/UpdateSmsAutoStatusMapper.xml | 10 ++++ .../mappers/schedule/AutoSchedulesMapper.xml | 26 ++++++++ .../GetIncompleteHouseholdsMapper.xml | 28 +++++++++ .../resources/sql/data/04_second_open.sql | 24 ++++++++ .../resources/sql/schema/02_create-all.sql | 24 +++++++- 35 files changed, 564 insertions(+), 2 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/config/application/util/model/DayRange.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/GetSmsAutoStatusService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/domain/GetSmsAutoStatus.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/domain/GetSmsAutoStatusCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/persistence/UpdateSmsAutoStatusDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/persistence/UpdateSmsAutoStatusMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/UpdateSmsAutoStatusPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/UpdateSmsAutoStatusPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/UpdateSmsAutoStatusService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/domain/UpdateSmsAutoStatusCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/domain/CreateSmsAutoSendCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/GetIncompleteHouseholdsService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholds.java create mode 100644 admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholdsCmd.java create mode 100644 admin/src/main/resources/mappers/dashboard/GetSmsAutoStatusMapper.xml create mode 100644 admin/src/main/resources/mappers/dashboard/UpdateSmsAutoStatusMapper.xml create mode 100644 admin/src/main/resources/mappers/schedule/GetIncompleteHouseholdsMapper.xml diff --git a/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java b/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java index bbdb5c52..91a38816 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java +++ b/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java @@ -1,5 +1,6 @@ package app.module.admin.config.application.util; +import app.module.admin.config.application.util.model.DayRange; import app.module.admin.config.application.util.model.MonthOption; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -30,4 +31,44 @@ public class DateUiUtil { public static String getCurrentMonthValue() { return LocalDate.now().format(VALUE_FORMAT); } + + /** + * 문자 자동 발송 대상 날짜 범위를 반환합니다. + * + * 발송일 기준으로 이전 6일간의 날짜 범위를 계산하며, + * 발송일은 매월 7일, 14일, 21일, 말일입니다. + * + * 예시: + * - 7일인 경우 → 1일부터 6일까지 + * - 14일인 경우 → 7일부터 13일까지 + * - 21일인 경우 → 14일부터 20일까지 + * - 말일인 경우 → 22일부터 말일까지 + * + * 발송일이 아닌 경우에는 null을 반환합니다. + * + * @param day 오늘 날짜의 일(day of month) + * @return DayRange 객체 또는 발송일이 아니면 null + */ + public static DayRange getDayRange(int day) { + LocalDate today = LocalDate.now(); + int lastDay = today.lengthOfMonth(); + + int fromDay; + int toDay; + + if (day == 7) { + fromDay = day - 6; + toDay = day - 1; + } else if (day == 14 || day == 21) { + fromDay = day - 7; + toDay = day - 1; + } else if (day == lastDay) { + fromDay = 21; + toDay = lastDay; + } else { + return null; + } + + return new DayRange(fromDay, toDay); + } } diff --git a/admin/src/main/java/app/module/admin/config/application/util/model/DayRange.java b/admin/src/main/java/app/module/admin/config/application/util/model/DayRange.java new file mode 100644 index 00000000..30696e85 --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/util/model/DayRange.java @@ -0,0 +1,13 @@ +package app.module.admin.config.application.util.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class DayRange { + private int fromDay; + private int toDay; +} diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusDao.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusDao.java new file mode 100644 index 00000000..915c2867 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusDao.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.dashboard.getSmsAutoStatus.adapters.persistence; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; +import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatusCmd; +import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortOut; +import java.util.Optional; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetSmsAutoStatusDao implements GetSmsAutoStatusPortOut { + private final GetSmsAutoStatusMapper mapper; + + @Override + public Optional operate() { + return mapper.operate(); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusMapper.java new file mode 100644 index 00000000..91390919 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusMapper.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.dashboard.getSmsAutoStatus.adapters.persistence; + +import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; +import java.util.Optional; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetSmsAutoStatusMapper { + Optional operate(); +} diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortIn.java new file mode 100644 index 00000000..5bc0a7a3 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortIn.java @@ -0,0 +1,8 @@ +package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports; + +import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; +import java.util.Optional; + +public interface GetSmsAutoStatusPortIn { + Optional operate(); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortOut.java new file mode 100644 index 00000000..76b022b0 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortOut.java @@ -0,0 +1,8 @@ +package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports; + +import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; +import java.util.Optional; + +public interface GetSmsAutoStatusPortOut { + Optional operate(); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/GetSmsAutoStatusService.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/GetSmsAutoStatusService.java new file mode 100644 index 00000000..8c8975b2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/GetSmsAutoStatusService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application; + +import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn; +import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortOut; +import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; +import java.util.Optional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetSmsAutoStatusService implements GetSmsAutoStatusPortIn { + + private final GetSmsAutoStatusPortOut portOut; + + @Override + public Optional operate() { + return portOut.operate(); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/domain/GetSmsAutoStatus.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/domain/GetSmsAutoStatus.java new file mode 100644 index 00000000..1032e352 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/domain/GetSmsAutoStatus.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.dashboard.getSmsAutoStatus.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 GetSmsAutoStatus { + private Boolean active; + private String message; + private String sendPhone; + private LocalDateTime updatedAt; + private String updatedBy; +} diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/domain/GetSmsAutoStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/domain/GetSmsAutoStatusCmd.java new file mode 100644 index 00000000..01901fcc --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/domain/GetSmsAutoStatusCmd.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetSmsAutoStatusCmd { +} diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/persistence/UpdateSmsAutoStatusDao.java b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/persistence/UpdateSmsAutoStatusDao.java new file mode 100644 index 00000000..b635a613 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/persistence/UpdateSmsAutoStatusDao.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.persistence; + +import app.module.core.config.application.annotation.UpdateCommand; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd; +import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortOut; +import org.apache.ibatis.annotations.Update; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class UpdateSmsAutoStatusDao implements UpdateSmsAutoStatusPortOut { + private final UpdateSmsAutoStatusMapper mapper; + + @Override + @UpdateCommand + public void operate(UpdateSmsAutoStatusCmd cmd) { + mapper.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/persistence/UpdateSmsAutoStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/persistence/UpdateSmsAutoStatusMapper.java new file mode 100644 index 00000000..3b26c551 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/persistence/UpdateSmsAutoStatusMapper.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.persistence; + +import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UpdateSmsAutoStatusMapper { + void operate(UpdateSmsAutoStatusCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/UpdateSmsAutoStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/UpdateSmsAutoStatusPortIn.java new file mode 100644 index 00000000..823fc04b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/UpdateSmsAutoStatusPortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports; + +import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd; + +public interface UpdateSmsAutoStatusPortIn { + void operate(UpdateSmsAutoStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/UpdateSmsAutoStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/UpdateSmsAutoStatusPortOut.java new file mode 100644 index 00000000..8e85d720 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/UpdateSmsAutoStatusPortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports; + +import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd; + +public interface UpdateSmsAutoStatusPortOut { + void operate(UpdateSmsAutoStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/UpdateSmsAutoStatusService.java b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/UpdateSmsAutoStatusService.java new file mode 100644 index 00000000..b66b2a20 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/UpdateSmsAutoStatusService.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd; +import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortIn; +import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class UpdateSmsAutoStatusService implements UpdateSmsAutoStatusPortIn { + private final UpdateSmsAutoStatusPortOut portOut; + + @Override + public void operate(UpdateSmsAutoStatusCmd cmd) { + portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/domain/UpdateSmsAutoStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/domain/UpdateSmsAutoStatusCmd.java new file mode 100644 index 00000000..74b24441 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/domain/UpdateSmsAutoStatusCmd.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class UpdateSmsAutoStatusCmd extends AuditCommand { + private Boolean active; +} 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 61bc2714..ecf0801a 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,12 +1,15 @@ 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 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 class AutoSchedulesDao implements AutoSchedulesPortOut { @@ -26,4 +29,19 @@ class AutoSchedulesDao implements AutoSchedulesPortOut { } } + + @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); + } + } } 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 bb495120..36ff0844 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,9 +1,10 @@ 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); } 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 2ef7ff70..19a97949 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,6 +1,9 @@ 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; @@ -20,6 +23,12 @@ public class AutoSchedulesController { portIn.operate(); } + // 매일 오후 5시 마다 실행되는 스케줄러 +// @Scheduled(cron = "0 0 17 * * ?") + public void fetchSmsAutoSend() { + portIn.sendAutoSms(); + } + /** * TODO 스케쥴 있다면.. 추가. */ 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 ee6479e8..2e78b5b3 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 @@ -5,4 +5,5 @@ import java.util.Optional; public interface AutoSchedulesPortIn { Optional operate(); + Optional sendAutoSms(); } \ 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 41837edb..b330ae47 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,8 +1,10 @@ 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); } \ 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 e97d57f5..91c4aa19 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,20 +1,80 @@ package app.module.admin.usecase.schedule.autoSchedules.ports.application; +import app.module.admin.config.application.util.DateUiUtil; +import app.module.admin.config.application.util.model.DayRange; +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 java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.List; +import java.util.UUID; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.Optional; +import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor class AutoSchedulesService implements AutoSchedulesPortIn { private final AutoSchedulesPortOut portOut; + private final GetSmsAutoStatusPortIn getSmsAutoStatusPortIn; + private final GetIncompleteHouseholdsPortIn getIncompleteHouseholdsPortIn; @Override public Optional operate() { return portOut.operate(); } + + @Override + @Transactional + public Optional sendAutoSms() { + GetSmsAutoStatus getSmsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null); + + // 문자 자동 발송 활성화 상태 체크 + if (getSmsAutoStatus == null || Boolean.FALSE.equals(getSmsAutoStatus.getActive())) { + System.out.println("문자 발송 비활성화 상태입니다."); + return Optional.of(false); + } + + LocalDate today = LocalDate.now(); + int day = today.getDayOfMonth(); + int lastDay = today.lengthOfMonth(); + + // 현재 월 + String currentMonth = DateUiUtil.getCurrentMonthValue(); + + if (day == 7 || day == 14 || day == 21 || day == lastDay) { + DayRange dayRange = DateUiUtil.getDayRange(day); + if (dayRange == null) { + return Optional.of(false); + } + + // 해당 날짜에 일계부 미등록한 임가 목록 조회 + List incompleteHouseholds = + getIncompleteHouseholdsPortIn.operate( + new GetIncompleteHouseholdsCmd( + currentMonth, + dayRange.getFromDay(), + dayRange.getToDay())); + + portOut.sendAutoSms(new CreateSmsAutoSendCmd( + incompleteHouseholds, + getSmsAutoStatus.getSendPhone(), + getSmsAutoStatus.getMessage() + )); + } else { + System.out.println("문자 발송일 아님: " + today); + } + + 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 new file mode 100644 index 00000000..4fc03a07 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/domain/CreateSmsAutoSendCmd.java @@ -0,0 +1,18 @@ +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/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsDao.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsDao.java new file mode 100644 index 00000000..832e1268 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsDao.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.schedule.getIncompleteHouseholds.adapters.persistence; + +import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncompleteHouseholdsPortOut; +import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; +import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetIncompleteHouseholdsDao implements GetIncompleteHouseholdsPortOut { + private final GetIncompleteHouseholdsMapper mapper; + + @Override + public List operate(GetIncompleteHouseholdsCmd cmd) { + return mapper.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsMapper.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsMapper.java new file mode 100644 index 00000000..ec9fe7be --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.schedule.getIncompleteHouseholds.adapters.persistence; + +import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; +import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetIncompleteHouseholdsMapper { + List operate(GetIncompleteHouseholdsCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortIn.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortIn.java new file mode 100644 index 00000000..39fe6e82 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports; + +import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; +import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; +import java.util.List; + +public interface GetIncompleteHouseholdsPortIn { + List operate(GetIncompleteHouseholdsCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortOut.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortOut.java new file mode 100644 index 00000000..ce7b640b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports; + +import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; +import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; +import java.util.List; + +public interface GetIncompleteHouseholdsPortOut { + List operate(GetIncompleteHouseholdsCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/GetIncompleteHouseholdsService.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/GetIncompleteHouseholdsService.java new file mode 100644 index 00000000..30dcf1c3 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/GetIncompleteHouseholdsService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application; + +import lombok.RequiredArgsConstructor; +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.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncompleteHouseholdsPortIn; +import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncompleteHouseholdsPortOut; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetIncompleteHouseholdsService implements GetIncompleteHouseholdsPortIn { + private final GetIncompleteHouseholdsPortOut portOut; + + @Override + public List operate(GetIncompleteHouseholdsCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholds.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholds.java new file mode 100644 index 00000000..d4b6a02f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholds.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetIncompleteHouseholds { + private Long seq; + private String householdNum; + private String ownerName; + private String phone; +} 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 new file mode 100644 index 00000000..4180bc3e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholdsCmd.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetIncompleteHouseholdsCmd { + private String recordMonth; + private int fromDay; + private int toDay; +} diff --git a/admin/src/main/resources/mappers/dashboard/GetSmsAutoStatusMapper.xml b/admin/src/main/resources/mappers/dashboard/GetSmsAutoStatusMapper.xml new file mode 100644 index 00000000..fc003142 --- /dev/null +++ b/admin/src/main/resources/mappers/dashboard/GetSmsAutoStatusMapper.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/dashboard/UpdateSmsAutoStatusMapper.xml b/admin/src/main/resources/mappers/dashboard/UpdateSmsAutoStatusMapper.xml new file mode 100644 index 00000000..6dbff86e --- /dev/null +++ b/admin/src/main/resources/mappers/dashboard/UpdateSmsAutoStatusMapper.xml @@ -0,0 +1,10 @@ + + + + + /* operate : 문자 자동 발송 활성화 상태 수정 */ + UPDATE sms_auto_status + SET active = #{active} + + + \ 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 fd0e0380..6df06af4 100644 --- a/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml +++ b/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml @@ -6,4 +6,30 @@ + + + /* createSmsAutoSend : 문자 발송 insert */ + INSERT INTO biz_msg + ( + MSG_TYPE, + CMID, + REQUEST_TIME, + SEND_TIME, + DEST_PHONE, + SEND_PHONE, + MSG_BODY + ) + VALUES + + ( + 0, + TO_CHAR(NOW(), 'YYYYMMDDHH24MISS') || '_' || #{item.householdNum}, + NOW(), + NOW(), + #{item.phone}, + #{item.sendPhone}, + #{item.message} + ) + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/schedule/GetIncompleteHouseholdsMapper.xml b/admin/src/main/resources/mappers/schedule/GetIncompleteHouseholdsMapper.xml new file mode 100644 index 00000000..d9052d99 --- /dev/null +++ b/admin/src/main/resources/mappers/schedule/GetIncompleteHouseholdsMapper.xml @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file diff --git a/core/src/main/resources/sql/data/04_second_open.sql b/core/src/main/resources/sql/data/04_second_open.sql index c5b174c4..b59cd6bd 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -16,3 +16,27 @@ INSERT INTO uri VALUES('uri.front.guide', '이용안내', '/guide', 'FRONT', 2, true, 'uri.front', now(), 'INIT_DATA', now(), 'INIT_DATA', false); +-- 문자 자동 발송 초기 데이터 등록 +insert into sms_auto_status ( + active, + message, + send_phone, + updated_at, + updated_by +) +values ( + false, + '[임가경제조사] 일계부 작성 부탁드립니다. + +안녕하십니까? 임가경영주님. +임가경제조사를 담당하고 있는 코리아리서치입니다. + +앱에서 지난 1주 동안 일계부 미작성 부분이 확인되어, 작성을 요청 드리고자 합니다. + +여러분이 작성해 주시는 일계부는 임업정책 수립이나 임업문제 연구의 실증적 기초자료를 제공하는 아주 귀중한 자료입니다. + +바쁘신 와중에도 본 조사를 위해 일계부를 작성하여 주신 것에 대하여 진심으로 감사드립니다.', + '02-3415-5187', + now(), + 'INIT_DATA' +); \ No newline at end of file diff --git a/core/src/main/resources/sql/schema/02_create-all.sql b/core/src/main/resources/sql/schema/02_create-all.sql index 7326ff88..ba008910 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -1904,4 +1904,26 @@ COMMENT ON COLUMN address.updated_at IS '수정일'; COMMENT ON COLUMN address.updated_by IS '수정자'; COMMENT ON COLUMN address.deleted_at IS '삭제일'; COMMENT ON COLUMN address.deleted_by IS '삭제자'; -COMMENT ON COLUMN address.is_deleted IS '삭제여부'; \ No newline at end of file +COMMENT ON COLUMN address.is_deleted IS '삭제여부'; + + + +-- ============================================ +-- TABLE : sms_auto_send +-- DESC : 문자 자동 발송 활성화 테이블 +-- ============================================ +CREATE TABLE sms_auto_status ( + active boolean NOT null, + message text, + send_phone varchar(255), + updated_at timestamp(6), + updated_by varchar(255) +); + +COMMENT ON TABLE sms_auto_status IS '문자 자동 발송 활성화 테이블'; + +COMMENT ON COLUMN sms_auto_status.active IS '자동 발송 기능 ON/OFF 여부'; +COMMENT ON COLUMN sms_auto_status.message IS '메세지'; +COMMENT ON COLUMN sms_auto_status.send_phone IS '발송번호'; +COMMENT ON COLUMN sms_auto_status.updated_at IS '수정일'; +COMMENT ON COLUMN sms_auto_status.updated_by IS '수정자'; \ No newline at end of file