[CORE] daily.record core package 로 이동.

This commit is contained in:
김현주
2025-06-25 14:03:53 +09:00
parent 7deed5fc64
commit eaa886c66b
55 changed files with 246 additions and 206 deletions

View File

@@ -10,9 +10,9 @@ import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut;
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.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 app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;

View File

@@ -1,7 +1,7 @@
package app.module.front.usecase.daily.calendar.adapters.persistence;
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import app.module.core.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.application.domain.RecordCalendarCmd;
import org.apache.ibatis.annotations.Mapper;

View File

@@ -1,7 +1,6 @@
package app.module.front.usecase.daily.calendar.adapters.web.model;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

View File

@@ -2,7 +2,7 @@ package app.module.front.usecase.daily.calendar.ports;
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.persistence.model.DailyRecordStatusDto;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import java.util.List;

View File

@@ -1,13 +1,11 @@
package app.module.front.usecase.daily.calendar.ports.application;
import app.module.front.config.application.util.AuthUtil;
import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO;
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn;
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut;
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.persistence.model.DailyRecordStatusDto;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

View File

@@ -6,9 +6,9 @@ import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpe
import app.module.front.usecase.daily.expense.adapters.web.model.RemoveDailyExpenseReqVO;
import app.module.front.usecase.daily.expense.adapters.web.validator.CreateDailyExpenseValidator;
import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping(path = "/api/record/expense")
public class DailyExpenseController {
private final CoreUtil coreUtil;
private final DailyRecordPortIn dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyExpensePortIn dailyExpensePortIn;
private final CreateDailyExpenseValidator createValidator;
@@ -121,7 +121,7 @@ public class DailyExpenseController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}

View File

