From 5c6bc9d6c14bf06d062f2cf2fa872d04b68eef8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Thu, 10 Jul 2025 13:43:53 +0900 Subject: [PATCH] =?UTF-8?q?[BATCH]=20=EC=9B=94=EC=B4=88=EC=9D=B4=EC=9B=94?= =?UTF-8?q?=EA=B8=88=20=EA=B3=84=EC=82=B0=ED=95=98=EC=97=AC=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/AutoSchedulesDao.java | 15 ++ .../persistence/AutoSchedulesMapper.java | 1 + .../adapters/web/AutoSchedulesController.java | 12 +- .../ports/AutoSchedulesPortIn.java | 1 + .../ports/AutoSchedulesPortOut.java | 1 + .../application/AutoSchedulesService.java | 9 +- .../mappers/schedule/AutoSchedulesMapper.xml | 5 + .../resources/sql/data/04_second_open.sql | 134 +++++++++++++++++- 8 files changed, 171 insertions(+), 7 deletions(-) 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 ecf0801a..420526d7 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 @@ -44,4 +44,19 @@ class AutoSchedulesDao implements AutoSchedulesPortOut { return Optional.of(false); } } + + @Override + @Transactional + public Optional monthlyCarryOver() { + try { + mapper.createMonthlyCarryOver(); + + return Optional.of(true); + } catch (Exception e) { + log.error("[AutoSchedule][monthlyCarryOver] message: {}", e.getMessage(), e); + + // 예외 발생 시 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 36ff0844..984ccafd 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 @@ -7,4 +7,5 @@ import org.apache.ibatis.annotations.Mapper; public interface AutoSchedulesMapper { void createMonthlyInputStatus(); void createSmsAutoSend(CreateSmsAutoSendCmd cmd); + 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 0e8553c7..98b34dfc 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; @@ -28,6 +25,15 @@ public class AutoSchedulesController { public void fetchSmsAutoSend() { portIn.sendAutoSms(); } + + /** + * 월초이월금 계산하여 등록 + * 매월 16일 0시 1초에 실행되는 스케줄러 + */ + @Scheduled(cron = "1 0 0 16 * *") + public void fetchMonthlyCarryOver() { + portIn.monthlyCarryOver(); + } /** * 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 2e78b5b3..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 @@ -6,4 +6,5 @@ public interface AutoSchedulesPortIn { Optional operate(); Optional sendAutoSms(); + Optional monthlyCarryOver(); } \ 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 b330ae47..c91b9179 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 @@ -7,4 +7,5 @@ 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 88518fa2..e83cad8c 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 @@ -11,10 +11,8 @@ import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncomp 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; @@ -76,4 +74,9 @@ class AutoSchedulesService implements AutoSchedulesPortIn { return Optional.of(true); } + + @Override + public Optional monthlyCarryOver() { + return portOut.monthlyCarryOver(); + } } \ 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 d826b73d..5c862315 100644 --- a/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml +++ b/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml @@ -32,4 +32,9 @@ ) + + + \ 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 b29d6f8e..c8555670 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -42,4 +42,136 @@ values ( '02-3415-5187', now(), 'INIT_DATA' -); \ No newline at end of file +); + + +-- ============================================ +-- TABLE : daily_summary +-- DESC : 일계부 집계 테이블 +-- ============================================ +/* +DROP TABLE IF EXISTS daily_summary; +DROP SEQUENCE IF EXISTS daily_summary_seq; +*/ + +CREATE SEQUENCE daily_summary_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; + +CREATE TABLE daily_summary ( + id int8 DEFAULT nextval('daily_summary_seq'::regclass) NOT NULL, -- 일계부 집계 ID + household_seq int8 NOT NULL, -- 임가 일련번호 (FK) + record_month varchar(7) NOT NULL, -- 당월(yyyyMM) + carry_over int8 NULL, -- 당월 이월금 + prev_carry_over int8 NULL, -- 이전달 이월금 + income_value int8 NULL, -- 당월 수입금액 + expense_value int8 NULL, -- 당월 지출금액 + created_at timestamp(6), -- 생성일 + created_by varchar(255), -- 생성자 + + CONSTRAINT daily_summary_pkey PRIMARY KEY (id), + CONSTRAINT fk_daily_summary__household FOREIGN KEY (household_seq) REFERENCES household(seq) +); + +COMMENT ON TABLE daily_summary IS '일계부 집계 테이블'; + +COMMENT ON COLUMN daily_summary.id IS '일계부 집계 ID'; +COMMENT ON COLUMN daily_summary.household_seq IS '임가 일련번호'; +COMMENT ON COLUMN daily_summary.record_month IS '당월(yyyyMM)'; +COMMENT ON COLUMN daily_summary.carry_over IS '당월 이월금'; +COMMENT ON COLUMN daily_summary.prev_carry_over IS '이전달 이월금'; +COMMENT ON COLUMN daily_summary.income_value IS '당월 이월금'; +COMMENT ON COLUMN daily_summary.expense_value IS '당월 지출금액'; +COMMENT ON COLUMN daily_summary.created_at IS '생성일'; +COMMENT ON COLUMN daily_summary.created_by IS '생성자'; + + + +-- ============================================ +-- FUNCTION : fn_monthly_carry_over +-- DESC : 일계부 월초이월금 생성 +-- ============================================ +-- DROP FUNCTION public.fn_monthly_carry_over(varchar); + +CREATE OR REPLACE FUNCTION public.fn_monthly_carry_over(p_month character varying) + RETURNS void + LANGUAGE plpgsql +AS $function$ +DECLARE + -- 대상 월: 지난달 + target_month varchar(6); + -- 비교 월: 지지난달 + prev_month varchar(6); +BEGIN + -- 실행 월: p_month + if p_month is null or length(p_month) != 6 then + target_month := TO_CHAR(CURRENT_DATE + INTERVAL '-1 MONTH', 'yyyyMM'); + prev_month := TO_CHAR(CURRENT_DATE + INTERVAL '-2 MONTH', 'yyyyMM'); + else + target_month := TO_CHAR(TO_DATE(p_month, 'YYYYMM') + INTERVAL '-1 MONTH', 'yyyyMM'); + prev_month := TO_CHAR(TO_DATE(p_month, 'YYYYMM') + INTERVAL '-2 MONTH', 'yyyyMM'); + end if; + + -- 지난달의 월초이월금 등록 + insert into daily_summary ( + household_seq + , record_month + , created_at + , created_by + , prev_carry_over + , income_value + , expense_value + , carry_over + ) + select h.seq + , target_month as current_month + , now() as created_at + , 'scheduler' as created_by + , COALESCE(ds.carry_over, 0) as prev_carry_over + , COALESCE(dis.total_value, 0) as income_value + , COALESCE(des.total_value, 0) as expense_value + -- 지지난달 월초 이월금 + 지난달 입력된 수입 항목의 현금 총액 - 지난달 입력된 지출 항목의 현금 총액 + , COALESCE(ds.carry_over, 0) + (COALESCE(dis.total_value, 0) - COALESCE(des.total_value, 0)) as current_value + from household h + left join daily_summary ds on ds.household_seq = h.seq and ds.record_month = prev_month + left join ( + select 'INCOME' as step + , dr.record_month + , dr.household_seq + , COALESCE(sum( + COALESCE(di.price, 0) + COALESCE(di.estimated_value, 0) + ), 0) as total_value + from daily_record dr + inner join + daily_income di on di.daily_record_seq = dr.id and di.is_deleted = false + where dr.is_deleted = false + and dr.record_month = target_month + group by + dr.record_month, dr.household_seq + ) dis on dis.household_seq = h.seq + left join ( + select 'EXPENSE' as step + , dr.record_month + , dr.household_seq + , COALESCE(sum( + COALESCE(de.price, 0) + COALESCE(de.estimated_value, 0) + ), 0) as total_value + from daily_record dr + inner join + daily_expense de on de.daily_record_seq = dr.id and de.is_deleted = false + where dr.is_deleted = false + and dr.record_month = target_month + group by + dr.record_month, dr.household_seq + ) des on des.household_seq = h.seq + where h.is_deleted = false + -- 중복 삽입 방지: 동일 household_seq + record_month 가 없을 경우만 + and not exists ( + select 1 from daily_summary ds + where ds.household_seq = h.seq and ds.record_month = target_month + ) + ; +END; +$function$ +; + + +