From 595c8a5e729a257d264bc4e29f63a733c5c521b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Thu, 12 Jun 2025 16:23:46 +0900 Subject: [PATCH] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EC=88=98?= =?UTF-8?q?=EC=9E=85=20=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../income/persistence/DailyIncomeMapper.java | 31 +++++----- .../model/CreateDailyIncomeCmd.java | 3 - .../persistence/model/DailyIncomeDto.java | 8 ++- .../income/service/DailyIncomeService.java | 12 ++-- .../income/web/DailyIncomeController.java | 56 +++++++------------ .../income/web/DailyIncomeUIController.java | 16 +++--- .../validator/CreateDailyIncomeValidator.java | 5 +- .../templates/record/income/form.html | 6 +- 8 files changed, 57 insertions(+), 80 deletions(-) diff --git a/front/src/main/java/app/module/front/usecase/daily/income/persistence/DailyIncomeMapper.java b/front/src/main/java/app/module/front/usecase/daily/income/persistence/DailyIncomeMapper.java index 770431ac..a54a0de4 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/persistence/DailyIncomeMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/persistence/DailyIncomeMapper.java @@ -11,42 +11,39 @@ import java.util.List; @Mapper public interface DailyIncomeMapper { /** - * 수입내역 목록 조회 + * 일계부 수입 목록 조회 * - * @param reqVO - * @return + * @param reqVO 검색 조건 + * @return 수입 목록 */ List getDailyIncomeList(DailyIncomeUIReqVO reqVO); /** - * 수입내역 데이터 존재 여부 + * 일계부 수입 데이터 존재 여부 * - * @param reqVO - * @return + * @param reqVO 검색 조건 + * @return 중복 개수 */ Integer getRecordExistCount(DailyIncomeUIReqVO reqVO); /** - * 수입내역 등록 + * 일계부 수입 등록 * - * @param command - * @return + * @param command 등록 데이터 */ void createDailyIncome(CreateDailyIncomeCmd command); /** - * 수입내역 수정 + * 일계부 수입 수정 * - * @param command - * @return + * @param command 수정 데이터 */ - int updateDailyIncome(CreateDailyIncomeCmd command); + void updateDailyIncome(CreateDailyIncomeCmd command); /** - * 수입내역 삭제 + * 일계부 수입 삭제 * - * @param command - * @return + * @param command 삭제 데이터 */ - int removeDailyIncome(RemoveDailyIncomeCmd command); + void removeDailyIncome(RemoveDailyIncomeCmd command); } diff --git a/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/CreateDailyIncomeCmd.java b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/CreateDailyIncomeCmd.java index 472d0314..ecf95958 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/CreateDailyIncomeCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/CreateDailyIncomeCmd.java @@ -14,15 +14,12 @@ import lombok.ToString; public class CreateDailyIncomeCmd extends FrontAuditCommand { private Long id; private Long dailyRecordSeq; - // SELF, OCR private String inputType; private Boolean credit; private String cropCode; - // TODO : 수입종류의 코드맵핑 여부 판단 private String categoryCode; private String categorySelf; private String sourcePurpose; - // TODO : 데이터 타입 재정의 여부 private Integer quantity; private String unitCode; private Integer price; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java index c08050af..239a2814 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; public class DailyIncomeDto { private Long id; private Long dailyRecordSeq; - // SELF, OCR + // TODO : SELF, OCR private String inputType; private Boolean credit; private String cropCode; @@ -25,7 +25,11 @@ public class DailyIncomeDto { private Integer price; private Integer estimatedValue; + /** + * 수정 가능 여부 + * @return true=가능, false=불가능(등록 상태) + */ public boolean isUpdated() { - return this.id != null; + return this.id != null && this.id != 0L; } } diff --git a/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeService.java b/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeService.java index b9654739..5415034d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeService.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeService.java @@ -9,7 +9,7 @@ import java.util.List; public interface DailyIncomeService { /** - * 수입내역 목록 조회 + * 일계부 수입 목록 조회 * * @param reqVO 검색 조건 * @return @@ -17,7 +17,7 @@ public interface DailyIncomeService { List getDailyIncomeList(DailyIncomeUIReqVO reqVO); /** - * 수입내역 조회 + * 일계부 수입 조회 * * @param reqVO 검색 조건 * @return @@ -25,16 +25,16 @@ public interface DailyIncomeService { DailyIncomeDto getDailyIncome(DailyIncomeUIReqVO reqVO); /** - * 수입내역 등록 + * 일계부 수입 등록 * - * @param formVO 등록 데이터 + * @param formVO 입력 데이터 */ void create(CreateDailyIncomeReqVO formVO); /** - * 수입내역 삭제 + * 일계부 수입 삭제 * - * @param formVO 검색 조건 + * @param formVO 삭제 검색 조건 */ void remove(RemoveDailyIncomeReqVO formVO); } diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java index 28a75a9c..6fff3ed9 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java @@ -23,19 +23,19 @@ import org.springframework.web.bind.annotation.*; @RequiredArgsConstructor @RequestMapping(path = "/api/record/income") public class DailyIncomeController { + private final CoreUtil coreUtil; private final DailyRecordService dailyRecordService; private final DailyIncomeService dailyIncomeService; private final CreateDailyIncomeValidator createDailyIncomeValidator; - private final CoreUtil coreUtil; /** - * 일계부 수입내역 등록 처리 + * 일계부 수입 등록 처리 * - * @param searchMonth - * @param groupNo - * @param id - * @param formVO - * @param bindingResult + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param id 수입 일련번호 + * @param formVO 입력 데이터 + * @param bindingResult BindingResult * @return */ @PostMapping(path = "/{searchMonth}/{groupNo}/form/{id}") @@ -45,8 +45,6 @@ public class DailyIncomeController { createDailyIncomeValidator.validate(formVO, bindingResult); if (bindingResult.hasErrors()) { -// return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) -// .body(bindingResult.getFieldErrors()); return coreUtil.getErrorInfo(bindingResult); } @@ -63,43 +61,27 @@ public class DailyIncomeController { return ResponseEntity.status(HttpStatus.OK).body(formVO); } - @PostMapping(path = "/{searchMonth}/{groupNo}/none") - ResponseEntity updateByTodayNone(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) { - - DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); - - RemoveDailyIncomeReqVO formVO = new RemoveDailyIncomeReqVO(); - formVO.setSearchMonth(dailyRecord.getRecordMonth()); - formVO.setGroupNo(dailyRecord.getGroupNo()); - formVO.setDailyRecordSeq(dailyRecord.getId()); - log.debug("formVO: {}", formVO); - - dailyRecordService.updateDailyRecordStatus(dailyRecord.getRecordMonth(), dailyRecord.getGroupNo(), - "INCOME", DailyTargetStatus.TODAY_NONE.name()); - - return ResponseEntity.status(HttpStatus.OK).body(null); - } - /** - * 일계부 수입내역 삭제 처리 + * 일계부 수입 삭제 처리 * - * @param searchMonth - * @param groupNo - * @param formVO - * @param bindingResult + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param formVO 입력 데이터 + * @param bindingResult BindingResult * @return */ @PostMapping(path = "/{searchMonth}/{groupNo}/remove") ResponseEntity remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo , @Valid @RequestBody RemoveDailyIncomeReqVO formVO, BindingResult bindingResult) { - log.debug("formVO: {}", formVO); + log.debug("before formVO: {}", formVO); if (bindingResult.hasErrors()) { return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) .body(bindingResult.getFieldErrors()); } DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + formVO.setSearchMonth(dailyRecord.getRecordMonth()); formVO.setGroupNo(dailyRecord.getGroupNo()); formVO.setDailyRecordSeq(dailyRecord.getId()); @@ -111,10 +93,10 @@ public class DailyIncomeController { } /** - * 일계부 수입내역 전체 삭제 처리 + * 일계부 수입 전체 삭제 처리 * - * @param searchMonth - * @param groupNo + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 * @return */ @PostMapping(path = "/{searchMonth}/{groupNo}/reset") @@ -136,8 +118,8 @@ public class DailyIncomeController { /** * 일계부 유효성 체크 및 데이터 조회 * - * @param searchMonth - * @param groupNo + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 * @return */ private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeUIController.java b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeUIController.java index 474bdf30..0871c772 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeUIController.java @@ -27,7 +27,7 @@ public class DailyIncomeUIController { private final DailyIncomeService dailyIncomeService; /** - * 일계부 수입내역 목록 화면 + * 일계부 수입 목록 화면 * * @param model Model * @param searchMonth 검색 월(yyyyMM) @@ -52,12 +52,12 @@ public class DailyIncomeUIController { } /** - * 일계부 수입내역 등록 화면 + * 일계부 수입 등록 화면 * - * @param model - * @param searchMonth - * @param groupNo - * @param id + * @param model Model + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param id 수입 일련번호 * @return */ @GetMapping(path = "/{searchMonth}/{groupNo}/form/{id}") @@ -93,8 +93,8 @@ public class DailyIncomeUIController { /** * 일계부 유효성 체크 및 데이터 조회 * - * @param searchMonth - * @param groupNo + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 * @return */ private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java b/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java index 545ff485..7f632e69 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java @@ -13,7 +13,6 @@ import org.springframework.validation.Validator; @Component @RequiredArgsConstructor public class CreateDailyIncomeValidator implements Validator { - private final MessageUtil messageUtil; @Override public boolean supports(Class clazz) { @@ -27,7 +26,7 @@ public class CreateDailyIncomeValidator implements Validator { if (StringUtils.isBlank(vo.getCategoryCode())) { errors.rejectValue( "categoryCode", "valid.common.required", - "수입 종류를 입력해 주세요."); + "수입 종류를 선택해 주세요."); } if ("SELF".equals(vo.getCategoryCode()) && StringUtils.isBlank(vo.getCategorySelf())) { @@ -44,7 +43,5 @@ public class CreateDailyIncomeValidator implements Validator { "estimatedValue", "valid.common.required", "현금 또는 현물평가액을 입력 해주세요."); } - - // TODO : valid } } diff --git a/front/src/main/resources/templates/record/income/form.html b/front/src/main/resources/templates/record/income/form.html index c8dcd248..51b03176 100644 --- a/front/src/main/resources/templates/record/income/form.html +++ b/front/src/main/resources/templates/record/income/form.html @@ -114,13 +114,13 @@ -
+
- +