@@ -5,10 +5,10 @@ import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto;
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.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -28,7 +28,7 @@ import java.util.List;
@RequestMapping(path = "/record/expense")
public class DailyExpenseUIController {
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordPortIn dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyExpensePortIn dailyExpensePortIn;
/**
@@ -108,7 +108,7 @@ public class DailyExpenseUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.expense.ports.application;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import app.module.front.config.application.util.AuditUtil;
@@ -13,7 +14,7 @@ import app.module.front.usecase.daily.expense.ports.DailyExpensePortOut;
import app.module.front.usecase.daily.expense.ports.application.domain.CreateDailyExpenseCmd;
import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd;
import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import app.module.core.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -24,7 +25,7 @@ import java.util.List;
public class DailyExpenseService implements DailyExpensePortIn {
private final DailyExpensePortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public List<DailyExpenseDto> list(DailyExpenseUIReqVO reqVO) {
@@ -110,7 +111,7 @@ public class DailyExpenseService implements DailyExpensePortIn {
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
@@ -132,6 +133,6 @@ public class DailyExpenseService implements DailyExpensePortIn {
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -6,9 +6,9 @@ import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarm
import app.module.front.usecase.daily.farming.adapters.web.model.RemoveDailyFarmingReqVO;
import app.module.front.usecase.daily.farming.adapters.web.validator.CreateDailyFarmingValidator;
import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping(path = "/api/record/farming")
public class DailyFarmingController {
private final CoreUtil coreUtil;
private final DailyRecordPortIn dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyFarmingService dailyFarmingPortIn;
private final CreateDailyFarmingValidator createValidator;
@@ -121,7 +121,7 @@ public class DailyFarmingController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}

View File

@@ -5,10 +5,10 @@ import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto;
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.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -108,7 +108,7 @@ public class DailyFarmingUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.farming.ports.application;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import app.module.front.config.application.util.AuditUtil;
@@ -13,7 +14,6 @@ import app.module.front.usecase.daily.farming.ports.DailyFarmingPortOut;
import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd;
import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd;
import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -26,7 +26,7 @@ import java.util.List;
public class DailyFarmingService implements DailyFarmingPortIn {
private final DailyFarmingPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public List<DailyFarmingDto> list(DailyFarmingUIReqVO reqVO) {
@@ -135,7 +135,7 @@ public class DailyFarmingService implements DailyFarmingPortIn {
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
@@ -157,6 +157,6 @@ public class DailyFarmingService implements DailyFarmingPortIn {
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -6,9 +6,9 @@ import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyFor
import app.module.front.usecase.daily.forestry.adapters.web.model.RemoveDailyForestryReqVO;
import app.module.front.usecase.daily.forestry.adapters.web.validator.CreateDailyForestryValidator;
import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -121,7 +121,7 @@ public class DailyForestryController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}

View File

@@ -5,10 +5,10 @@ import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryDto;
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.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -108,7 +108,7 @@ public class DailyForestryUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.forestry.ports.application;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import app.module.front.config.application.util.AuditUtil;
@@ -13,7 +14,7 @@ import app.module.front.usecase.daily.forestry.ports.DailyForestryPortOut;
import app.module.front.usecase.daily.forestry.ports.application.domain.CreateDailyForestryCmd;
import app.module.front.usecase.daily.forestry.ports.application.domain.GetDailyForestryCmd;
import app.module.front.usecase.daily.forestry.ports.application.domain.RemoveDailyForestryCmd;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import app.module.core.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -26,7 +27,7 @@ import java.util.List;
public class DailyForestryService implements DailyForestryPortIn {
private final DailyForestryPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public List<DailyForestryDto> list(DailyForestryUIReqVO reqVO) {
@@ -108,7 +109,7 @@ public class DailyForestryService implements DailyForestryPortIn {
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
@@ -130,6 +131,6 @@ public class DailyForestryService implements DailyForestryPortIn {
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -6,9 +6,9 @@ import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncom
import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO;
import app.module.front.usecase.daily.income.adapters.web.validator.CreateDailyIncomeValidator;
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -121,7 +121,7 @@ public class DailyIncomeController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}

View File

@@ -5,10 +5,10 @@ import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
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.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -109,7 +109,7 @@ public class DailyIncomeUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.income.ports.application;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import app.module.front.config.application.util.AuditUtil;
@@ -13,7 +14,7 @@ import app.module.front.usecase.daily.income.ports.DailyIncomePortOut;
import app.module.front.usecase.daily.income.ports.application.domain.CreateDailyIncomeCmd;
import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd;
import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import app.module.core.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -24,7 +25,7 @@ import java.util.List;
public class DailyIncomeService implements DailyIncomePortIn {
private final DailyIncomePortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public List<DailyIncomeDto> list(DailyIncomeUIReqVO reqVO) {
@@ -114,7 +115,7 @@ public class DailyIncomeService implements DailyIncomePortIn {
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
@@ -136,6 +137,6 @@ public class DailyIncomeService implements DailyIncomePortIn {
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -6,9 +6,9 @@ import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerR
import app.module.front.usecase.daily.power.adapters.web.model.RemoveDailyPowerReqVO;
import app.module.front.usecase.daily.power.adapters.web.validator.CreateDailyPowerValidator;
import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -121,7 +121,7 @@ public class DailyPowerController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}

View File

@@ -4,10 +4,10 @@ import app.module.core.config.application.exception.NoRecordDataException;
import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto;
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.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -103,7 +103,7 @@ public class DailyPowerUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}

View File

@@ -1,12 +1,7 @@
package app.module.front.usecase.daily.power.ports.application;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.front.config.application.util.AuditUtil;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
import app.module.front.usecase.daily.income.ports.application.domain.CreateDailyIncomeCmd;
import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd;
import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd;
import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto;
import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO;
import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO;
@@ -16,7 +11,7 @@ import app.module.front.usecase.daily.power.ports.DailyPowerPortOut;
import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd;
import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd;
import app.module.front.usecase.daily.power.ports.application.domain.RemoveDailyPowerCmd;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import app.module.core.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -26,7 +21,7 @@ import java.util.List;
@RequiredArgsConstructor
public class DailyPowerService implements DailyPowerPortIn {
private final DailyPowerPortOut portOut;
private final DailyRecordService dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public List<DailyPowerDto> list(DailyPowerUIReqVO reqVO) {
@@ -74,7 +69,7 @@ public class DailyPowerService implements DailyPowerPortIn {
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
@@ -96,6 +91,6 @@ public class DailyPowerService implements DailyPowerPortIn {
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -1,202 +0,0 @@
package app.module.front.usecase.daily.record.adapters.persistence;
import app.module.front.config.application.util.AuditUtil;
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.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;
import app.module.front.usecase.daily.record.ports.application.domain.UpdateDailyRecordStatusCmd;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;
import java.util.List;
@Slf4j
@Repository
@RequiredArgsConstructor
public class DailyRecordDao implements DailyRecordPortOut {
private final DailyRecordMapper dailyRecordMapper;
private final DailyUtil dailyUtil;
@Override
public DailyRecordDto detail(GetDailyRecordCmd command) {
DailyRecordDto detail = dailyRecordMapper.getDailyRecord(command);
if (detail != null) {
if (detail.getStartDate() == null) {
detail.setStartDate(dailyUtil.getDayToLocalDate(command.getSearchMonth(), detail.getStartDay()));
detail.setEndDate(dailyUtil.getDayToLocalDate(command.getSearchMonth(), detail.getEndDay()));
if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) {
// 종료일의 달이 변경되면 시작일=종료일 처리
detail.setEndDate(detail.getStartDate());
}
}
detail.setLastDay(dailyUtil.isLastDay(detail.getEndDate()));
detail.setFarmingOpen(dailyUtil.isFarmingOpen(detail.getGroupNo(), detail.getEndDate()));
detail.setRegistrable(dailyUtil.isRegisterPossible(detail.getStartDate(), detail.getEndDate()));
detail.setModifiable(dailyUtil.isModifiable(detail.getStartDate(), detail.getEndDate()));
}
log.debug("detail: {}", detail);
return detail;
}
@Override
public void create(GetDailyRecordCmd findCmd, CreateDailyRecordCmd command) {
Integer existCount = dailyRecordMapper.getDailyRecordExistCount(findCmd);
if (existCount == 0) {
dailyRecordMapper.createDailyRecord(command);
log.debug("[CreateDailyRecord] record={}", command);
} else {
dailyRecordMapper.updateDailyRecord(command);
log.warn("[DailyRecordCreate] existCount={}, recordMonth={}, dayGroupNo={}", existCount, findCmd.getSearchMonth(), findCmd.getGroupNo());
}
this.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
public void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus) {
UpdateDailyRecordStatusCmd command = AuditUtil.update(
new UpdateDailyRecordStatusCmd(
recordMonth,
dayGroupNo,
"ALL".equals(targetType) ? targetStatus : null,
!"ALL".equals(targetType) ? targetType : null,
!"ALL".equals(targetType) ? targetStatus : null
)
);
if ("ALL".equals(targetType)) {
String allStatus = this.getUpdateAllStatus(recordMonth, dayGroupNo, command.getHouseholdSeq());
if (allStatus != null) {
command.setAllStatus(allStatus);
dailyRecordMapper.updateDailyRecordStatus(command);
} else {
log.debug("[updateByAllStatus] do nothing. findCmd: {}", command);
}
} else {
dailyRecordMapper.updateDailyRecordStatus(command);
}
}
/**
* 일계부 전체 입력상태 변경
*
* @param searchMonth
* @param dayGroupNo
* @param householdSeq
*/
private void updateByAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) {
String allStatus = this.getUpdateAllStatus(searchMonth, dayGroupNo, householdSeq);
if (allStatus != null) {
UpdateDailyRecordStatusCmd command = AuditUtil.update(
new UpdateDailyRecordStatusCmd(
searchMonth,
dayGroupNo,
allStatus,
null,
null
)
);
dailyRecordMapper.updateDailyRecordStatus(command);
} else {
log.debug("[updateByAllStatus] do nothing. findCmd: {}");
}
}
/**
* TODO 변경할 전체 입력상태 조회
*
* @param searchMonth
* @param dayGroupNo
* @param householdSeq
* @return 변경할 전체 입력상태
*/
private String getUpdateAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) {
GetDailyRecordCmd findCmd = new GetDailyRecordCmd(searchMonth, dayGroupNo, householdSeq);
DailyRecordStatusDto statusDetail = null;
List<DailyRecordStatusDto> statusList = dailyRecordMapper.getDailyRecordStatus(findCmd);
if (statusList != null && !statusList.isEmpty()) {
statusDetail = statusList.get(0);
}
String allStatus = null;
if (statusDetail != null) {
if (DailyStatus.TODAY_NONE.equals(statusDetail.getAllStatus())) {
// 전체상태=금일없음, 항목=입력대상이 있는지 여부
if (this.checkTarget(statusDetail.getIncomeStatus()) || this.checkTarget(statusDetail.getExpenseStatus())
|| this.checkTarget(statusDetail.getWorkStatus()) || this.checkTarget(statusDetail.getPowerStatus())
|| this.checkTarget(statusDetail.getForestryStatus()) || this.checkTarget(statusDetail.getFarmingStatus())) {
allStatus = DailyStatus.WAITING.name();
}
} else if (DailyStatus.WAITING.equals(statusDetail.getAllStatus())) {
// 전체상태=입력중, 항목 COUNT!=0 이 있는지 여부
int noneCheck = 0;
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getIncomeStatus(), statusDetail.getIncomeCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getExpenseStatus(), statusDetail.getExpenseCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getWorkStatus(), statusDetail.getWorkCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getPowerStatus(), statusDetail.getPowerCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getForestryStatus(), statusDetail.getForestryCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getFarmingStatus(), statusDetail.getFarmingCount()) ? 1 : 0);
if (noneCheck == 0) {
allStatus = DailyStatus.DONE.name();
}
} else if (DailyStatus.DONE.equals(statusDetail.getAllStatus())) {
// 전체상태=완료, 항목 COUNT=0 체크
int noneCheck = 0;
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getIncomeStatus(), statusDetail.getIncomeCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getExpenseStatus(), statusDetail.getExpenseCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getWorkStatus(), statusDetail.getWorkCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getPowerStatus(), statusDetail.getPowerCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getForestryStatus(), statusDetail.getForestryCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getFarmingStatus(), statusDetail.getFarmingCount()) ? 1 : 0);
if (noneCheck != 0) {
allStatus = DailyStatus.WAITING.name();
}
}
}
return allStatus;
}
/**
* 입력 대상 상태 조회
*
* @param status 조회 상태
* @return true=입력 대상, false=금일 데이터 없음 또는 대상 아님
*/
private boolean checkTarget(DailyTargetStatus status) {
// NONE 은 대상이 아니기 때문에 체크에서 제외
return DailyTargetStatus.TARGET.equals(status);
}
/**
* 등록 대상인데 데이터가 없는 경우 조회
*
* @param status 조회 상태
* @param count 조회 건수
* @return true=입력대상인데 데이터가 없는 경우, false=입력대상 아니거나, 데이터가 있는 경우
*/
private boolean checkTargetDataNone(DailyTargetStatus status, Integer count) {
return DailyTargetStatus.TARGET.equals(status) && count == 0;
}
}

