[FO] 일계부 수입 코드 정리

This commit is contained in:
김현주
2025-06-12 16:23:46 +09:00
parent e46c56adaa
commit 595c8a5e72
8 changed files with 57 additions and 80 deletions

View File

@@ -11,42 +11,39 @@ import java.util.List;
@Mapper @Mapper
public interface DailyIncomeMapper { public interface DailyIncomeMapper {
/** /**
* 수입내역 목록 조회 * 일계부 수입 목록 조회
* *
* @param reqVO * @param reqVO 검색 조건
* @return * @return 수입 목록
*/ */
List<DailyIncomeDto> getDailyIncomeList(DailyIncomeUIReqVO reqVO); List<DailyIncomeDto> getDailyIncomeList(DailyIncomeUIReqVO reqVO);
/** /**
* 수입내역 데이터 존재 여부 * 일계부 수입 데이터 존재 여부
* *
* @param reqVO * @param reqVO 검색 조건
* @return * @return 중복 개수
*/ */
Integer getRecordExistCount(DailyIncomeUIReqVO reqVO); Integer getRecordExistCount(DailyIncomeUIReqVO reqVO);
/** /**
* 수입내역 등록 * 일계부 수입 등록
* *
* @param command * @param command 등록 데이터
* @return
*/ */
void createDailyIncome(CreateDailyIncomeCmd command); void createDailyIncome(CreateDailyIncomeCmd command);
/** /**
* 수입내역 수정 * 일계부 수입 수정
* *
* @param command * @param command 수정 데이터
* @return
*/ */
int updateDailyIncome(CreateDailyIncomeCmd command); void updateDailyIncome(CreateDailyIncomeCmd command);
/** /**
* 수입내역 삭제 * 일계부 수입 삭제
* *
* @param command * @param command 삭제 데이터
* @return
*/ */
int removeDailyIncome(RemoveDailyIncomeCmd command); void removeDailyIncome(RemoveDailyIncomeCmd command);
} }

View File

