diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java index 3fa78bc7..03efb838 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java @@ -2,13 +2,15 @@ package app.module.front.usecase.daily.calendar.adapters.persistence; import app.module.core.config.application.enums.MonthStatus; import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto; -import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordStatusDto; +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.RecordCalendarCmd; import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; +import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -23,6 +25,7 @@ import java.util.Objects; @RequiredArgsConstructor public class RecordCalendarDao implements RecordCalendarPortOut { private final RecordCalendarMapper recordCalendarMapper; + private final DailyRecordMapper dailyRecordMapper; @Override public List operate(RecordCalendarCmd command) { @@ -176,7 +179,7 @@ public class RecordCalendarDao implements RecordCalendarPortOut { * @return */ private List getDailyRecordStatus(RecordCalendarCmd command) { - List statusList = recordCalendarMapper.getDailyRecordStatus(command); + List statusList = dailyRecordMapper.getDailyRecordStatus(new GetDailyRecordCmd(command.getSearchMonth(), null, command.getHouseholdSeq())); if (statusList == null || statusList.isEmpty()) { return Collections.emptyList(); } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java index ada0bad4..6565701f 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java @@ -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.calendar.adapters.persistence.model.DailyRecordStatusDto; +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.application.domain.RecordCalendarCmd; import org.apache.ibatis.annotations.Mapper; @@ -18,14 +18,6 @@ public interface RecordCalendarMapper { */ List getCalendarByDailyRecord(RecordCalendarCmd command); - /** - * 특정일의 일계부 등록 상태 조회 - * - * @param command 검색 조건 - * @return 일계부 등록 현황 목록 - */ - List getDailyRecordStatus(RecordCalendarCmd command); - /** * 특정월의 월별 작성 상태 조회 * diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java index 0bee9f0d..762fe3c0 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java @@ -1,7 +1,5 @@ package app.module.front.usecase.daily.calendar.ports; -import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordStatusDto; -import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java index d32bb193..d4af4217 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java @@ -1,7 +1,5 @@ package app.module.front.usecase.daily.calendar.ports; -import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto; -import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordStatusDto; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java index fe674319..3518eec3 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java @@ -1,6 +1,5 @@ package app.module.front.usecase.daily.calendar.ports.application; -import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordStatusDto; 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; @@ -9,12 +8,7 @@ import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCa import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.Date; import java.util.List; -import java.util.Locale; @Service @RequiredArgsConstructor diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java index ee269da6..8d4f0d18 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java @@ -2,7 +2,9 @@ package app.module.front.usecase.daily.record.adapters.persistence; import app.module.front.config.application.util.AuditUtil; 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.CreateDailyRecordReqVO; +import app.module.front.usecase.daily.record.adapters.web.model.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; @@ -13,7 +15,9 @@ import org.springframework.stereotype.Repository; import java.text.SimpleDateFormat; import java.time.LocalDate; +import java.util.Collections; import java.util.Date; +import java.util.List; import java.util.Locale; @Slf4j @@ -55,11 +59,12 @@ public class DailyRecordDao implements DailyRecordPortOut { log.debug("[CreateDailyRecord] record={}", command); } else { - // TODO : NONE 으로 변경시 연관 테이블 데이터 삭제할 것인가? dailyRecordMapper.updateDailyRecord(command); log.warn("[DailyRecordCreate] existCount={}, recordMonth={}, dayGroupNo={}", existCount, findCmd.getSearchMonth(), findCmd.getGroupNo()); } + + this.updateByAllStatus(findCmd); } @Override @@ -76,6 +81,22 @@ public class DailyRecordDao implements DailyRecordPortOut { dailyRecordMapper.updateDailyRecordStatus(command); - // TODO : target 업데이트 후 데이터 등록이 완료된 건은 allStatus 값 변경해주기 + this.updateByAllStatus(new GetDailyRecordCmd(recordMonth, dayGroupNo, command.getHouseholdSeq())); + } + + /** + * TODO : target 업데이트 후 데이터 등록이 완료된 건은 allStatus 값 변경해주기 + * @param findCmd + */ + private void updateByAllStatus(GetDailyRecordCmd findCmd) { + List statusList = dailyRecordMapper.getDailyRecordStatus(findCmd); + if (statusList != null && !statusList.isEmpty()) { + DailyRecordStatusDto statusDetail = statusList.get(0); + + if (DailyTargetStatus.TARGET.equals(statusDetail.getIncomeStatus()) && statusDetail.getIncomeCount() != 0) { + + } + } + } } diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordMapper.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordMapper.java index 92a374ed..a68178c8 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordMapper.java @@ -1,11 +1,15 @@ 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 { /** @@ -16,6 +20,14 @@ public interface DailyRecordMapper { */ DailyRecordDto getDailyRecord(GetDailyRecordCmd command); + /** + * 특정일의 일계부 등록 상태 조회 + * + * @param command 검색 조건 + * @return 일계부 등록 현황 목록 + */ + List getDailyRecordStatus(GetDailyRecordCmd command); + /** * 일계부 항목 등록 여부 * diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/DailyRecordStatusDto.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordStatusDto.java similarity index 95% rename from front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/DailyRecordStatusDto.java rename to front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordStatusDto.java index 1a40b835..615b9870 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/DailyRecordStatusDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordStatusDto.java @@ -1,4 +1,4 @@ -package app.module.front.usecase.daily.calendar.adapters.persistence.model; +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; diff --git a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml index 52a44817..6b15c57e 100644 --- a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml @@ -16,6 +16,29 @@ and ddg.group_no = #{groupNo} + + - -