View File

@@ -1,59 +0,0 @@
package app.module.front.usecase.daily.record.adapters.persistence;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
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.ports.application.domain.CreateDailyRecordCmd;
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
import app.module.front.usecase.daily.record.ports.application.domain.UpdateDailyRecordStatusCmd;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface DailyRecordMapper {
/**
* 일계부 항목 조회
*
* @param command 검색 조건
* @return 항목 상세
*/
DailyRecordDto getDailyRecord(GetDailyRecordCmd command);
/**
* 특정일의 일계부 등록 상태 조회
*
* @param command 검색 조건
* @return 일계부 등록 현황 목록
*/
List<DailyRecordStatusDto> getDailyRecordStatus(GetDailyRecordCmd command);
/**
* 일계부 항목 등록 여부
*
* @param command 검색 조건
* @return 등록 여부
*/
Integer getDailyRecordExistCount(GetDailyRecordCmd command);
/**
* 일계부 항목 등록(생성)
*
* @param command 등록 데이터
*/
void createDailyRecord(CreateDailyRecordCmd command);
/**
* 일계부 항목 수정
*
* @param command 수정 데이터
*/
void updateDailyRecord(CreateDailyRecordCmd command);
/**
* 일계부 항목의 상태 수정
*
* @param command 수정 데이터
*/
void updateDailyRecordStatus(UpdateDailyRecordStatusCmd command);
}

