diff --git a/core/src/main/resources/mappers/daily/DailyRecordMapper.xml b/core/src/main/resources/mappers/daily/DailyRecordMapper.xml index c0798366..680a276d 100644 --- a/core/src/main/resources/mappers/daily/DailyRecordMapper.xml +++ b/core/src/main/resources/mappers/daily/DailyRecordMapper.xml @@ -123,19 +123,22 @@ - inner join daily_record dr on - dr.id = ds.daily_record_seq + inner join daily_record dr + on dr.id = ds.daily_record_seq and dr.is_deleted = false and dr.record_month = #{searchMonth} and dr.day_group_no = #{groupNo} and dr.household_seq = #{householdSeq} - inner join daily_record dr on - dr.id = ds.daily_record_seq + inner join daily_record dr + on dr.id = ds.daily_record_seq and dr.is_deleted = false and dr.record_month = #{searchMonth} and dr.household_seq = #{householdSeq} + inner join daily_day_group ddg + on ddg.group_no = dr.day_group_no + and ddg.is_deleted = false diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeDao.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeDao.java index 76177627..745ce531 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeDao.java @@ -24,7 +24,7 @@ public class DailyIncomeDao implements DailyIncomePortOut { @Override public List monthList(GetDailyIncomeCmd command) { - return dailyIncomeMapper.getDailyIncomeListByMonth(command); + return dailyIncomeMapper.getDailyIncomeMonthList(command); } @Override diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeMapper.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeMapper.java index 9e54d559..c1de6ecc 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeMapper.java @@ -24,7 +24,7 @@ public interface DailyIncomeMapper { * @param command 검색 조건 * @return 수입 목록 */ - List getDailyIncomeListByMonth(GetDailyIncomeCmd command); + List getDailyIncomeMonthList(GetDailyIncomeCmd command); /** * 일계부 수입 데이터 존재 여부 diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyMonthIncomeDto.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeMonthDto.java similarity index 75% rename from front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyMonthIncomeDto.java rename to front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeMonthDto.java index 6d2becf2..c07ba2a7 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyMonthIncomeDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeMonthDto.java @@ -1,6 +1,5 @@ package app.module.front.usecase.daily.income.adapters.persistence.model; -import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -11,7 +10,7 @@ import java.util.List; @Getter @Setter @ToString -public class DailyMonthIncomeDto { +public class DailyIncomeMonthDto { private Long dailyRecordSeq; private LocalDate startDate; private LocalDate endDate; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortIn.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortIn.java index bb27e5af..bc9edecb 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortIn.java @@ -1,7 +1,7 @@ package app.module.front.usecase.daily.income.ports; import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyMonthIncomeDto; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto; import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO; import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO; @@ -23,7 +23,7 @@ public interface DailyIncomePortIn { * @param reqVO 검색 조건 * @return 수입 목록 */ - List monthList(DailyIncomeUIReqVO reqVO); + List monthList(DailyIncomeUIReqVO reqVO); /** * 일계부 수입 조회 diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortOut.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortOut.java index 066a1076..4a218f6d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortOut.java @@ -1,8 +1,6 @@ package app.module.front.usecase.daily.income.ports; import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyMonthIncomeDto; -import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; 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; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java index 5f4d558e..d76d3614 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java @@ -7,7 +7,7 @@ import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElemen import app.module.front.config.application.util.AuditUtil; import app.module.front.config.constants.CommonConstants; import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyMonthIncomeDto; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto; import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO; import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO; @@ -16,12 +16,12 @@ 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.core.usecase.daily.record.ports.application.DailyRecordService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; @Service @@ -37,23 +37,18 @@ public class DailyIncomeService implements DailyIncomePortIn { } @Override - public List monthList(DailyIncomeUIReqVO reqVO) { - - List monthList = new ArrayList<>(); - + public List monthList(DailyIncomeUIReqVO reqVO) { List list = this.getRefineList(reqVO, false); -// DailyIncomeDto> children; - List seqList = list.stream().map(m -> m.getDailyRecordSeq()).distinct().collect(Collectors.toList()); - - for (Long seq : seqList) { - DailyMonthIncomeDto month = new DailyMonthIncomeDto(); + List monthList = new ArrayList<>(); + List recordSeqList = list.stream().map(DailyIncomeDto::getDailyRecordSeq).distinct().toList(); + for (Long seq : recordSeqList) { + DailyIncomeMonthDto month = new DailyIncomeMonthDto(); month.setDailyRecordSeq(seq); - month.setStartDate(list.stream().filter(f -> f.getDailyRecordSeq() == seq).map(m -> m.getStartDate()).findFirst().get()); - month.setEndDate(list.stream().filter(f -> f.getDailyRecordSeq() == seq).map(m -> m.getEndDate()).findFirst().get()); - - month.setChildren(list.stream().filter(f -> f.getDailyRecordSeq() == seq).collect(Collectors.toList())); + month.setStartDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyIncomeDto::getStartDate).findFirst().orElse(null)); + month.setEndDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyIncomeDto::getEndDate).findFirst().orElse(null)); + month.setChildren(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).collect(Collectors.toList())); monthList.add(month); } @@ -74,7 +69,7 @@ public class DailyIncomeService implements DailyIncomePortIn { * 목록 데이터 조회 * * @param reqVO 검색 조건 - * @param dayGroup 일 그룹 조건 + * @param dayGroup 일 그룹 조건(true=일, false=월) * @return 공통 처리된 목록 */ private List getRefineList(DailyIncomeUIReqVO reqVO, boolean dayGroup) { diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusDao.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusDao.java index 0f1c4565..34fa758f 100644 --- a/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusDao.java @@ -3,7 +3,7 @@ package app.module.front.usecase.daily.status.adapters.persistence; import app.module.front.usecase.daily.status.adapters.persistence.model.DailyItemStatusDto; import app.module.front.usecase.daily.status.adapters.persistence.model.DailyMonthStatusDto; import app.module.front.usecase.daily.status.ports.DailyStatusPortOut; -import app.module.front.usecase.daily.status.ports.application.domain.DailyStatusCmd; +import app.module.front.usecase.daily.status.ports.application.domain.GetDailyStatusCmd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -15,7 +15,7 @@ public class DailyStatusDao implements DailyStatusPortOut { private final DailyStatusMapper dailyStatusMapper; @Override - public DailyMonthStatusDto operate(DailyStatusCmd command) { + public DailyMonthStatusDto operate(GetDailyStatusCmd command) { DailyMonthStatusDto detail = dailyStatusMapper.getDailyStatusByMonth(command); List countList = dailyStatusMapper.getDailyStatusByItemCount(command); List valueList = dailyStatusMapper.getDailyStatusByItemValue(command); diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusMapper.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusMapper.java index 65f12364..e8f1f941 100644 --- a/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusMapper.java @@ -2,7 +2,7 @@ package app.module.front.usecase.daily.status.adapters.persistence; import app.module.front.usecase.daily.status.adapters.persistence.model.DailyItemStatusDto; import app.module.front.usecase.daily.status.adapters.persistence.model.DailyMonthStatusDto; -import app.module.front.usecase.daily.status.ports.application.domain.DailyStatusCmd; +import app.module.front.usecase.daily.status.ports.application.domain.GetDailyStatusCmd; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -14,7 +14,7 @@ public interface DailyStatusMapper { * @param command 검색 조건 * @return 월별 입력 현황 */ - DailyMonthStatusDto getDailyStatusByMonth(DailyStatusCmd command); + DailyMonthStatusDto getDailyStatusByMonth(GetDailyStatusCmd command); /** * 항목별 월별 입력 현황 건 수 조회 @@ -22,7 +22,7 @@ public interface DailyStatusMapper { * @param command 검색 조건 * @return 항목별 월별 현황 건 수 */ - List getDailyStatusByItemCount(DailyStatusCmd command); + List getDailyStatusByItemCount(GetDailyStatusCmd command); /** * 항목별 월별 입력 현황 값(금액/시간) 조회 @@ -30,5 +30,5 @@ public interface DailyStatusMapper { * @param command 검색 조건 * @return 항목별 월별 현황 값(금액/시간) */ - List getDailyStatusByItemValue(DailyStatusCmd command); + List getDailyStatusByItemValue(GetDailyStatusCmd command); } diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java index 3eac1adb..e94b6691 100644 --- a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java @@ -2,7 +2,7 @@ package app.module.front.usecase.daily.status.adapters.web; import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.exception.NoMatchingURIException; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyMonthIncomeDto; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto; 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.status.adapters.web.model.DailyStatusUIReqVO; @@ -52,10 +52,8 @@ public class DailyStatusUIController { @GetMapping(path = "/{step}/{searchMonth}") public String detail(Model model, @PathVariable("step") String step, @PathVariable("searchMonth") String searchMonth) { if (DailySort.INCOME.name().equalsIgnoreCase(step)) { - List list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, "")); - model.addAttribute("step", DailySort.INCOME); - model.addAttribute("list", list); + model.addAttribute("list", dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""))); // } else if (DailySort.WORK.name().equalsIgnoreCase(step)) { // List list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, "")); // diff --git a/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusPortOut.java b/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusPortOut.java index e65bc9a6..a27889e3 100644 --- a/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusPortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusPortOut.java @@ -1,7 +1,7 @@ package app.module.front.usecase.daily.status.ports; import app.module.front.usecase.daily.status.adapters.persistence.model.DailyMonthStatusDto; -import app.module.front.usecase.daily.status.ports.application.domain.DailyStatusCmd; +import app.module.front.usecase.daily.status.ports.application.domain.GetDailyStatusCmd; public interface DailyStatusPortOut { /** @@ -10,5 +10,5 @@ public interface DailyStatusPortOut { * @param command 검색 조건 * @return 특정월의 일계부 입력 현황 */ - DailyMonthStatusDto operate(DailyStatusCmd command); + DailyMonthStatusDto operate(GetDailyStatusCmd command); } diff --git a/front/src/main/java/app/module/front/usecase/daily/status/ports/application/DailyStatusService.java b/front/src/main/java/app/module/front/usecase/daily/status/ports/application/DailyStatusService.java index 9ce63e11..0b15a1bb 100644 --- a/front/src/main/java/app/module/front/usecase/daily/status/ports/application/DailyStatusService.java +++ b/front/src/main/java/app/module/front/usecase/daily/status/ports/application/DailyStatusService.java @@ -4,7 +4,7 @@ import app.module.front.usecase.daily.status.adapters.persistence.model.DailyMon import app.module.front.usecase.daily.status.adapters.web.model.DailyStatusUIReqVO; import app.module.front.usecase.daily.status.ports.DailyStatusPortIn; import app.module.front.usecase.daily.status.ports.DailyStatusPortOut; -import app.module.front.usecase.daily.status.ports.application.domain.DailyStatusCmd; +import app.module.front.usecase.daily.status.ports.application.domain.GetDailyStatusCmd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -15,6 +15,6 @@ public class DailyStatusService implements DailyStatusPortIn { @Override public DailyMonthStatusDto operate(DailyStatusUIReqVO reqVO) { - return portOut.operate(new DailyStatusCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq())); + return portOut.operate(new GetDailyStatusCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq())); } } diff --git a/front/src/main/java/app/module/front/usecase/daily/status/ports/application/domain/DailyStatusCmd.java b/front/src/main/java/app/module/front/usecase/daily/status/ports/application/domain/GetDailyStatusCmd.java similarity index 91% rename from front/src/main/java/app/module/front/usecase/daily/status/ports/application/domain/DailyStatusCmd.java rename to front/src/main/java/app/module/front/usecase/daily/status/ports/application/domain/GetDailyStatusCmd.java index ed7301bf..c5a76404 100644 --- a/front/src/main/java/app/module/front/usecase/daily/status/ports/application/domain/DailyStatusCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/status/ports/application/domain/GetDailyStatusCmd.java @@ -7,7 +7,7 @@ import lombok.Setter; @Getter @Setter @AllArgsConstructor -public class DailyStatusCmd { +public class GetDailyStatusCmd { /** * 검색 월(yyyyMM) */ diff --git a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml index a8bf612a..d69e5e20 100644 --- a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml @@ -17,17 +17,17 @@ ds.id desc -