From be0bef046ab75c0103eda4a9d86076af8bca508c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 30 Jun 2025 14:08:37 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EC=88=98?= =?UTF-8?q?=EC=9E=85=20=EB=93=B1=EB=A1=9D=20=EC=9A=A9=EC=96=B4=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20create=20>=20save?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/CreateDailyIncomeDao.java | 37 ------------------- .../ports/CreateDailyIncomePortIn.java | 23 ------------ .../ports/CreateDailyIncomePortOut.java | 24 ------------ .../persistence/SaveDailyIncomeDao.java | 37 +++++++++++++++++++ .../persistence/SaveDailyIncomeMapper.java} | 14 +++---- .../persistence/modal/GetDailyIncomeDto.java | 2 +- .../web/SaveDailyIncomeController.java} | 29 ++++++--------- .../web/model/DailyIncomeUIReqVO.java | 2 +- .../web/model/SaveDailyIncomeReqVO.java} | 4 +- .../validator/SaveDailyIncomeValidator.java} | 10 ++--- .../ports/SaveDailyIncomePortIn.java | 23 ++++++++++++ .../ports/SaveDailyIncomePortOut.java | 24 ++++++++++++ .../application/SaveDailyIncomeService.java} | 26 ++++++------- .../application/domain/GetDailyIncomeCmd.java | 2 +- .../domain/SaveDailyIncomeCmd.java} | 4 +- ...meMapper.xml => SaveDailyIncomeMapper.xml} | 4 +- .../households/modal/modal-daily-income.html | 3 +- 17 files changed, 132 insertions(+), 136 deletions(-) delete mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java delete mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java delete mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java rename admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/{createDailyIncome/adapters/persistence/CreateDailyIncomeMapper.java => saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java} (50%) rename admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/{createDailyIncome => saveDailyIncome}/adapters/persistence/modal/GetDailyIncomeDto.java (84%) rename admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/{createDailyIncome/adapters/web/CreateDailyIncomeController.java => saveDailyIncome/adapters/web/SaveDailyIncomeController.java} (65%) rename admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/{createDailyIncome => saveDailyIncome}/adapters/web/model/DailyIncomeUIReqVO.java (84%) rename admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/{createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java => saveDailyIncome/adapters/web/model/SaveDailyIncomeReqVO.java} (86%) rename admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/{createDailyIncome/adapters/web/validator/CreateDailyIncomeValidator.java => saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java} (78%) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java rename admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/{createDailyIncome/ports/application/CreateDailyIncomeService.java => saveDailyIncome/ports/application/SaveDailyIncomeService.java} (58%) rename admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/{createDailyIncome => saveDailyIncome}/ports/application/domain/GetDailyIncomeCmd.java (80%) rename admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/{createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java => saveDailyIncome/ports/application/domain/SaveDailyIncomeCmd.java} (82%) rename admin/src/main/resources/mappers/household/daily/{CreateDailyIncomeMapper.xml => SaveDailyIncomeMapper.xml} (94%) diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java deleted file mode 100644 index ba32b5ba..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java +++ /dev/null @@ -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); - } - } - -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java deleted file mode 100644 index 559c23cf..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java +++ /dev/null @@ -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); -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java deleted file mode 100644 index 1d0af5d9..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java +++ /dev/null @@ -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); -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java new file mode 100644 index 00000000..ad37cec4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java @@ -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); + } + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java similarity index 50% rename from admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeMapper.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java index 26dfb419..c90cbb6d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java @@ -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); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java similarity index 84% rename from admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java index 93436d4d..2a8dc88e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java similarity index 65% rename from admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java index cb6dbfd4..ee98794c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java @@ -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); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java similarity index 84% rename from admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java index 3f3901d0..71bffa92 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/SaveDailyIncomeReqVO.java similarity index 86% rename from admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/SaveDailyIncomeReqVO.java index 23a2648c..cdb49a64 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/SaveDailyIncomeReqVO.java @@ -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 { /** * 등록 유형 */ diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/validator/CreateDailyIncomeValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java similarity index 78% rename from admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/validator/CreateDailyIncomeValidator.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java index 8c367ff3..5783baca 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/validator/CreateDailyIncomeValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java @@ -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( diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortIn.java new file mode 100644 index 00000000..a4136a0f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortIn.java @@ -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); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java new file mode 100644 index 00000000..22d7a0ac --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java @@ -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); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java similarity index 58% rename from admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java index f9bb7db5..28a06502 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java @@ -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(), diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/GetDailyIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/GetDailyIncomeCmd.java similarity index 80% rename from admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/GetDailyIncomeCmd.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/GetDailyIncomeCmd.java index 3afe2570..f55cc420 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/GetDailyIncomeCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/GetDailyIncomeCmd.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/SaveDailyIncomeCmd.java similarity index 82% rename from admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/SaveDailyIncomeCmd.java index 5dcb3f31..3658483c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/SaveDailyIncomeCmd.java @@ -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; diff --git a/admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml b/admin/src/main/resources/mappers/household/daily/SaveDailyIncomeMapper.xml similarity index 94% rename from admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml rename to admin/src/main/resources/mappers/household/daily/SaveDailyIncomeMapper.xml index 65b113ce..56ad9c7c 100644 --- a/admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml +++ b/admin/src/main/resources/mappers/household/daily/SaveDailyIncomeMapper.xml @@ -1,9 +1,9 @@ - +