View File

@@ -1,82 +0,0 @@
package app.module.front.usecase.daily.record.adapters.persistence.model;
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;
import java.time.LocalDate;
import java.util.List;
@Slf4j
@Data
public class DailyRecordDto {
private String recordMonth;
private Integer groupNo;
private Integer startDay;
private Integer endDay;
private Long id;
private LocalDate startDate;
private LocalDate endDate;
private DailyStatus allStatus;
private DailyTargetStatus incomeStatus;
private DailyTargetStatus workStatus;
private DailyTargetStatus expenseStatus;
private DailyTargetStatus powerStatus;
private DailyTargetStatus forestryStatus;
private DailyTargetStatus farmingStatus;
/**
* 마지막 일 여부
*/
private boolean lastDay;
/**
* 자가농업 항목 오픈 여부
*/
private boolean farmingOpen;
/**
* 데이터 등록 가능 여부
*/
private boolean registrable;
/**
* 데이터 수정 가능 여부
*/
private boolean modifiable;
/**
* 현재 단계
*/
private DailySort currentStep;
/**
* 특정일의 데이터 등록 대상 항목
*/
private List<DailySort> targetList;
/**
* 다음 단계로 이동될 단계 대상 항목
*/
private List<DailySort> stepList;
/**
* 다음 단계로 이동될 단계 조회
*
* @return 다음 단계명
*/
public String getNextStep() {
String returnValue = null;
if (stepList != null) {
int index = 0;
int size = stepList.size();
for (DailySort target : stepList) {
if (target.equals(currentStep) && (index + 1) != size) {
returnValue = stepList.get(index + 1).name();
break;
}
index++;
}
}
return returnValue;
}
}

