Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
주수현
2025-07-18 15:04:19 +09:00
2 changed files with 38 additions and 29 deletions

View File

@@ -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<Boolean> operate() {
batchLogRunner.run(BatchLogType.MONTHLY_STATUS, portOut::operate);
@@ -43,42 +48,44 @@ class AutoSchedulesService implements AutoSchedulesPortIn {
@Override
@Transactional
public Optional<Boolean> 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<GetIncompleteHouseholds> 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<GetIncompleteHouseholds> 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);

View File

@@ -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) : 문자발송 테스트 */
</select>
</mapper>