@@ -14,15 +14,12 @@ import lombok.ToString;
public class CreateDailyIncomeCmd extends FrontAuditCommand { public class CreateDailyIncomeCmd extends FrontAuditCommand {
private Long id; private Long id;
private Long dailyRecordSeq; private Long dailyRecordSeq;
// SELF, OCR
private String inputType; private String inputType;
private Boolean credit; private Boolean credit;
private String cropCode; private String cropCode;
// TODO : 수입종류의 코드맵핑 여부 판단
private String categoryCode; private String categoryCode;
private String categorySelf; private String categorySelf;
private String sourcePurpose; private String sourcePurpose;
// TODO : 데이터 타입 재정의 여부
private Integer quantity; private Integer quantity;
private String unitCode; private String unitCode;
private Integer price; private Integer price;

View File

@@ -10,7 +10,7 @@ import java.time.LocalDateTime;
public class DailyIncomeDto { public class DailyIncomeDto {
private Long id; private Long id;
private Long dailyRecordSeq; private Long dailyRecordSeq;
// SELF, OCR // TODO : SELF, OCR
private String inputType; private String inputType;
private Boolean credit; private Boolean credit;
private String cropCode; private String cropCode;
@@ -25,7 +25,11 @@ public class DailyIncomeDto {
private Integer price; private Integer price;
private Integer estimatedValue; private Integer estimatedValue;
/**
* 수정 가능 여부
* @return true=가능, false=불가능(등록 상태)
*/
public boolean isUpdated() { public boolean isUpdated() {
return this.id != null; return this.id != null && this.id != 0L;
} }
} }

View File

@@ -9,7 +9,7 @@ import java.util.List;
public interface DailyIncomeService { public interface DailyIncomeService {
/** /**
* 수입내역 목록 조회 * 일계부 수입 목록 조회
* *
* @param reqVO 검색 조건 * @param reqVO 검색 조건
* @return * @return
@@ -17,7 +17,7 @@ public interface DailyIncomeService {
List<DailyIncomeDto> getDailyIncomeList(DailyIncomeUIReqVO reqVO); List<DailyIncomeDto> getDailyIncomeList(DailyIncomeUIReqVO reqVO);
/** /**
* 수입내역 조회 * 일계부 수입 조회
* *
* @param reqVO 검색 조건 * @param reqVO 검색 조건
* @return * @return
@@ -25,16 +25,16 @@ public interface DailyIncomeService {
DailyIncomeDto getDailyIncome(DailyIncomeUIReqVO reqVO); DailyIncomeDto getDailyIncome(DailyIncomeUIReqVO reqVO);
/** /**
* 수입내역 등록 * 일계부 수입 등록
* *
* @param formVO 등록 데이터 * @param formVO 입력 데이터
*/ */
void create(CreateDailyIncomeReqVO formVO); void create(CreateDailyIncomeReqVO formVO);
/** /**
* 수입내역 삭제 * 일계부 수입 삭제
* *
* @param formVO 검색 조건 * @param formVO 삭제 검색 조건
*/ */
void remove(RemoveDailyIncomeReqVO formVO); void remove(RemoveDailyIncomeReqVO formVO);
} }

View File

@@ -23,19 +23,19 @@ import org.springframework.web.bind.annotation.*;
@RequiredArgsConstructor @RequiredArgsConstructor
@RequestMapping(path = "/api/record/income") @RequestMapping(path = "/api/record/income")
public class DailyIncomeController { public class DailyIncomeController {
private final CoreUtil coreUtil;
private final DailyRecordService dailyRecordService; private final DailyRecordService dailyRecordService;
private final DailyIncomeService dailyIncomeService; private final DailyIncomeService dailyIncomeService;
private final CreateDailyIncomeValidator createDailyIncomeValidator; private final CreateDailyIncomeValidator createDailyIncomeValidator;
private final CoreUtil coreUtil;
/** /**
* 일계부 수입내역 등록 처리 * 일계부 수입 등록 처리
* *
* @param searchMonth * @param searchMonth 검색 월(yyyyMM)
* @param groupNo * @param groupNo 검색 그룹
* @param id * @param id 수입 일련번호
* @param formVO * @param formVO 입력 데이터
* @param bindingResult * @param bindingResult BindingResult
* @return * @return
*/ */
@PostMapping(path = "/{searchMonth}/{groupNo}/form/{id}") @PostMapping(path = "/{searchMonth}/{groupNo}/form/{id}")
@@ -45,8 +45,6 @@ public class DailyIncomeController {
createDailyIncomeValidator.validate(formVO, bindingResult); createDailyIncomeValidator.validate(formVO, bindingResult);
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
// return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
// .body(bindingResult.getFieldErrors());
return coreUtil.getErrorInfo(bindingResult); return coreUtil.getErrorInfo(bindingResult);
} }
@@ -63,43 +61,27 @@ public class DailyIncomeController {
return ResponseEntity.status(HttpStatus.OK).body(formVO); 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 searchMonth 검색 월(yyyyMM)
* @param groupNo * @param groupNo 검색 그룹
* @param formVO * @param formVO 입력 데이터
* @param bindingResult * @param bindingResult BindingResult
* @return * @return
*/ */
@PostMapping(path = "/{searchMonth}/{groupNo}/remove") @PostMapping(path = "/{searchMonth}/{groupNo}/remove")
ResponseEntity<?> remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo ResponseEntity<?> remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
, @Valid @RequestBody RemoveDailyIncomeReqVO formVO, BindingResult bindingResult) { , @Valid @RequestBody RemoveDailyIncomeReqVO formVO, BindingResult bindingResult) {
log.debug("formVO: {}", formVO); log.debug("before formVO: {}", formVO);
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors()); .body(bindingResult.getFieldErrors());
} }
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo);
formVO.setSearchMonth(dailyRecord.getRecordMonth()); formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo()); formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyRecordSeq(dailyRecord.getId()); formVO.setDailyRecordSeq(dailyRecord.getId());
@@ -111,10 +93,10 @@ public class DailyIncomeController {
} }
/** /**
* 일계부 수입내역 전체 삭제 처리 * 일계부 수입 전체 삭제 처리
* *
* @param searchMonth * @param searchMonth 검색 월(yyyyMM)
* @param groupNo * @param groupNo 검색 그룹
* @return * @return
*/ */
@PostMapping(path = "/{searchMonth}/{groupNo}/reset") @PostMapping(path = "/{searchMonth}/{groupNo}/reset")
@@ -136,8 +118,8 @@ public class DailyIncomeController {
/** /**
* 일계부 유효성 체크 및 데이터 조회 * 일계부 유효성 체크 및 데이터 조회
* *
* @param searchMonth * @param searchMonth 검색 월(yyyyMM)
* @param groupNo * @param groupNo 검색 그룹
* @return * @return
*/ */
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {

View File

@@ -27,7 +27,7 @@ public class DailyIncomeUIController {
private final DailyIncomeService dailyIncomeService; private final DailyIncomeService dailyIncomeService;
/** /**
* 일계부 수입내역 목록 화면 * 일계부 수입 목록 화면
* *
* @param model Model * @param model Model
* @param searchMonth 검색 월(yyyyMM) * @param searchMonth 검색 월(yyyyMM)
@@ -52,12 +52,12 @@ public class DailyIncomeUIController {
} }
/** /**
* 일계부 수입내역 등록 화면 * 일계부 수입 등록 화면
* *
* @param model * @param model Model
* @param searchMonth * @param searchMonth 검색 월(yyyyMM)
* @param groupNo * @param groupNo 검색 그룹
* @param id * @param id 수입 일련번호
* @return * @return
*/ */
@GetMapping(path = "/{searchMonth}/{groupNo}/form/{id}") @GetMapping(path = "/{searchMonth}/{groupNo}/form/{id}")
@@ -93,8 +93,8 @@ public class DailyIncomeUIController {
/** /**
* 일계부 유효성 체크 및 데이터 조회 * 일계부 유효성 체크 및 데이터 조회
* *
* @param searchMonth * @param searchMonth 검색 월(yyyyMM)
* @param groupNo * @param groupNo 검색 그룹
* @return * @return
*/ */
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {

View File

@@ -13,7 +13,6 @@ import org.springframework.validation.Validator;
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor
public class CreateDailyIncomeValidator implements Validator { public class CreateDailyIncomeValidator implements Validator {
private final MessageUtil messageUtil;
@Override @Override
public boolean supports(Class<?> clazz) { public boolean supports(Class<?> clazz) {
@@ -27,7 +26,7 @@ public class CreateDailyIncomeValidator implements Validator {
if (StringUtils.isBlank(vo.getCategoryCode())) { if (StringUtils.isBlank(vo.getCategoryCode())) {
errors.rejectValue( errors.rejectValue(
"categoryCode", "valid.common.required", "categoryCode", "valid.common.required",
"수입 종류를 입력해 주세요."); "수입 종류를 선택해 주세요.");
} }
if ("SELF".equals(vo.getCategoryCode()) && StringUtils.isBlank(vo.getCategorySelf())) { if ("SELF".equals(vo.getCategoryCode()) && StringUtils.isBlank(vo.getCategorySelf())) {
@@ -44,7 +43,5 @@ public class CreateDailyIncomeValidator implements Validator {
"estimatedValue", "valid.common.required", "estimatedValue", "valid.common.required",
"현금 또는 현물평가액을 입력 해주세요."); "현금 또는 현물평가액을 입력 해주세요.");
} }
// TODO : valid
} }
} }

View File

@@ -114,13 +114,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="component-input " data-option="직접 입력"><!-- input-invalid --> <div class="component-input input-invalid" data-option="직접 입력">
<div class="input-field"> <div class="input-field">
<input type="text" id="categorySelf" name="categorySelf" th:value="${detail.categorySelf}" placeholder="수입의 종류를 입력해 주세요"> <input type="text" id="categorySelf" name="categorySelf" th:value="${detail.categorySelf}" placeholder="수입의 종류를 입력해 주세요">
</div> </div>
<!--<ul class="input-info"> <ul class="input-info">
<li>수입 종류를 입력해 주세요.</li> <li>수입 종류를 입력해 주세요.</li>
</ul>--> </ul>
</div> </div>
</div> </div>
<div class="component-input"> <div class="component-input">