View File

@@ -1,81 +0,0 @@
package app.module.front.usecase.daily.record.adapters.persistence.model;
import app.module.core.config.application.enums.DailyStatus;
import app.module.core.config.application.enums.DailyTargetStatus;
import lombok.Data;
import lombok.ToString;
import java.time.LocalDate;
@Data
@ToString
public class DailyRecordStatusDto {
/**
* 일계부 일련번호
*/
private Long dailyId;
/**
* 특정일의 그룹 번호
*/
private Integer dayGroupNo;
/**
* 시작일
*/
private LocalDate startDate;
/**
* 종료일
*/
private LocalDate endDate;
/**
* 특정일 입력 상태
*/
private DailyStatus allStatus;
/**
* 수입 입력 상태
*/
private DailyTargetStatus incomeStatus;
/**
* 임업노동 입력 상태
*/
private DailyTargetStatus workStatus;
/**
* 지출 입력 상태
*/
private DailyTargetStatus expenseStatus;
/**
* 동력 사용시간 입력 상태
*/
private DailyTargetStatus powerStatus;
/**
* 자가임업 입력 상태
*/
private DailyTargetStatus forestryStatus;
/**
* 자가농업 입력 상태
*/
private DailyTargetStatus farmingStatus;
/**
* 수입 입력 개수
*/
private Integer incomeCount;
/**
* 임업노동 입력 개수
*/
private Integer workCount;
/**
* 지출 입력 개수
*/
private Integer expenseCount;
/**
* 동력 사용시간 입력 개수
*/
private Integer powerCount;
/**
* 자가임업 입력 개수
*/
private Integer forestryCount;
/**
* 자가농업 입력 개수
*/
private Integer farmingCount;
}

View File

