[BO] 일계부 수입 등록 용어 변경 create > save

This commit is contained in:
김현주
2025-06-30 14:08:37 +09:00
parent 8c08da9d5f
commit be0bef046a
17 changed files with 132 additions and 136 deletions

View File

@@ -1,37 +0,0 @@
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortOut;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
@RequiredArgsConstructor
public class CreateDailyIncomeDao implements CreateDailyIncomePortOut {
private final CreateDailyIncomeMapper dailyIncomeMapper;
@Override
public GetDailyIncomeDto detail(GetDailyIncomeCmd command) {
return dailyIncomeMapper.getDailyIncome(command);
}
@Override
public void create(GetDailyIncomeCmd findCmd, CreateDailyIncomeCmd command) {
Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd);
if (existCount == 0) {
dailyIncomeMapper.createDailyIncome(command);
log.debug("[CreateDailyIncome] command={}", command);
} else {
dailyIncomeMapper.updateDailyIncome(command);
log.debug("[UpdateDailyIncome] command={}", command);
}
}
}

View File

@@ -1,23 +0,0 @@
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
public interface CreateDailyIncomePortIn {
/**
* 일계부 수입 조회
*
* @param reqVO 검색 조건
* @return 수입 상세
*/
GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO);
/**
* 일계부 수입 등록
*
* @param formVO 입력 데이터
*/
void create(CreateDailyIncomeReqVO formVO);
}

View File

@@ -1,24 +0,0 @@
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd;
public interface CreateDailyIncomePortOut {
/**
* 일계부 수입 조회
*
* @param command 검색 조건
* @return 수입 상세
*/
GetDailyIncomeDto detail(GetDailyIncomeCmd command);
/**
* 일계부 수입 등록
*
* @param findCmd 검색 조건
* @param command 입력 데이터
*/
void create(GetDailyIncomeCmd findCmd, CreateDailyIncomeCmd command);
}

View File

@@ -0,0 +1,37 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortOut;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
@RequiredArgsConstructor
public class SaveDailyIncomeDao implements SaveDailyIncomePortOut {
private final SaveDailyIncomeMapper dailyIncomeMapper;
@Override
public GetDailyIncomeDto detail(GetDailyIncomeCmd command) {
return dailyIncomeMapper.getDailyIncome(command);
}
@Override
public void create(GetDailyIncomeCmd findCmd, SaveDailyIncomeCmd command) {
Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd);
if (existCount == 0) {
dailyIncomeMapper.createDailyIncome(command);
log.debug("[CreateDailyIncome] command={}", command);
} else {
dailyIncomeMapper.updateDailyIncome(command);
log.debug("[UpdateDailyIncome] command={}", command);
}
}
}

View File

