diff --git a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java index 9580986a..c109bfc0 100644 --- a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java +++ b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java @@ -46,16 +46,16 @@ class CreateAdminController { return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(bindingResult); } - String createdId = - saveAdminPortIn.connect( - reqVO.getSeq(), - reqVO.getId(), - reqVO.getPassword(), - reqVO.getEmail(), - reqVO.getRegionMainCode(), - reqVO.getAccountDisabled(), - reqVO.getAccountLocked(), - reqVO.getRoleIds()); + String createdId = null; +// saveAdminPortIn.connect( +// reqVO.getSeq(), +// reqVO.getId(), +// reqVO.getPassword(), +// reqVO.getEmail(), +// reqVO.getRegionMainCode(), +// reqVO.getAccountDisabled(), +// reqVO.getAccountLocked(), +// reqVO.getRoleIds()); return ResponseEntity.status(HttpStatus.OK).body(new CreateAdminResVO(createdId)); } diff --git a/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java b/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java index 704663a8..c3dad790 100644 --- a/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java +++ b/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java @@ -52,16 +52,18 @@ class UpdateAdminController { return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(bindingResult); } - String updatedId = - saveAdminPortIn.connect( - reqVO.getSeq(), - reqVO.getId(), - reqVO.getUpdatePassword(), - reqVO.getEmail(), - reqVO.getRegionMainCode(), - reqVO.getAccountDisabled(), - reqVO.getAccountLocked(), - reqVO.getRoleIds()); + String updatedId = null; + +// String updatedId = +// saveAdminPortIn.connect( +// reqVO.getSeq(), +// reqVO.getId(), +// reqVO.getUpdatePassword(), +// reqVO.getEmail(), +// reqVO.getRegionMainCode(), +// reqVO.getAccountDisabled(), +// reqVO.getAccountLocked(), +// reqVO.getRoleIds()); return ResponseEntity.status(HttpStatus.OK).body(new UpdateAdminResVO(updatedId)); } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarServiceImpl.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java similarity index 50% rename from front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarServiceImpl.java rename to front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java index 22522920..496848dc 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarServiceImpl.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java @@ -1,37 +1,35 @@ -package app.module.front.usecase.daily.calendar.service; +package app.module.front.usecase.daily.calendar.adapters.persistence; -import app.module.front.usecase.daily.calendar.persistence.RecordCalendarMapper; -import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordCalendarDto; -import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto; -import app.module.front.usecase.daily.calendar.web.model.RecordCalendarChildrenVO; -import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO; -import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIResVO; -import app.module.front.usecase.daily.record.persistence.DailyRecordMapper; +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.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.web.model.DailyTargetStatus; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Repository; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; -@Service +@Repository @RequiredArgsConstructor -public class RecordCalendarServiceImpl implements RecordCalendarService { +public class RecordCalendarDao implements RecordCalendarPortOut { private final RecordCalendarMapper recordCalendarMapper; @Override - public List getCalendarByDailyRecord(RecordCalendarUIReqVO reqVO) { - List calendarList = this.getCalendarList(reqVO); - List statusList = this.getDailyRecordStatus(reqVO); + public List operate(RecordCalendarCmd command) { + List calendarList = this.getCalendarList(command); + List statusList = this.getDailyRecordStatus(command); String pathFormat = "/record/%s/%s/%s"; - List refineList = new ArrayList<>(); + List refineList = new ArrayList<>(); for (DailyRecordCalendarDto calendar : calendarList) { - RecordCalendarUIResVO refine = new RecordCalendarUIResVO(); + RecordCalendar refine = new RecordCalendar(); refine.setNo(calendar.getGroupNo()); refine.setStart(calendar.getStartDay()); refine.setEnd(calendar.getEndDay()); @@ -43,51 +41,64 @@ public class RecordCalendarServiceImpl implements RecordCalendarService { if (findStatus == null) { refine.setChildren(new ArrayList<>()); } else { - List childList = new ArrayList<>(); + List childList = new ArrayList<>(); if (DailyTargetStatus.TARGET.equals(findStatus.getIncomeStatus())) { - childList.add(new RecordCalendarChildrenVO( + childList.add(new CalendarChildren( "INCOME", "수입", findStatus.getIncomeCount(), - String.format(pathFormat, "income", reqVO.getSearchMonth(), findStatus.getDayGroupNo()))); + String.format(pathFormat, "income", command.getSearchMonth(), findStatus.getDayGroupNo()))); } if (DailyTargetStatus.TARGET.equals(findStatus.getWorkStatus())) { - childList.add(new RecordCalendarChildrenVO( + childList.add(new CalendarChildren( "WORK", "임업노동 투입 내역", findStatus.getWorkCount(), - String.format(pathFormat, "work", reqVO.getSearchMonth(), findStatus.getDayGroupNo()))); + String.format(pathFormat, "work", command.getSearchMonth(), findStatus.getDayGroupNo()))); } if (DailyTargetStatus.TARGET.equals(findStatus.getExpenseStatus())) { - childList.add(new RecordCalendarChildrenVO( + childList.add(new CalendarChildren( "EXPENSE", "지출", findStatus.getExpenseCount(), - String.format(pathFormat, "expense", reqVO.getSearchMonth(), findStatus.getDayGroupNo()))); + String.format(pathFormat, "expense", command.getSearchMonth(), findStatus.getDayGroupNo()))); } if (DailyTargetStatus.TARGET.equals(findStatus.getPowerStatus())) { - childList.add(new RecordCalendarChildrenVO( + childList.add(new CalendarChildren( "POWER", "동력 사용시간", findStatus.getPowerCount(), - String.format(pathFormat, "power", reqVO.getSearchMonth(), findStatus.getDayGroupNo()))); + String.format(pathFormat, "power", command.getSearchMonth(), findStatus.getDayGroupNo()))); } if (DailyTargetStatus.TARGET.equals(findStatus.getForestryStatus())) { - childList.add(new RecordCalendarChildrenVO( + childList.add(new CalendarChildren( "FORESTRY", "자가임업 생산물 중 자가소비량", findStatus.getForestryCount(), - String.format(pathFormat, "forestry", reqVO.getSearchMonth(), findStatus.getDayGroupNo()))); + String.format(pathFormat, "forestry", command.getSearchMonth(), findStatus.getDayGroupNo()))); } if (DailyTargetStatus.TARGET.equals(findStatus.getFarmingStatus())) { - childList.add(new RecordCalendarChildrenVO( + childList.add(new CalendarChildren( "FARMING", "자가농업 생산물 중 자가소비량", findStatus.getFarmingCount(), - String.format(pathFormat, "farming", reqVO.getSearchMonth(), findStatus.getDayGroupNo()))); + String.format(pathFormat, "farming", command.getSearchMonth(), findStatus.getDayGroupNo()))); } + // TODO /info/monthly + childList.add(new CalendarChildren( + "MONTHLY", + "임산물 현황 등록", + 0, + String.format("/info/monthly/month/%s", command.getSearchMonth()))); + + childList.add(new CalendarChildren( + "BANK", + "은행 자동이체 내역 등록", + 0, + "/info/bank")); + refine.setChildren(childList); } @@ -100,22 +111,20 @@ public class RecordCalendarServiceImpl implements RecordCalendarService { /** * 특정월의 일 그룹 조회 * - * @param reqVO + * @param command * @return */ - private List getCalendarList(RecordCalendarUIReqVO reqVO) { - int lastDay = reqVO.getSearchDate().withDayOfMonth(reqVO.getSearchDate().lengthOfMonth()).getDayOfMonth(); - - List calendarList = recordCalendarMapper.getCalendarByDailyRecord(reqVO); + private List getCalendarList(RecordCalendarCmd command) { + List calendarList = recordCalendarMapper.getCalendarByDailyRecord(command); List refineList = new ArrayList<>(); for (DailyRecordCalendarDto record : calendarList) { - record.setStartDate(reqVO.getSearchMonth() + String.format("%02d", record.getStartDay())); + record.setStartDate(command.getSearchMonth() + String.format("%02d", record.getStartDay())); - if ((lastDay == 28 || lastDay == 30) && record.getStartDay() == lastDay) { - record.setEndDay(lastDay); + if ((command.getLastDay() == 28 || command.getLastDay() == 30) && record.getStartDay() == command.getLastDay()) { + record.setEndDay(command.getLastDay()); refineList.add(record); - } else if (record.getStartDay() <= lastDay && record.getEndDay() <= lastDay) { + } else if (record.getStartDay() <= command.getLastDay() && record.getEndDay() <= command.getLastDay()) { refineList.add(record); } } @@ -126,11 +135,11 @@ public class RecordCalendarServiceImpl implements RecordCalendarService { /** * 특정월의 일계부 등록 상태 조회 * - * @param reqVO + * @param command * @return */ - private List getDailyRecordStatus(RecordCalendarUIReqVO reqVO) { - List statusList = recordCalendarMapper.getDailyRecordStatus(reqVO); + private List getDailyRecordStatus(RecordCalendarCmd command) { + List statusList = recordCalendarMapper.getDailyRecordStatus(command); 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 new file mode 100644 index 00000000..247bc3d7 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java @@ -0,0 +1,27 @@ +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.calendar.ports.application.domain.RecordCalendarCmd; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface RecordCalendarMapper { + /** + * 특정월의 일 그룹 조회 + * + * @param cmd 검색 조건 + * @return 일(DAY) 그룹 목록 + */ + List getCalendarByDailyRecord(RecordCalendarCmd cmd); + + /** + * 특정일의 일계부 등록 상태 조회 + * + * @param cmd 검색 조건 + * @return 일계부 등록 현황 목록 + */ + List getDailyRecordStatus(RecordCalendarCmd cmd); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/DailyRecordCalendarDto.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/DailyRecordCalendarDto.java new file mode 100644 index 00000000..0e48d7e8 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/DailyRecordCalendarDto.java @@ -0,0 +1,29 @@ +package app.module.front.usecase.daily.calendar.adapters.persistence.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyRecordCalendarDto { + /** + * 일 그룹 번호 + */ + private Integer groupNo; + /** + * 시작일 + */ + private Integer startDay; + /** + * 종료일 + */ + private Integer endDay; + /** + * 시작일(yyyy-MM-dd) + */ + private String startDate; + /** + * 일계부 항목 일련번호 + */ + private Long dailyId; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordStatusDto.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/DailyRecordStatusDto.java similarity index 93% rename from front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordStatusDto.java rename to front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/DailyRecordStatusDto.java index 8ba3c703..d828af9d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordStatusDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/DailyRecordStatusDto.java @@ -1,8 +1,7 @@ -package app.module.front.usecase.daily.calendar.persistence.model; +package app.module.front.usecase.daily.calendar.adapters.persistence.model; import app.module.front.usecase.daily.record.web.model.DailyStatus; import app.module.front.usecase.daily.record.web.model.DailyTargetStatus; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.ToString; diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java new file mode 100644 index 00000000..2473a3cd --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java @@ -0,0 +1,38 @@ +package app.module.front.usecase.daily.calendar.adapters.web; + +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.application.domain.RecordCalendar; +import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +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 +@RequestMapping(path = "/api/record/calendar") +public class RecordCalendarController { + private final RecordCalendarPortIn recordCalendarPortIn; + + @GetMapping(path = "/{searchMonth}") + public ResponseEntity list(@PathVariable("searchMonth") String searchMonth) { + RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(searchMonth); + log.debug("reqVO: {}", reqVO); + + List calendarList = recordCalendarPortIn.operate(new RecordCalendarCmd( + reqVO.getSearchMonth(), + reqVO.getHouseholdSeq(), + reqVO.getSearchDate().withDayOfMonth(reqVO.getSearchDate().lengthOfMonth()).getDayOfMonth() + )); + + return ResponseEntity.status(HttpStatus.OK).body(calendarList); + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java new file mode 100644 index 00000000..23476ab4 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java @@ -0,0 +1,28 @@ +package app.module.front.usecase.daily.calendar.adapters.web; + +import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Slf4j +@Controller +@RequiredArgsConstructor +@RequestMapping(path = "/record/calendar") +public class RecordCalendarUIController { + + @GetMapping(path = "") + public String index(Model model) { + RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(); + log.debug("reqVO: {}", reqVO); + + model.addAttribute("reqVO", reqVO); + + // TODO : 현재 날짜로부터 3일 이전 날짜에 등록하지 않은 날이 있을 경우 + + return "record/calendar"; + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java new file mode 100644 index 00000000..976b1250 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java @@ -0,0 +1,48 @@ +package app.module.front.usecase.daily.calendar.adapters.web.model; + +import app.module.front.usecase.daily.record.web.model.DailyUIReqVO; +import lombok.Data; +import lombok.ToString; +import org.apache.tika.utils.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +@Data +@ToString +public class RecordCalendarUIReqVO extends DailyUIReqVO { + private static final Logger LOGGER = LoggerFactory.getLogger(RecordCalendarUIReqVO.class); + + public RecordCalendarUIReqVO() { + setSearchMonth(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))); + } + + public RecordCalendarUIReqVO(String searchMonth) { + setSearchMonth(searchMonth); + } + + /** + * 검색 일(yyyy-MM-dd) + */ + private LocalDate searchDate; + + public void setSearchMonth(String searchMonth) { + if (!StringUtils.isBlank(searchMonth) && searchMonth.length() == 7) { + searchMonth = searchMonth + "-01"; + } else { + searchMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM")); + } + + try { + LocalDate formatDate = LocalDate.parse(searchMonth); + + setSearchDate(formatDate); + super.setSearchMonth(formatDate.format(DateTimeFormatter.ofPattern("yyyyMM"))); + + } catch (Exception e) { + LOGGER.warn("[DateParse] target={}", searchMonth, e); + } + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/RecordCalendarMapper.java b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/RecordCalendarMapper.java deleted file mode 100644 index 8f12fa66..00000000 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/RecordCalendarMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package app.module.front.usecase.daily.calendar.persistence; - -import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordCalendarDto; -import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto; -import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO; -import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO; -import app.module.front.usecase.daily.record.persistence.model.UpdateDailyRecordStatusCmd; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface RecordCalendarMapper { - - /** - * 특정월의 일 그룹 목록 조회 - * - * @param reqVO 검색 조건 - * @return 특정월의 그룹 목록 - */ - List getCalendarByDailyRecord(RecordCalendarUIReqVO reqVO); - - /** - * 특정일의 일계부 등록 상태 조회 - * - * @param reqVO 검색 조건 - * @return 일계부 등록 현황 목록 - */ - List getDailyRecordStatus(RecordCalendarUIReqVO reqVO); -} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordCalendarDto.java b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordCalendarDto.java deleted file mode 100644 index 82ae33c0..00000000 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordCalendarDto.java +++ /dev/null @@ -1,14 +0,0 @@ -package app.module.front.usecase.daily.calendar.persistence.model; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class DailyRecordCalendarDto { - private Integer groupNo; - private Integer startDay; - private Integer endDay; - private String startDate; - private Long dailyId; -} 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 new file mode 100644 index 00000000..c915e1db --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java @@ -0,0 +1,10 @@ +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 java.util.List; + +public interface RecordCalendarPortIn { + List operate(RecordCalendarCmd command); +} 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 new file mode 100644 index 00000000..d5b9064f --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java @@ -0,0 +1,12 @@ +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; + +import java.util.List; + +public interface RecordCalendarPortOut { + List operate(RecordCalendarCmd command); +} 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 new file mode 100644 index 00000000..65993aff --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java @@ -0,0 +1,21 @@ +package app.module.front.usecase.daily.calendar.ports.application; + +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.RecordCalendar; +import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class RecordCalendarService implements RecordCalendarPortIn { + private final RecordCalendarPortOut portOut; + + @Override + public List operate(RecordCalendarCmd command) { + return portOut.operate(command); + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/CalendarChildren.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/CalendarChildren.java new file mode 100644 index 00000000..e08f58dd --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/CalendarChildren.java @@ -0,0 +1,13 @@ +package app.module.front.usecase.daily.calendar.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class CalendarChildren { + private String code; + private String codeLabel; + private Integer total; + private String path; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIResVO.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendar.java similarity index 51% rename from front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIResVO.java rename to front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendar.java index ce2fe7d2..0f961128 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIResVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendar.java @@ -1,6 +1,5 @@ -package app.module.front.usecase.daily.calendar.web.model; +package app.module.front.usecase.daily.calendar.ports.application.domain; -import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto; import lombok.Data; import lombok.ToString; import org.slf4j.Logger; @@ -10,10 +9,10 @@ import java.util.List; @Data @ToString -public class RecordCalendarUIResVO { - private static final Logger LOGGER = LoggerFactory.getLogger(RecordCalendarUIResVO.class); +public class RecordCalendar { + private static final Logger LOGGER = LoggerFactory.getLogger(RecordCalendar.class); private Integer no; private Integer start; private Integer end; - private List children; + private List children; } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendarCmd.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendarCmd.java new file mode 100644 index 00000000..4ce8db66 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendarCmd.java @@ -0,0 +1,32 @@ +package app.module.front.usecase.daily.calendar.ports.application.domain; + +import app.module.front.usecase.daily.record.web.model.DailyCmd; +import app.module.front.usecase.daily.record.web.model.DailyUIReqVO; +import lombok.*; +import org.apache.tika.utils.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Date; +import java.util.Locale; + +@Getter +@Setter +@AllArgsConstructor +public class RecordCalendarCmd { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 임가 일련번호 + */ + private Long householdSeq; + /** + * 특정월의 마지막 일 + */ + private int lastDay; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarService.java b/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarService.java deleted file mode 100644 index ad3ca5bf..00000000 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarService.java +++ /dev/null @@ -1,16 +0,0 @@ -package app.module.front.usecase.daily.calendar.service; - -import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO; -import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIResVO; - -import java.util.List; - -public interface RecordCalendarService { - /** - * 특정월의 일계부 현황 조회 - * - * @param reqVO 검색 조건 - * @return 월별 일계부 목록 - */ - List getCalendarByDailyRecord(RecordCalendarUIReqVO reqVO); -} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/web/RecordCalendarController.java b/front/src/main/java/app/module/front/usecase/daily/calendar/web/RecordCalendarController.java deleted file mode 100644 index 6f757473..00000000 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/web/RecordCalendarController.java +++ /dev/null @@ -1,39 +0,0 @@ -package app.module.front.usecase.daily.calendar.web; - -import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordCalendarDto; -import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto; -import app.module.front.usecase.daily.calendar.service.RecordCalendarService; -import app.module.front.usecase.daily.calendar.web.model.RecordCalendarChildrenVO; -import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO; -import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIResVO; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; - -import java.time.LocalDate; -import java.time.YearMonth; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Controller -@RequiredArgsConstructor -@RequestMapping(path = "/record/calendar") -public class RecordCalendarController { - private final RecordCalendarService recordCalendarService; - - @GetMapping(path = "") - public String index(Model model, @RequestParam(value = "searchDay", required = false) String searchDay) { - RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(searchDay); - log.debug("reqVO: {}", reqVO); - - model.addAttribute("reqVO", reqVO); - model.addAttribute("calendarList", recordCalendarService.getCalendarByDailyRecord(reqVO)); - - return "record/calendar"; - } -} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarChildrenVO.java b/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarChildrenVO.java deleted file mode 100644 index 8bdaa194..00000000 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarChildrenVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.front.usecase.daily.calendar.web.model; - -import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.ToString; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; - -@Data -@AllArgsConstructor -public class RecordCalendarChildrenVO { - private String code; - private String codeLabel; - private Integer total; - private String path; -} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIReqVO.java deleted file mode 100644 index 7892778f..00000000 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIReqVO.java +++ /dev/null @@ -1,56 +0,0 @@ -package app.module.front.usecase.daily.calendar.web.model; - -import app.module.front.usecase.daily.record.web.model.DailyUIReqVO; -import lombok.Data; -import lombok.ToString; -import org.apache.tika.utils.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.Date; -import java.util.Locale; - -@Data -@ToString -public class RecordCalendarUIReqVO extends DailyUIReqVO { - private static final Logger LOGGER = LoggerFactory.getLogger(RecordCalendarUIReqVO.class); - - public RecordCalendarUIReqVO() { - } - - public RecordCalendarUIReqVO(String searchDay) { - if (StringUtils.isBlank(searchDay) || searchDay.length() != 8) { - searchDay = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")); - } - - try { - SimpleDateFormat beforeSdf = new SimpleDateFormat("yyyyMMdd", Locale.KOREAN); - SimpleDateFormat afterSdf = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN); - SimpleDateFormat monthSdf = new SimpleDateFormat("yyyyMM", Locale.KOREAN); - - Date formatDate = beforeSdf.parse(searchDay); - - setSearchDate(LocalDate.parse(afterSdf.format(formatDate))); - setSearchMonth(monthSdf.format(formatDate)); - setSearchDay(beforeSdf.format(formatDate)); - - } catch (Exception e) { - LOGGER.warn("[DateParse] target={}", searchDay, e); - } - } - - /** - * 검색 일(yyyyMMdd) - */ - private String searchDay; - - - /** - * 검색 일(yyyy-MM-dd) - */ - private LocalDate searchDate; - -} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java b/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java index 722875fc..722ce3e2 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java @@ -1,7 +1,6 @@ package app.module.front.usecase.daily.record.web; import app.module.core.config.application.exception.NoMatchingURIException; -import app.module.front.usecase.daily.calendar.service.RecordCalendarService; import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.service.DailyRecordService; import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO; @@ -23,7 +22,6 @@ import org.springframework.web.bind.annotation.*; @RequiredArgsConstructor @RequestMapping(path = "/api/record/daily") public class DailyRecordController { - private final RecordCalendarService recordCalendarService; private final DailyRecordService dailyRecordService; private final CreateDailyRecordValidator createDailyRecordValidator; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordUIController.java b/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordUIController.java index 0dc289c7..03bcb8e8 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordUIController.java @@ -1,7 +1,6 @@ package app.module.front.usecase.daily.record.web; import app.module.core.config.application.exception.NoMatchingURIException; -import app.module.front.usecase.daily.calendar.service.RecordCalendarService; import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.service.DailyRecordService; import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO; @@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.*; @RequiredArgsConstructor @RequestMapping(path = "/record/daily") public class DailyRecordUIController { - private final RecordCalendarService recordCalendarService; private final DailyRecordService dailyRecordService; private final CreateDailyRecordValidator createDailyRecordValidator; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyCmd.java b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyCmd.java new file mode 100644 index 00000000..d70a490b --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyCmd.java @@ -0,0 +1,22 @@ +package app.module.front.usecase.daily.record.web.model; + +import app.module.front.config.application.util.AuthUtil; +import lombok.Data; +import lombok.ToString; + +@Data +@ToString +public class DailyCmd { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; +} diff --git a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml index 10216e64..96fdab6d 100644 --- a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml +++ b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml @@ -1,9 +1,9 @@ - + diff --git a/front/src/main/resources/templates/record/calendar-wrap.html b/front/src/main/resources/templates/record/calendar-wrap.html deleted file mode 100644 index c981edb8..00000000 --- a/front/src/main/resources/templates/record/calendar-wrap.html +++ /dev/null @@ -1,33 +0,0 @@ - - - -
-
- reqVO: [[${reqVO}]] -
-
- - [[${#temporals.format(detail.startDate, 'yyyy년 MM월 dd일')}]] ~ [[${#temporals.format(detail.endDate, 'yyyy년 MM월 dd일')}]]
- - 수입 : [[${detail.incomeStatus}]], [[${detail.incomeCount}]] - 수정 -
- -

- detail: [[${detail}]] -
- - - - [[${#temporals.format(searchDate, 'yyyy년 MM월 dd일')}]] - -
- - -
-
- -
- - \ No newline at end of file diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index d8502891..c78dfa4e 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -3,36 +3,6 @@ xmlns:th="http://www.thymeleaf.org" lang="ko">
- -
- reqVO: [[${reqVO}]] -
-
- - - - No=[[${calendar.no}]], Start=[[${calendar.start}]], End=[[${calendar.end}]], children=[[${calendar.children}]]
- - - >> Text=[[${children.codeLabel}]], Path=[[${children.path}]], Count=[[${children.total}]]
-
-
-
-
- - - No=[[${calendar.no}]], Start=[[${calendar.start}]], End=[[${calendar.end}]]
-
-
-
-
- -
- -
- -
-
@@ -514,6 +432,7 @@
+ + + + + +
\ No newline at end of file