@@ -1,14 +0,0 @@
package app.module.front.usecase.daily.record.adapters.persistence.model;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class UpdateDailyRecordDto {
private String monthly;
private String updatedBy;
private String statusType;
private String statusCode;
}

View File

@@ -1,11 +1,13 @@
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.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.config.application.enums.DailyTargetStatus;
import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
import app.module.front.config.application.util.AuditUtil;
import app.module.front.config.application.util.AuthUtil;
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.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -43,12 +45,13 @@ public class DailyRecordController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("reqVO: {}", reqVO);
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO);
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
formVO.setRecordMonth(reqVO.getSearchMonth());
formVO.setDayGroupNo(reqVO.getGroupNo());
formVO.setStartDate(detail.getStartDate());
formVO.setEndDate(detail.getEndDate());
formVO.setFarming(detail.isFarmingOpen());
formVO.setHouseholdSeq(reqVO.getHouseholdSeq());
log.debug("formVO: {}", formVO);
dailyRecordPortIn.create(formVO);
@@ -72,10 +75,10 @@ public class DailyRecordController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("reqVO: {}, target: {}, status: {}", reqVO, targetType, targetStatus);
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO);
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
// TODO : true / false 를 업데이트하는 것은 대상 타켓이 되는 것이라 판단하여 그냥 강제 업데이트할 것인가? valid 체크
dailyRecordPortIn.updateByStatus(detail.getRecordMonth(), detail.getGroupNo(), targetType, "Y".equals(targetStatus) ? DailyTargetStatus.TODAY_NONE.name() : DailyTargetStatus.TARGET.name());
dailyRecordPortIn.updateByStatus(detail.getRecordMonth(), detail.getGroupNo(), reqVO.getHouseholdSeq(), targetType, "Y".equals(targetStatus) ? DailyTargetStatus.TODAY_NONE.name() : DailyTargetStatus.TARGET.name());
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
}

View File

@@ -11,10 +11,10 @@ import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReq
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.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.ports.DailyRecordPortIn;
import app.module.core.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;
import lombok.RequiredArgsConstructor;
@@ -52,7 +52,7 @@ public class DailyRecordUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("reqVO: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null) {
throw new NoMatchingURIException("[Record] 잘못된 접근");
}
@@ -77,7 +77,7 @@ public class DailyRecordUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("reqVO: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null) {
throw new NoMatchingURIException("[Record] 잘못된 접근");
}

View File

@@ -1,79 +0,0 @@
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;
import java.time.LocalDate;
@Data
@ToString
public class CreateDailyRecordReqVO {
private Long id;
private String recordMonth;
private int dayGroupNo;
private LocalDate startDate;
private LocalDate endDate;
private String todayNone;
private DailyStatus allStatus;
private DailyTargetStatus incomeStatus;
private DailyTargetStatus workStatus;
private DailyTargetStatus expenseStatus;
private DailyTargetStatus powerStatus;
private DailyTargetStatus forestryStatus;
private DailyTargetStatus farmingStatus;
/**
* 금일 데이터 없음으로 각 항목 상태 일괄 변경
*
* @param todayNone 상태
*/
public void setTodayNone(String todayNone) {
this.todayNone = todayNone;
if ("Y".equals(todayNone)) {
this.allStatus = DailyStatus.TODAY_NONE;
this.incomeStatus = DailyTargetStatus.TODAY_NONE;
this.workStatus = DailyTargetStatus.TODAY_NONE;
this.expenseStatus = DailyTargetStatus.TODAY_NONE;
this.powerStatus = DailyTargetStatus.TODAY_NONE;
this.forestryStatus = DailyTargetStatus.TODAY_NONE;
} else {
this.allStatus = DailyStatus.WAITING;
if (incomeStatus == null) {
this.incomeStatus = DailyTargetStatus.TODAY_NONE;
}
if (workStatus == null) {
this.workStatus = DailyTargetStatus.TODAY_NONE;
}
if (expenseStatus == null) {
this.expenseStatus = DailyTargetStatus.TODAY_NONE;
}
if (powerStatus == null) {
this.powerStatus = DailyTargetStatus.TODAY_NONE;
}
if (forestryStatus == null) {
this.forestryStatus = DailyTargetStatus.TODAY_NONE;
}
}
}
/**
* 농업 생산물 입력 상태 변경
*
* @param isOpen 자가농업 항목 오픈 여부
*/
public void setFarming(boolean isOpen) {
if (farmingStatus == null) {
if (isOpen) {
this.farmingStatus = DailyTargetStatus.TODAY_NONE;
} else {
this.farmingStatus = DailyTargetStatus.NONE;
}
} else {
this.farmingStatus = DailyTargetStatus.TARGET;
}
}
}