@@ -1,12 +1,12 @@
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence;
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CreateDailyIncomeMapper {
public interface SaveDailyIncomeMapper {
/**
* 일계부 수입 데이터 조회
*
@@ -28,12 +28,12 @@ public interface CreateDailyIncomeMapper {
*
* @param command 등록 데이터
*/
void createDailyIncome(CreateDailyIncomeCmd command);
void createDailyIncome(SaveDailyIncomeCmd command);
/**
* 일계부 수입 수정
*
* @param command 수정 데이터
*/
void updateDailyIncome(CreateDailyIncomeCmd command);
void updateDailyIncome(SaveDailyIncomeCmd command);
}

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal;
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal;
import app.module.core.config.application.enums.DailyInputType;
import lombok.Getter;

View File

@@ -1,12 +1,11 @@
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web;
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.validator.CreateDailyIncomeValidator;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortIn;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.validator.SaveDailyIncomeValidator;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortIn;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.util.CoreUtil;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
@@ -21,11 +20,10 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequiredArgsConstructor
@RequestMapping(path = "/api/household/daily/income")
public class CreateDailyIncomeController {
private final CoreUtil coreUtil;
public class SaveDailyIncomeController {
private final DailyRecordPortIn dailyRecordPortIn;
private final CreateDailyIncomePortIn dailyIncomePortIn;
private final CreateDailyIncomeValidator createValidator;
private final SaveDailyIncomePortIn dailyIncomePortIn;
private final SaveDailyIncomeValidator sailyIncomeValidator;
/**
* 일계부 수입 조회
@@ -49,15 +47,13 @@ public class CreateDailyIncomeController {
/**
* 일계부 수입 등록 처리
*
* @param id 수입 일련번호
* @param formVO 입력 데이터
* @param bindingResult BindingResult
*/
@PostMapping(path = "/{id}")
ResponseEntity<?> create(@PathVariable("id") String id
, @Valid @RequestBody CreateDailyIncomeReqVO formVO, BindingResult bindingResult) {
@PostMapping(path = "/save")
ResponseEntity<?> create(@Valid @RequestBody SaveDailyIncomeReqVO formVO, BindingResult bindingResult) {
createValidator.validate(formVO, bindingResult);
sailyIncomeValidator.validate(formVO, bindingResult);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
@@ -67,7 +63,6 @@ public class CreateDailyIncomeController {
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setId(Long.parseLong(id));
formVO.setDailyId(dailyRecord.getId());
log.debug("formVO: {}", formVO);

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model;
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model;
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model;
import app.module.core.config.application.enums.DailyInputType;
import jakarta.validation.constraints.NotBlank;
@@ -9,7 +9,7 @@ import lombok.ToString;
@Getter
@Setter
@ToString(callSuper = true)
public class CreateDailyIncomeReqVO extends DailyIncomeUIReqVO {
public class SaveDailyIncomeReqVO extends DailyIncomeUIReqVO {
/**
* 등록 유형
*/

View File

@@ -1,6 +1,6 @@
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.validator;
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.validator;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO;
import lombok.RequiredArgsConstructor;
import org.apache.tika.utils.StringUtils;
import org.springframework.stereotype.Component;
@@ -9,16 +9,16 @@ import org.springframework.validation.Validator;
@Component
@RequiredArgsConstructor
public class CreateDailyIncomeValidator implements Validator {
public class SaveDailyIncomeValidator implements Validator {
@Override
public boolean supports(Class<?> clazz) {
return CreateDailyIncomeReqVO.class.equals(clazz);
return SaveDailyIncomeReqVO.class.equals(clazz);
}
@Override
public void validate(Object target, Errors errors) {
CreateDailyIncomeReqVO vo = (CreateDailyIncomeReqVO) target;
SaveDailyIncomeReqVO vo = (SaveDailyIncomeReqVO) target;
if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(

View File

@@ -0,0 +1,23 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
public interface SaveDailyIncomePortIn {
/**
* 일계부 수입 조회
*
* @param reqVO 검색 조건
* @return 수입 상세
*/
GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO);
/**
* 일계부 수입 등록
*
* @param formVO 입력 데이터
*/
void create(SaveDailyIncomeReqVO formVO);
}

View File

@@ -0,0 +1,24 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd;
public interface SaveDailyIncomePortOut {
/**
* 일계부 수입 조회
*
* @param command 검색 조건
* @return 수입 상세
*/
GetDailyIncomeDto detail(GetDailyIncomeCmd command);
/**
* 일계부 수입 등록
*
* @param findCmd 검색 조건
* @param command 입력 데이터
*/
void create(GetDailyIncomeCmd findCmd, SaveDailyIncomeCmd command);
}

View File

@@ -1,12 +1,12 @@
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application;
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortIn;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortOut;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd;
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortIn;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortOut;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd;
import app.module.core.config.application.util.AuditUtil;
import app.module.core.config.constants.DailyRecordConstants;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
@@ -15,8 +15,8 @@ import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class CreateDailyIncomeService implements CreateDailyIncomePortIn {
private final CreateDailyIncomePortOut portOut;
public class SaveDailyIncomeService implements SaveDailyIncomePortIn {
private final SaveDailyIncomePortOut portOut;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
@@ -31,15 +31,15 @@ public class CreateDailyIncomeService implements CreateDailyIncomePortIn {
}
@Override
public void create(CreateDailyIncomeReqVO formVO) {
public void create(SaveDailyIncomeReqVO formVO) {
GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd(
formVO.getSearchMonth(),
formVO.getGroupNo(),
formVO.getHouseholdSeq(),
formVO.getId());
CreateDailyIncomeCmd command = AuditUtil.create(
new CreateDailyIncomeCmd(
SaveDailyIncomeCmd command = AuditUtil.create(
new SaveDailyIncomeCmd(
formVO.getId(),
formVO.getDailyId(),
formVO.getInputType(),

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain;
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.Getter;

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain;
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import app.module.core.config.application.enums.DailyInputType;
@@ -11,7 +11,7 @@ import lombok.ToString;
@Setter
@AllArgsConstructor
@ToString
public class CreateDailyIncomeCmd extends AuditCommand {
public class SaveDailyIncomeCmd extends AuditCommand {
private Long id;
private Long dailyRecordSeq;
private DailyInputType inputType;