[CORE] 일계부 enum, util 이동

This commit is contained in:
김현주
2025-06-25 12:26:32 +09:00
parent 874ac5dd38
commit e67128ff58
21 changed files with 34 additions and 43 deletions

View File

@@ -1,107 +0,0 @@
package app.module.front.config.application.util;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.Date;
import java.util.Locale;
@Slf4j
@Component
public class DailyUtil {
/**
* int -> localdate
* @param month 월(yyyyMM)
* @param day 일(d)
* @return LocalDate
*/
public LocalDate getDayToLocalDate(String month, int day) {
SimpleDateFormat beforeSdf = new SimpleDateFormat("yyyyMMdd", Locale.KOREAN);
SimpleDateFormat afterSdf = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN);
try {
Date formatDate = beforeSdf.parse(month + String.format("%02d", day));
return LocalDate.parse(afterSdf.format(formatDate));
} catch (Exception e) {
log.warn("[DailyUtil][getDayToLocalDate] month={}, day={}", month, day, e);
}
return null;
}
/**
* 마지막 일 여부
*
* @param searchDate 종료일(yyyy-MM-dd)
* @return true=마지막 일, false=마지막 일 아님
*/
public boolean isLastDay(LocalDate searchDate) {
if (searchDate != null) {
LocalDate lastDate = searchDate.withDayOfMonth(searchDate.lengthOfMonth());
return searchDate == lastDate;
}
return false;
}
/**
* 마지막 일 조회
*
* @param searchDate 검색일
* @return 마지막 일
*/
public int getLastDay(LocalDate searchDate) {
if (searchDate != null) {
return searchDate.withDayOfMonth(searchDate.lengthOfMonth()).getDayOfMonth();
}
return 0;
}
/**
* 자가농업 항목 오픈 여부
* [정책] 자가농업 생산물 중 자가소비량은 7일차 등록일에만 노출 및 선택, 21일 이후는 마지막 날
*
* @param groupNo 그룹번호
* @param endDate 종료일
* @return true=대상, false=대상 아님
*/
public boolean isFarmingOpen(int groupNo, LocalDate endDate) {
return groupNo == 4 || groupNo == 8 || groupNo == 12 || isLastDay(endDate);
}
/**
* 데이터 수정 가능 여부
* [정책] 15일전까지 데이터 수정 가능(등록도 불가)
* @param startDate
* @param endDate
* @return true=수정 가능, false=수정 불가
*/
public boolean isModifiable(LocalDate startDate, LocalDate endDate) {
// TODO : 15일로 변경, 테스트를 위해 30일로 진행중
LocalDate limitStart = LocalDate.now().minusDays(30);
log.debug("isModifiable @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate));
}
/**
* 데이터 등록 가능 여부
* @param startDate
* @param endDate
* @return
*/
public boolean isRegisterPossible(LocalDate startDate, LocalDate endDate) {
// TODO : 15일로 변경, 테스트를 위해 60일로 진행중
LocalDate limitStart = LocalDate.now().minusDays(60);
log.debug("isRegisterPossible @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate));
}
}

View File

@@ -1,17 +1,17 @@
package app.module.front.usecase.daily.calendar.adapters.persistence;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.enums.DailyTargetStatus;
import app.module.core.config.application.enums.MonthStatus;
import app.module.front.config.application.util.DailyUtil;
import app.module.core.config.application.util.DailyUtil;
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto;
import app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto;
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
import app.module.front.usecase.daily.calendar.ports.application.domain.CalendarChildren;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
import app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;

View File

@@ -1,7 +1,6 @@
package app.module.front.usecase.daily.calendar.ports.application.domain;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
import lombok.AllArgsConstructor;
import app.module.core.config.application.enums.DailyTargetStatus;
import lombok.Data;
@Data

View File

@@ -6,7 +6,7 @@ import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyEx
import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO;
import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.core.config.application.enums.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;

View File

@@ -6,7 +6,7 @@ import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFa
import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO;
import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.core.config.application.enums.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;

View File

@@ -6,7 +6,7 @@ import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyF
import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO;
import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.core.config.application.enums.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;

View File

@@ -6,7 +6,7 @@ import app.module.front.usecase.daily.income.adapters.persistence.model.DailyInc
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.core.config.application.enums.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;

View File

@@ -5,7 +5,7 @@ import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowe
import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO;
import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.core.config.application.enums.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;

View File

@@ -1,11 +1,11 @@
package app.module.front.usecase.daily.record.adapters.persistence;
import app.module.front.config.application.util.AuditUtil;
import app.module.front.config.application.util.DailyUtil;
import app.module.core.config.application.util.DailyUtil;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
import app.module.core.config.application.enums.DailyStatus;
import app.module.core.config.application.enums.DailyTargetStatus;
import app.module.front.usecase.daily.record.ports.DailyRecordPortOut;
import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
@@ -14,11 +14,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
import java.util.Locale;
@Slf4j
@Repository

View File

@@ -1,8 +1,8 @@
package app.module.front.usecase.daily.record.adapters.persistence.model;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.enums.DailyStatus;
import app.module.core.config.application.enums.DailyTargetStatus;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

View File

@@ -1,7 +1,7 @@
package app.module.front.usecase.daily.record.adapters.persistence.model;
import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
import app.module.core.config.application.enums.DailyStatus;
import app.module.core.config.application.enums.DailyTargetStatus;
import lombok.Data;
import lombok.ToString;

View File

@@ -2,7 +2,7 @@ package app.module.front.usecase.daily.record.adapters.web;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
import app.module.core.config.application.enums.DailyTargetStatus;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.adapters.web.validator.CreateDailyRecordValidator;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;

View File

@@ -7,15 +7,13 @@ import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIR
import app.module.front.usecase.daily.farming.ports.DailyFarmingPortIn;
import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO;
import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO;
import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
import app.module.core.config.application.enums.DailyStatus;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.adapters.web.validator.CreateDailyRecordValidator;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
import app.module.front.usecase.daily.work.ports.DailyWorkPortIn;
@@ -27,8 +25,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import java.util.List;
@Slf4j
@Controller
@RequiredArgsConstructor

View File

@@ -1,5 +1,7 @@
package app.module.front.usecase.daily.record.adapters.web.model;
import app.module.core.config.application.enums.DailyStatus;
import app.module.core.config.application.enums.DailyTargetStatus;
import lombok.Data;
import lombok.ToString;

View File

@@ -1,18 +0,0 @@
package app.module.front.usecase.daily.record.adapters.web.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@Getter
@RequiredArgsConstructor
public enum DailySort {
INCOME("수입"),
WORK("임업노동 투입"),
EXPENSE("지출"),
POWER("동력 사용시간"),
FORESTRY("임업생산물 중 자가소비량"),
FARMING("농업생산물 중 자가소비량"),
;
private final String desc;
}

View File

@@ -1,17 +0,0 @@
package app.module.front.usecase.daily.record.adapters.web.model;
public enum DailyStatus {
/**
* 미완료
*/
WAITING,
/**
* 등록 없음
*/
TODAY_NONE,
/**
* 등록 완료
*/
DONE,
;
}

View File

@@ -1,17 +0,0 @@
package app.module.front.usecase.daily.record.adapters.web.model;
public enum DailyTargetStatus {
/**
* 등록 대상 (테이터 건 수 체크)
*/
TARGET,
/**
* 금일 없음 (데이터 건 수 체크하지 않음)
*/
TODAY_NONE,
/**
* 대상 아님
*/
NONE,
;
}

View File

@@ -2,7 +2,7 @@ package app.module.front.usecase.daily.record.adapters.web.validator;
import app.module.core.config.application.util.MessageUtil;
import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
import app.module.core.config.application.enums.DailyStatus;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;

View File

@@ -4,8 +4,8 @@ import app.module.front.config.application.util.AuditUtil;
import app.module.front.config.application.util.AuthUtil;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.enums.DailyTargetStatus;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.front.usecase.daily.record.ports.DailyRecordPortOut;
@@ -15,7 +15,6 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;

View File

@@ -1,8 +1,8 @@
package app.module.front.usecase.daily.record.ports.application.domain;
import app.module.front.config.adapters.persistence.component.FrontAuditCommand;
import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
import app.module.core.config.application.enums.DailyStatus;
import app.module.core.config.application.enums.DailyTargetStatus;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;

View File

@@ -3,7 +3,7 @@ package app.module.front.usecase.daily.work.adapters.web;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
import app.module.core.config.application.enums.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;