View File

@@ -1,8 +1,8 @@
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.core.config.application.enums.DailyStatus;
import app.module.core.config.application.util.MessageUtil;
import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;

View File

@@ -1,26 +0,0 @@
package app.module.front.usecase.daily.record.ports;
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.DailyUIReqVO;
public interface DailyRecordPortIn {
/**
* 일계부 항목 조회
*
* @param reqVO 검색 조건
* @return 항목 상세
*/
DailyRecordDto detail(DailyUIReqVO reqVO);
/**
* 일계부 항목 등록
*
* @param formVO 입력 데이터
*/
void create(CreateDailyRecordReqVO formVO);
void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus);
void updateByAllStatus(String recordMonth, Integer dayGroupNo);
}

View File

@@ -1,24 +0,0 @@
package app.module.front.usecase.daily.record.ports;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
public interface DailyRecordPortOut {
/**
* 일계부 항목 조회
* @param command 검색 조건
* @return 항목 상세
*/
DailyRecordDto detail(GetDailyRecordCmd command);
/**
* 일계부 항목 등록
*
* @param findCmd 검색 조건
* @param command 입력 데이터
*/
void create(GetDailyRecordCmd findCmd, CreateDailyRecordCmd command);
void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus);
}

View File

@@ -1,104 +0,0 @@
package app.module.front.usecase.daily.record.ports.application;
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.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;
import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Service
@RequiredArgsConstructor
public class DailyRecordService implements DailyRecordPortIn {
private final DailyRecordPortOut portOut;
@Override
public DailyRecordDto detail(DailyUIReqVO reqVO) {
DailyRecordDto dailyRecord = portOut.detail(new GetDailyRecordCmd(reqVO.getSearchMonth(),
reqVO.getGroupNo(),
reqVO.getHouseholdSeq()));
if (dailyRecord != null) {
List<DailySort> targetList = new ArrayList<>();
if (this.isTarget(dailyRecord.getIncomeStatus())) {
targetList.add(DailySort.INCOME);
}
if (this.isTarget(dailyRecord.getWorkStatus())) {
targetList.add(DailySort.WORK);
}
if (this.isTarget(dailyRecord.getExpenseStatus())) {
targetList.add(DailySort.EXPENSE);
}
if (this.isTarget(dailyRecord.getPowerStatus())) {
targetList.add(DailySort.POWER);
}
if (this.isTarget(dailyRecord.getForestryStatus())) {
targetList.add(DailySort.FORESTRY);
}
if (this.isTarget(dailyRecord.getFarmingStatus())) {
targetList.add(DailySort.FARMING);
}
dailyRecord.setTargetList(targetList);
}
return dailyRecord;
}
/**
* 데이터 등록 대상 여부
*
* @param status 상태
* @return true=대상, false=대상 아님
*/
private boolean isTarget(DailyTargetStatus status) {
return DailyTargetStatus.TARGET.equals(status) || DailyTargetStatus.TODAY_NONE.equals(status);
}
@Override
public void create(CreateDailyRecordReqVO formVO) {
GetDailyRecordCmd findCmd = new GetDailyRecordCmd(
formVO.getRecordMonth(),
formVO.getDayGroupNo(),
AuthUtil.getUserSeq());
CreateDailyRecordCmd command = AuditUtil.create(
new CreateDailyRecordCmd(
null,
formVO.getRecordMonth(),
formVO.getDayGroupNo(),
formVO.getStartDate(),
formVO.getEndDate(),
formVO.getAllStatus(),
formVO.getIncomeStatus(),
formVO.getWorkStatus(),
formVO.getExpenseStatus(),
formVO.getPowerStatus(),
formVO.getForestryStatus(),
formVO.getFarmingStatus()));
portOut.create(findCmd, command);
}
@Override
public void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus) {
portOut.updateByStatus(recordMonth, dayGroupNo, targetType, targetStatus);
portOut.updateByStatus(recordMonth, dayGroupNo, "ALL", null);
}
@Override
public void updateByAllStatus(String recordMonth, Integer dayGroupNo) {
portOut.updateByStatus(recordMonth, dayGroupNo, "ALL", null);
}
}

View File

@@ -1,30 +0,0 @@
package app.module.front.usecase.daily.record.ports.application.domain;
import app.module.front.config.adapters.persistence.component.FrontAuditCommand;
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;
import lombok.ToString;
import java.time.LocalDate;
@Getter
@Setter
@AllArgsConstructor
@ToString
public class CreateDailyRecordCmd extends FrontAuditCommand {
private Long id;
private String recordMonth;
private int dayGroupNo;
private LocalDate startDate;
private LocalDate endDate;
private DailyStatus allStatus;
private DailyTargetStatus incomeStatus;
private DailyTargetStatus workStatus;
private DailyTargetStatus expenseStatus;
private DailyTargetStatus powerStatus;
private DailyTargetStatus forestryStatus;
private DailyTargetStatus farmingStatus;
}

View File

@@ -1,23 +0,0 @@
package app.module.front.usecase.daily.record.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class GetDailyRecordCmd {
/**
* 검색 월(yyyyMM)
*/
private String searchMonth;
/**
* 검색 그룸번호
*/
private Integer groupNo;
/**
* 임가 일련번호
*/
private Long householdSeq;
}

View File

@@ -1,19 +0,0 @@
package app.module.front.usecase.daily.record.ports.application.domain;
import app.module.front.config.adapters.persistence.component.FrontAuditCommand;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@AllArgsConstructor
@ToString
public class UpdateDailyRecordStatusCmd extends FrontAuditCommand {
private String recordMonth;
private Integer dayGroupNo;
private String allStatus;
private String targetType;
private String targetStatus;
}

View File

@@ -1,7 +1,5 @@
package app.module.front.usecase.daily.work.adapters.persistence;
import app.module.front.usecase.daily.record.adapters.persistence.DailyRecordDao;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
import app.module.front.usecase.daily.work.ports.DailyWorkPortOut;
import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd;

View File

@@ -2,9 +2,9 @@ package app.module.front.usecase.daily.work.adapters.web;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.util.CoreUtil;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
import app.module.front.usecase.daily.work.adapters.web.model.RemoveDailyWorkReqVO;
import app.module.front.usecase.daily.work.adapters.web.validator.CreateDailyWorkValidator;
@@ -125,7 +125,7 @@ public class DailyWorkController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}

View File

@@ -2,10 +2,10 @@ 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.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
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.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
import app.module.front.usecase.daily.work.ports.DailyWorkPortIn;
@@ -109,7 +109,7 @@ public class DailyWorkUIController {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}

View File

@@ -1,10 +1,11 @@
package app.module.front.usecase.daily.work.ports.application;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import app.module.front.config.application.util.AuditUtil;
import app.module.front.config.constants.CommonConstants;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import app.module.core.usecase.daily.record.ports.application.DailyRecordService;
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
@@ -24,7 +25,7 @@ import java.util.List;
public class DailyWorkService implements DailyWorkPortIn {
private final DailyWorkPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public List<DailyWorkDto> list(DailyWorkUIReqVO reqVO) {
@@ -124,7 +125,7 @@ public class DailyWorkService implements DailyWorkPortIn {
portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
@Override
@@ -146,6 +147,6 @@ public class DailyWorkService implements DailyWorkPortIn {
portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}