From cfd7d947440e0c198a15fc892f9cc9ac37b371e4 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Sun, 15 Jun 2025 22:08:17 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=20=ED=98=84=ED=99=A9?= =?UTF-8?q?=20-=20=EC=9E=84=EA=B0=80=20=EB=93=B1=EB=A1=9D=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=20=EC=A4=91=20(5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/CheckHouseholdNumDao.java | 19 + .../persistence/CheckHouseholdNumMapper.java | 11 + .../web/CheckHouseholdNumController.java | 27 ++ .../web/model/CheckHouseholdNumReqVO.java | 16 + .../web/model/CheckHouseholdNumResVO.java | 13 + .../ports/CheckHouseholdNumPortIn.java | 9 + .../ports/CheckHouseholdNumPortOut.java | 9 + .../application/CheckHouseholdNumService.java | 20 ++ .../application/domain/CheckHouseholdNum.java | 14 + .../domain/CheckHouseholdNumCmd.java | 14 + .../persistence/CreateHouseholdDao.java | 26 ++ .../persistence/CreateHouseholdMapper.java | 11 + .../web/CreateHouseholdController.java | 62 ++++ .../web/model/CreateHouseholdReqVO.java | 37 ++ .../web/model/CreateHouseholdResVO.java | 13 + .../validator/CreateHouseholdValidator.java | 115 ++++++ .../ports/CreateHouseholdPortIn.java | 7 + .../ports/CreateHouseholdPortOut.java | 7 + .../application/CreateHouseholdService.java | 61 ++++ .../domain/CreateHouseholdHasRoleCmd.java | 2 +- .../domain/CreateHouseholdInCmd.java | 21 +- .../domain/CreateHouseholdOutCmd.java | 13 +- .../web/CreateHouseholdUIController.java | 34 ++ .../web/model/CreateHouseholdUIReqVO.java | 13 + .../GetRegionMainCodesController.java | 24 ++ .../model/GetRegionMainCodesReqVO.java | 13 + .../model/GetRegionMainCodesResVO.java | 13 + .../household/CheckHouseholdNumMapper.xml | 12 + .../household/CreateHouseholdMapper.xml | 36 +- .../household/GetDailyRecordsCountMapper.xml | 52 +-- .../household/GetDailyRecordsStatusMapper.xml | 24 +- .../household/GetHouseholdsStatusMapper.xml | 1 + .../resources/static/scripts/ajaxUtils.js | 38 +- .../common/modal-researcher-mapping.html | 244 +++++++++++++ .../templates/household/households.html | 54 +-- .../household/households/create.html | 330 ++++++++++++++++++ .../templates/household/households/{seq}.html | 44 ++- .../initData/InitFrontUserData.java | 4 - .../persistence/CreateHouseholdDao.java | 24 -- .../persistence/CreateHouseholdMapper.java | 11 - .../ports/CreateHouseholdPortIn.java | 7 - .../ports/CreateHouseholdPortOut.java | 7 - .../application/CreateHouseholdService.java | 45 --- 43 files changed, 1341 insertions(+), 216 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/CheckHouseholdNumController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/model/CheckHouseholdNumReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/model/CheckHouseholdNumResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/CheckHouseholdNumService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/domain/CheckHouseholdNum.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/domain/CheckHouseholdNumCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/validator/CreateHouseholdValidator.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/CreateHouseholdPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java rename {core/src/main/java/app/module/core => admin/src/main/java/app/module/admin}/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java (82%) rename {core/src/main/java/app/module/core => admin/src/main/java/app/module/admin}/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java (53%) rename {core/src/main/java/app/module/core => admin/src/main/java/app/module/admin}/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java (71%) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/model/CreateHouseholdUIReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/GetRegionMainCodesController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/model/GetRegionMainCodesReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/model/GetRegionMainCodesResVO.java create mode 100644 admin/src/main/resources/mappers/household/CheckHouseholdNumMapper.xml rename {core => admin}/src/main/resources/mappers/household/CreateHouseholdMapper.xml (57%) create mode 100644 admin/src/main/resources/templates/common/modal-researcher-mapping.html create mode 100644 admin/src/main/resources/templates/household/households/create.html delete mode 100644 core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java delete mode 100644 core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java delete mode 100644 core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortIn.java delete mode 100644 core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java delete mode 100644 core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumDao.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumDao.java new file mode 100644 index 00000000..a094b1a4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumDao.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; +import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortOut; +import java.util.Optional; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class CheckHouseholdNumDao implements CheckHouseholdNumPortOut { + private final CheckHouseholdNumMapper mapper; + + @Override + public Optional operate(CheckHouseholdNumCmd cmd) { + return mapper.checkHouseholdNum(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumMapper.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumMapper.java new file mode 100644 index 00000000..34b5b825 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence; + +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; +import java.util.Optional; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CheckHouseholdNumMapper { + Optional checkHouseholdNum(CheckHouseholdNumCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/CheckHouseholdNumController.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/CheckHouseholdNumController.java new file mode 100644 index 00000000..e5768afd --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/CheckHouseholdNumController.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.checkHouseholdNum.adapters.web; + +import app.module.admin.usecase.household.checkHouseholdNum.adapters.web.model.CheckHouseholdNumReqVO; +import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortIn; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +class CheckHouseholdNumController { + private final CheckHouseholdNumPortIn portIn; + + @GetMapping(path = "/api/household/households/check") + ResponseEntity operate( + @Valid CheckHouseholdNumReqVO reqVO) { + + return ResponseEntity.status(HttpStatus.OK) + .body(portIn.operate(new CheckHouseholdNumCmd(reqVO.getHouseholdNum())).orElse(null)); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/model/CheckHouseholdNumReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/model/CheckHouseholdNumReqVO.java new file mode 100644 index 00000000..c435534a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/model/CheckHouseholdNumReqVO.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.checkHouseholdNum.adapters.web.model; + +import jakarta.validation.constraints.NotEmpty; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CheckHouseholdNumReqVO { + @NotEmpty + private String householdNum; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/model/CheckHouseholdNumResVO.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/model/CheckHouseholdNumResVO.java new file mode 100644 index 00000000..3533b77c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/model/CheckHouseholdNumResVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.checkHouseholdNum.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CheckHouseholdNumResVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortIn.java new file mode 100644 index 00000000..6208dcbb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.checkHouseholdNum.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; + +public interface CheckHouseholdNumPortIn { + Optional operate(CheckHouseholdNumCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortOut.java new file mode 100644 index 00000000..454aaca5 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.checkHouseholdNum.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; + +public interface CheckHouseholdNumPortOut { + Optional operate(CheckHouseholdNumCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/CheckHouseholdNumService.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/CheckHouseholdNumService.java new file mode 100644 index 00000000..301d2d3f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/CheckHouseholdNumService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.checkHouseholdNum.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; +import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortIn; +import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortOut; +import java.util.Optional; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class CheckHouseholdNumService implements CheckHouseholdNumPortIn { + private final CheckHouseholdNumPortOut portOut; + + @Override + public Optional operate(CheckHouseholdNumCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/domain/CheckHouseholdNum.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/domain/CheckHouseholdNum.java new file mode 100644 index 00000000..99b4996d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/domain/CheckHouseholdNum.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CheckHouseholdNum { + private Boolean isDuplicated; // 사용여부 +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/domain/CheckHouseholdNumCmd.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/domain/CheckHouseholdNumCmd.java new file mode 100644 index 00000000..75fa3c36 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/domain/CheckHouseholdNumCmd.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CheckHouseholdNumCmd { + private String householdNum; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java new file mode 100644 index 00000000..2f69a273 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java @@ -0,0 +1,26 @@ +package app.module.admin.usecase.household.createHousehold.adapters.persistence; + +import app.module.core.config.application.annotation.CreateCommand; +import app.module.core.config.application.util.AuditUtil; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortOut; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class CreateHouseholdDao implements CreateHouseholdPortOut { + private final CreateHouseholdMapper mapper; + + @Override + @CreateCommand + public void operate(CreateHouseholdOutCmd outCmd) { + mapper.createHousehold(outCmd); + + if(outCmd.getResearcherSeq() != null) { + mapper.createHouseholdHasRole( + AuditUtil.create(new CreateHouseholdHasRoleCmd(outCmd.getSeq(), outCmd.getRoleIds()))); + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java new file mode 100644 index 00000000..5171007b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.household.createHousehold.adapters.persistence; + +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CreateHouseholdMapper { + void createHousehold(CreateHouseholdOutCmd outCmd); + void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java new file mode 100644 index 00000000..bde6492e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java @@ -0,0 +1,62 @@ +package app.module.admin.usecase.household.createHousehold.adapters.web; + +import app.module.core.config.application.util.MessageUtil; +import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortIn; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.BindingResult; +import app.module.admin.usecase.household.createHousehold.adapters.web.model.CreateHouseholdReqVO; +import app.module.admin.usecase.household.createHousehold.adapters.web.validator.CreateHouseholdValidator; + +@RestController +@RequiredArgsConstructor +class CreateHouseholdController { + private final CreateHouseholdValidator validator; + private final CreateHouseholdPortIn createHouseholdPortIn; + private final MessageUtil messageUtil; + + @PostMapping(path = "/api/household/households/create") + ResponseEntity operate( + @Valid @RequestBody CreateHouseholdReqVO reqVO, BindingResult bindingResult) { + validator.validate(reqVO, bindingResult); + + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getAllErrors().get(0).getDefaultMessage()); + } + + createHouseholdPortIn.operate( + new CreateHouseholdInCmd( + reqVO.getHouseholdNum(), + reqVO.getOwnerName(), + reqVO.getOwnerAge(), + reqVO.getTel1(), + reqVO.getTel2(), + reqVO.getTel3(), + reqVO.getPhone1(), + reqVO.getPhone2(), + reqVO.getPhone3(), + reqVO.getRegionMainCode(), + reqVO.getRegionSubCode(), + reqVO.getRegionDetailCode(), + reqVO.getAddress(), + reqVO.getIndustryLargeCode(), + reqVO.getIndustryMiddleCode(), + reqVO.getIndustrySubMiddle(), + reqVO.getIndustryDetail(), + reqVO.getResearcherSeq(), + reqVO.getIsPanel(), + reqVO.getMemo() + ) + ); + + return ResponseEntity.status(HttpStatus.OK) + .body(messageUtil.getMessage("operation.common.save.done")); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java new file mode 100644 index 00000000..8c0399d6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java @@ -0,0 +1,37 @@ +package app.module.admin.usecase.household.createHousehold.adapters.web.model; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +public class CreateHouseholdReqVO { + private String householdNum; + private String ownerName; + private Integer ownerAge; + private String tel1; + private String tel2; + private String tel3; + private String phone1; + private String phone2; + private String phone3; + private String regionMainCode; + private String regionSubCode; + private String regionDetailCode; + private String address; + private String industryLargeCode; + private String industryMiddleCode; + private String industrySubMiddle; + private String industryDetail; + private Long researcherSeq; + private Boolean isPanel; + private String memo; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdResVO.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdResVO.java new file mode 100644 index 00000000..435ae49c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdResVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.createHousehold.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateHouseholdResVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/validator/CreateHouseholdValidator.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/validator/CreateHouseholdValidator.java new file mode 100644 index 00000000..163eea2e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/validator/CreateHouseholdValidator.java @@ -0,0 +1,115 @@ +package app.module.admin.usecase.household.createHousehold.adapters.web.validator; + +import app.module.admin.usecase.household.createHousehold.adapters.web.model.CreateHouseholdReqVO; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.validation.Errors; +import org.springframework.validation.Validator; + +@Component +public class CreateHouseholdValidator implements Validator { + + @Override + public boolean supports(Class clazz) { + return CreateHouseholdReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + CreateHouseholdReqVO vo = (CreateHouseholdReqVO) target; + + // 1. 임가번호 + if (!StringUtils.hasText(vo.getHouseholdNum())) { + errors.reject("householdNum", "임가번호는 필수 입력 항목입니다."); + return; + } + if (StringUtils.hasText(vo.getHouseholdNum()) && vo.getHouseholdNum().length() < 5) { + errors.reject("householdNum", "임가번호는 5자리 숫자로 입력해주세요."); + return; + } + + // 2. 경영주명 + if (!StringUtils.hasText(vo.getOwnerName())) { + errors.reject("ownerName", "경영주명을 입력해주세요."); + return; + } + if (vo.getOwnerName().length() > 10) { + errors.reject("ownerName", "경영주명은 최대 10자까지 입력 가능합니다."); + return; + } + + // 3. 연령 + if (vo.getOwnerAge() == null) { + errors.reject("ownerAge", "연령을 입력해주세요."); + return; + } + if (vo.getOwnerAge().toString().length() > 3) { + errors.reject("ownerAge", "연령은 최대 3자리 숫자까지 입력 가능합니다."); + return; + } + + // 4. 가구 연락처 + // TODO : 필수입력값 맞는지 체크 +// if (!StringUtils.hasText(vo.getTel1()) || !StringUtils.hasText(vo.getTel2()) || !StringUtils.hasText(vo.getTel3())) { +// errors.reject("tel", "가구 연락처를 모두 입력해주세요."); +// return; +// } +// if (vo.getTel2().length() > 4 || vo.getTel3().length() > 4) { +// errors.reject("tel", "가구 연락처는 각 4자리까지 입력 가능합니다."); +// return; +// } + if (StringUtils.hasText(vo.getTel2()) || StringUtils.hasText(vo.getTel3())) { + if ((vo.getTel2() != null && vo.getTel2().length() > 4) || + (vo.getTel3() != null && vo.getTel3().length() > 4)) { + errors.reject("tel", "가구 연락처는 각 4자리까지 입력 가능합니다."); + return; + } + } + + // 5. 휴대폰 번호 + if (!StringUtils.hasText(vo.getPhone1()) || !StringUtils.hasText(vo.getPhone2()) || !StringUtils.hasText(vo.getPhone3())) { + errors.reject("phone", "휴대폰 번호를 모두 입력해주세요."); + return; + } + if (vo.getPhone2().length() > 4 || vo.getPhone3().length() > 4) { + errors.reject("phone", "휴대폰 번호는 각 4자리까지 입력 가능합니다."); + return; + } + + // 6. 지역 코드 + if (!StringUtils.hasText(vo.getRegionMainCode())) { + errors.reject("regionMainCode", "실사를 선택해주세요."); + return; + } + if (!StringUtils.hasText(vo.getRegionSubCode())) { + errors.reject("regionSubCode", "지역을 선택해주세요."); + return; + } + if (!StringUtils.hasText(vo.getRegionDetailCode())) { + errors.reject("regionDetailCode", "세부지역을 선택해주세요."); + return; + } + + // 7. 주소 + if (!StringUtils.hasText(vo.getAddress())) { + errors.reject("address", "주소를 입력해주세요."); + return; + } + if (StringUtils.hasText(vo.getAddress()) && vo.getAddress().length() > 50) { + errors.reject("address", "주소는 최대 50자까지 입력 가능합니다."); + return; + } + + // 8. 업종 중분류2 + if (StringUtils.hasText(vo.getIndustrySubMiddle()) && vo.getIndustrySubMiddle().length() > 20) { + errors.reject("industrySubMiddle", "업종 중분류는 최대 20자까지 입력 가능합니다."); + return; + } + + // 9. 업종 세부품목 + if (StringUtils.hasText(vo.getIndustryDetail()) && vo.getIndustryDetail().length() > 20) { + errors.reject("industryDetail", "업종 세부품목은 최대 20자까지 입력 가능합니다."); + return; + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/CreateHouseholdPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/CreateHouseholdPortIn.java new file mode 100644 index 00000000..b669d9be --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/CreateHouseholdPortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.createHousehold.ports; + +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; + +public interface CreateHouseholdPortIn { + void operate(CreateHouseholdInCmd inCmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java new file mode 100644 index 00000000..f5bc96b9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.createHousehold.ports; + +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; + +public interface CreateHouseholdPortOut { + void operate(CreateHouseholdOutCmd outCmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java new file mode 100644 index 00000000..41334cb2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java @@ -0,0 +1,61 @@ +package app.module.admin.usecase.household.createHousehold.ports.application; + +import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortIn; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; +import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortIn; +import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortOut; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +@Service +@RequiredArgsConstructor +class CreateHouseholdService implements CreateHouseholdPortIn { + + private final CreateHouseholdPortOut portOut; + private final BCryptPasswordEncoder passwordEncoder; + private final CheckHouseholdNumPortIn checkHouseholdNumPortIn; + + @Override + public void operate(CreateHouseholdInCmd inCmd) { + + // 임가번호 중복체크 + if (!inCmd.getHouseholdNum().isEmpty()) { + checkHouseholdNumPortIn + .operate(new CheckHouseholdNumCmd(inCmd.getHouseholdNum())) + .filter(CheckHouseholdNum::getIsDuplicated) + .ifPresent(result -> { + throw new IllegalArgumentException("입력하신 번호는 중복입니다. 다른 임가번호를 입력해주세요."); + }); + } + + portOut.operate(new CreateHouseholdOutCmd( + null, + inCmd.getHouseholdNum(), + inCmd.getOwnerName(), + inCmd.getOwnerAge(), + (!StringUtils.hasText(inCmd.getTel2()) || !StringUtils.hasText(inCmd.getTel3())) + ? null + : inCmd.getTel1() + "-" + inCmd.getTel2() + "-" + inCmd.getTel3(), + inCmd.getPhone1() + "-" + inCmd.getPhone2() + "-" + inCmd.getPhone3(), + passwordEncoder.encode(inCmd.getPhone3()), // 비밀번호 핸드폰 뒤 네자리 + inCmd.getRegionMainCode(), + inCmd.getRegionSubCode(), + inCmd.getRegionDetailCode(), + inCmd.getAddress(), + inCmd.getIndustryLargeCode(), + inCmd.getIndustryMiddleCode(), + inCmd.getIndustrySubMiddle(), + inCmd.getIndustryDetail(), + inCmd.getResearcherSeq(), + inCmd.getIsPanel(), + inCmd.getMemo(), + List.of("ROLE_GENERAL") + )); + } +} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java similarity index 82% rename from core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java rename to admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java index 152072d1..d1878982 100644 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java @@ -1,4 +1,4 @@ -package app.module.core.usecase.household.createHousehold.ports.application.domain; +package app.module.admin.usecase.household.createHousehold.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; import java.util.List; diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java similarity index 53% rename from core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java rename to admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java index 5267381b..4fc08ea8 100644 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java @@ -1,4 +1,4 @@ -package app.module.core.usecase.household.createHousehold.ports.application.domain; +package app.module.admin.usecase.household.createHousehold.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; @@ -13,18 +13,21 @@ public class CreateHouseholdInCmd { private String householdNum; private String ownerName; private Integer ownerAge; - private String tel; - private String phone; + private String tel1; + private String tel2; + private String tel3; + private String phone1; + private String phone2; + private String phone3; private String regionMainCode; private String regionSubCode; private String regionDetailCode; private String address; - private Integer industryLargeCode; - private Integer industryMiddleCode; - private Integer industrySubMiddle; - private Integer industryDetail; - private Integer employmentCode; + private String industryLargeCode; + private String industryMiddleCode; + private String industrySubMiddle; + private String industryDetail; + private Long researcherSeq; private Boolean isPanel; private String memo; - private String dropReason; } diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java similarity index 71% rename from core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java rename to admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java index 39b721b6..fbf52db5 100644 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java @@ -1,4 +1,4 @@ -package app.module.core.usecase.household.createHousehold.ports.application.domain; +package app.module.admin.usecase.household.createHousehold.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; import java.util.List; @@ -23,13 +23,12 @@ public class CreateHouseholdOutCmd extends AuditCommand { private String regionSubCode; private String regionDetailCode; private String address; - private Integer industryLargeCode; - private Integer industryMiddleCode; - private Integer industrySubMiddle; - private Integer industryDetail; - private Integer employmentCode; + private String industryLargeCode; + private String industryMiddleCode; + private String industrySubMiddle; + private String industryDetail; + private Long researcherSeq; private Boolean isPanel; private String memo; - private String dropReason; private List roleIds; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java new file mode 100644 index 00000000..00fdc666 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java @@ -0,0 +1,34 @@ +package app.module.admin.usecase.household.createHouseholdUI.adapters.web; + +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import app.module.admin.usecase.household.createHouseholdUI.adapters.web.model.CreateHouseholdUIReqVO; + +@Controller +@RequiredArgsConstructor +class CreateHouseholdUIController { + private final UICodeListPortIn uiCodeListPortIn; + + @GetMapping(path = "/household/households/create") + String operate( + Model model, + @ModelAttribute("reqVO") CreateHouseholdUIReqVO reqVO) { + + // 실사 + model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main")); + // 지역 + model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub")); + // 세부지역 + model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail")); + // 업종 대분류 + model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large")); + // 업종 중분류1 + model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle")); + + return "household/households/create"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/model/CreateHouseholdUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/model/CreateHouseholdUIReqVO.java new file mode 100644 index 00000000..105310d3 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/model/CreateHouseholdUIReqVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.createHouseholdUI.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateHouseholdUIReqVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/GetRegionMainCodesController.java b/admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/GetRegionMainCodesController.java new file mode 100644 index 00000000..236dc460 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/GetRegionMainCodesController.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.getRegionMainCodes; + +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.GetMapping; +import app.module.admin.usecase.household.getRegionMainCodes.model.GetRegionMainCodesReqVO; +import app.module.admin.usecase.household.getRegionMainCodes.model.GetRegionMainCodesResVO; + +@RestController +@RequiredArgsConstructor +class GetRegionMainCodesController { + private final UICodeListPortIn uiCodeListPortIn; + + @GetMapping(path = "/api/regionMainCodes") + ResponseEntity> operate() { + return ResponseEntity.status(HttpStatus.OK) + .body(uiCodeListPortIn.connect("code.region.main")); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/model/GetRegionMainCodesReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/model/GetRegionMainCodesReqVO.java new file mode 100644 index 00000000..c1f84cb9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/model/GetRegionMainCodesReqVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.getRegionMainCodes.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetRegionMainCodesReqVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/model/GetRegionMainCodesResVO.java b/admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/model/GetRegionMainCodesResVO.java new file mode 100644 index 00000000..1999cc1c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/model/GetRegionMainCodesResVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.getRegionMainCodes.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetRegionMainCodesResVO { +} diff --git a/admin/src/main/resources/mappers/household/CheckHouseholdNumMapper.xml b/admin/src/main/resources/mappers/household/CheckHouseholdNumMapper.xml new file mode 100644 index 00000000..972cee13 --- /dev/null +++ b/admin/src/main/resources/mappers/household/CheckHouseholdNumMapper.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml similarity index 57% rename from core/src/main/resources/mappers/household/CreateHouseholdMapper.xml rename to admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml index 58b7ad0a..3296b40e 100644 --- a/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml +++ b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml @@ -2,7 +2,7 @@ + namespace="app.module.admin.usecase.household.createHousehold.adapters.persistence.CreateHouseholdMapper"> @@ -14,42 +14,68 @@ household_num, owner_name, owner_age, + tel, + phone, password, region_main_code, region_sub_code, region_detail_code, address, + industry_large_code, + + industry_middle_code, + + industry_sub_middle, + + industry_detail, - employment_code, + + + + is_panel, + memo, - drop_reason, + ) VALUES ( #{seq}, #{householdNum}, #{ownerName}, #{ownerAge}, + #{tel}, + #{phone}, #{encodedPassword}, #{regionMainCode}, #{regionSubCode}, #{regionDetailCode}, #{address}, + #{industryLargeCode}, + + #{industryMiddleCode}, + + #{industrySubMiddle}, + + #{industryDetail}, - #{employmentCode}, + + + + #{isPanel}, + #{memo}, - #{dropReason}, + ) diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml index fe4f81bb..1cc62f89 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml @@ -7,36 +7,36 @@ resultType="app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount"> /* getDailyRecordsCount : 일계부 상태 요약 및 진행률 조회 */ WITH month_check AS ( - SELECT #{recordMonth} = TO_CHAR(CURRENT_DATE, 'YYYYMM') AS is_current_month + SELECT #{recordMonth} = TO_CHAR(CURRENT_DATE, 'YYYYMM') AS is_current_month ), record_status AS ( - SELECT - CASE - /* 현재 월이고 오늘 이후인 경우만 WAITING */ - WHEN mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING' - WHEN dr.all_status IN ('DONE', 'TODAY_NONE') THEN 'DONE' - WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' - WHEN dr.all_status IS NULL THEN 'EMPTY' - ELSE 'EMPTY' - END AS all_status - FROM daily_day_group ddg - CROSS JOIN month_check mc - LEFT JOIN daily_record dr ON ddg.group_no = dr.day_group_no - AND dr.household_seq = #{householdSeq} - AND dr.record_month = #{recordMonth} - AND dr.is_deleted = false + SELECT + CASE + /* 현재 월이고 오늘 이후인 경우만 WAITING */ + WHEN mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING' + WHEN dr.all_status IN ('DONE', 'TODAY_NONE') THEN 'DONE' + WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' + WHEN dr.all_status IS NULL THEN 'EMPTY' + ELSE 'EMPTY' + END AS all_status + FROM daily_day_group ddg + CROSS JOIN month_check mc + LEFT JOIN daily_record dr ON ddg.group_no = dr.day_group_no + AND dr.household_seq = #{householdSeq} + AND dr.record_month = #{recordMonth} + AND dr.is_deleted = false ) SELECT - COUNT(*) FILTER (WHERE all_status = 'DONE') AS done_count, - COUNT(*) FILTER (WHERE all_status = 'EMPTY') AS empty_count, - COUNT(*) FILTER (WHERE all_status = 'INCOMPLETE') AS incomplete_count, - COUNT(*) FILTER (WHERE all_status = 'WAITING') AS waiting_count, - ROUND( - 100.0 * - COUNT(*) FILTER (WHERE all_status = 'DONE') - / NULLIF(COUNT(*) FILTER (WHERE all_status != 'WAITING'), 0), - 2 - ) AS progress_percent + COUNT(*) FILTER (WHERE all_status = 'DONE') AS done_count, + COUNT(*) FILTER (WHERE all_status = 'EMPTY') AS empty_count, + COUNT(*) FILTER (WHERE all_status = 'INCOMPLETE') AS incomplete_count, + COUNT(*) FILTER (WHERE all_status = 'WAITING') AS waiting_count, + ROUND( + 100.0 * + COUNT(*) FILTER (WHERE all_status = 'DONE') + / NULLIF(COUNT(*) FILTER (WHERE all_status != 'WAITING'), 0), + 2 + ) AS progress_percent FROM record_status \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml index 7aa9f925..c9f84abd 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml @@ -33,23 +33,23 @@ dr.id AS id, ddg.start_day || CASE WHEN ddg.start_day = ddg.end_day THEN '' ELSE '-' || ddg.end_day END AS day_group, CASE - WHEN mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING' /* 대기 */ - WHEN dr.all_status IN ('DONE', 'TODAY_NONE') THEN 'DONE' /* 작성완료 */ - WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' /* 미완료 */ - ELSE 'EMPTY' /* 미작성 */ + WHEN mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING' /* 대기 */ + WHEN dr.all_status IN ('DONE', 'TODAY_NONE') THEN 'DONE' /* 작성완료 */ + WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' /* 미완료 */ + ELSE 'EMPTY' /* 미작성 */ END AS all_status, - fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.income_status, dc.income_cnt) AS income_status, - fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.work_status, dc.work_cnt) AS work_status, - fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.expense_status, dc.expense_cnt) AS expense_status, - fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.power_status, dc.power_cnt) AS power_status, - fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.forestry_status, dc.forestry_cnt) AS forestry_status + fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.income_status, dc.income_cnt) AS income_status, + fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.work_status, dc.work_cnt) AS work_status, + fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.expense_status, dc.expense_cnt) AS expense_status, + fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.power_status, dc.power_cnt) AS power_status, + fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.forestry_status, dc.forestry_cnt) AS forestry_status -- TODO : 농업 자가소비량 테이블 수정 후 추가 FROM daily_day_group ddg CROSS JOIN month_check mc LEFT JOIN daily_record dr ON ddg.group_no = dr.day_group_no - AND dr.household_seq = #{householdSeq} - AND dr.record_month = #{recordMonth} - AND dr.is_deleted = false + AND dr.household_seq = #{householdSeq} + AND dr.record_month = #{recordMonth} + AND dr.is_deleted = false LEFT JOIN data_counts dc ON dc.id = dr.id ORDER BY ddg.start_day diff --git a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index e70023d9..6b9697b3 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -180,6 +180,7 @@ + ORDER BY hvr.householdNum ASC OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY \ No newline at end of file diff --git a/admin/src/main/resources/static/scripts/ajaxUtils.js b/admin/src/main/resources/static/scripts/ajaxUtils.js index 87fca12d..639fdf8a 100644 --- a/admin/src/main/resources/static/scripts/ajaxUtils.js +++ b/admin/src/main/resources/static/scripts/ajaxUtils.js @@ -110,7 +110,7 @@ var ajaxUtil = { /** * ajax 공통 처리 */ - _ajaxMethod : function (url, jsonObj, successCallback, errorCallback, method, dataType, async) { + _ajaxMethod : function (url, jsonObj, successCallback, errorCallback, method, dataType, options = {}, async) { if (typeof ENV != 'undefined' && typeof ENV.submitted == 'boolean') { ENV.submitted = true; } @@ -148,21 +148,31 @@ var ajaxUtil = { kri.logger.error('statusCode: 403'); }, 422:function(rstData, status) { - console.log(rstData) - $(rstData.responseJSON).each((idx, oj) => { - // TODO : form id? or body - let target = $('body').find('[name=' + oj.field + ']'); - target.addClass('is-invalid'); - - target.parent().find('.invalid-feedback').text(oj.defaultMessage); - }); - - if ($('.invalid-feedback').length === 0) { - let fieldErrors = rstData.responseJSON != null ? rstData.responseJSON : null; - if (fieldErrors != null && fieldErrors.length > 0) { - ajaxUtil._alert(fieldErrors[0].defaultMessage, '유효성 체크'); + console.log(rstData); + // options type : 1. alert, 2. field + if (options.handle422Type === 'alert') { + if (typeof errorCallback !== 'undefined') { + errorCallback(422, rstData); // 호출한 쪽에서 alert 처리 } + return; + } + if (options.handle422Type === 'field' || !options.handle422Type) { + $(rstData.responseJSON).each((idx, oj) => { + // TODO : form id? or body + let target = $('body').find('[name=' + oj.field + ']'); + target.addClass('is-invalid'); + + target.parent().find('.invalid-feedback').text(oj.defaultMessage); + }); + + if ($('.invalid-feedback').length === 0) { + let fieldErrors = rstData.responseJSON != null ? rstData.responseJSON : null; + if (fieldErrors != null && fieldErrors.length > 0) { + ajaxUtil._alert(fieldErrors[0].defaultMessage, '유효성 체크'); + } + + } } }, 500:function(rstData){ diff --git a/admin/src/main/resources/templates/common/modal-researcher-mapping.html b/admin/src/main/resources/templates/common/modal-researcher-mapping.html new file mode 100644 index 00000000..1fb87610 --- /dev/null +++ b/admin/src/main/resources/templates/common/modal-researcher-mapping.html @@ -0,0 +1,244 @@ + + + +
+
+ + +
+ + +
+
+ + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/household/households.html b/admin/src/main/resources/templates/household/households.html index 3bdbdbd5..8324b8a9 100644 --- a/admin/src/main/resources/templates/household/households.html +++ b/admin/src/main/resources/templates/household/households.html @@ -223,7 +223,7 @@ @@ -286,10 +286,13 @@ - - @@ -297,32 +300,26 @@ -
- - - -
+
+ + + + +
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/household/households/{seq}.html b/admin/src/main/resources/templates/household/households/{seq}.html index 1e321f3e..aa67875a 100644 --- a/admin/src/main/resources/templates/household/households/{seq}.html +++ b/admin/src/main/resources/templates/household/households/{seq}.html @@ -27,7 +27,7 @@ 가구 연락처 - 031-0000-0000 + 031-0000-0000 휴대폰 번호 @@ -57,11 +57,11 @@ 업종 대분류 - 40. 수실류재배업 + 40. 수실류재배업 업종 중분류1 - 42. 대추재배업 + 42. 대추재배업 업종 중분류2 @@ -91,7 +91,7 @@ 비고 - - + - @@ -375,14 +375,13 @@ const getDailyRecords = () => { const f = document.reqForm; - $.ajax({ - method: 'GET', - url: '/api/household/dailyRecordsStatus', - data: { + ajaxUtil._ajaxMethod( + '/api/household/dailyRecordsStatus', + { householdSeq: f.householdSeq.value, recordMonth: f.recordMonth.value }, - success(response) { + function(response) { // 성공 console.log("일계부 현황 리스트 조회 : ", response); const listArea = $('.tab-content .daily-record-list'); const detailArea = $('.tab-content .daily-record-detail'); @@ -420,8 +419,13 @@ }); tbody.append(tmpl); - } - }); + }, + function (code, rstData) { // 실패 + console.log("error : ", code); + }, + 'get', + 'json' + ); } // 임산물 등록 현황 상세 @@ -438,22 +442,26 @@ listArea.hide(); detailArea.show(); - $.ajax({ - method: 'GET', - url: '/api/household/dailyRecordStatus', - data: { + ajaxUtil._ajaxMethod( + '/api/household/dailyRecordStatus', + { householdSeq: f.householdSeq.value, recordSeq: id, recordMonth: f.recordMonth.value }, - success(response) { + function(response) { // 성공 console.log("일계부 등록 상세 데이터~ : ", response); gridIncomeTable(response.incomes); gridExpenseTable(response.expenses); gridPowerTable(response.powers); gridForestryTable(response.forestries); - } - }); + }, + function (code, rstData) { // 실패 + console.log("error : ", code); + }, + 'get', + 'json' + ); } // 수입 테이블 그리기 diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java index 00a5d173..461dcacd 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java @@ -1,7 +1,5 @@ package app.module.core.config.adapters.persistence.initData; -import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortIn; -import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -16,8 +14,6 @@ import org.springframework.stereotype.Component; @Order(5) public class InitFrontUserData implements ApplicationRunner { - private final CreateHouseholdPortIn createHouseholdPortIn; - @Value("${app.initData.core}") private boolean isCoreDataRequired; diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java deleted file mode 100644 index 8b89bc59..00000000 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java +++ /dev/null @@ -1,24 +0,0 @@ -package app.module.core.usecase.household.createHousehold.adapters.persistence; - -import app.module.core.config.application.annotation.CreateCommand; -import app.module.core.config.application.util.AuditUtil; -import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd; -import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; -import lombok.RequiredArgsConstructor; -import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; -import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortOut; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -class CreateHouseholdDao implements CreateHouseholdPortOut { - private final CreateHouseholdMapper mapper; - - @Override - @CreateCommand - public void operate(CreateHouseholdOutCmd outCmd) { - mapper.createHousehold(outCmd); - mapper.createHouseholdHasRole( - AuditUtil.create(new CreateHouseholdHasRoleCmd(outCmd.getSeq(), outCmd.getRoleIds()))); - } -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java deleted file mode 100644 index 3c031fb6..00000000 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.household.createHousehold.adapters.persistence; - -import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd; -import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CreateHouseholdMapper { - void createHousehold(CreateHouseholdOutCmd outCmd); - void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd); -} diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortIn.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortIn.java deleted file mode 100644 index 39722dc2..00000000 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortIn.java +++ /dev/null @@ -1,7 +0,0 @@ -package app.module.core.usecase.household.createHousehold.ports; - -import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; - -public interface CreateHouseholdPortIn { - void operate(CreateHouseholdInCmd inCmd); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java deleted file mode 100644 index d0f171c3..00000000 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java +++ /dev/null @@ -1,7 +0,0 @@ -package app.module.core.usecase.household.createHousehold.ports; - -import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; - -public interface CreateHouseholdPortOut { - void operate(CreateHouseholdOutCmd outCmd); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java deleted file mode 100644 index 18f9a625..00000000 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java +++ /dev/null @@ -1,45 +0,0 @@ -package app.module.core.usecase.household.createHousehold.ports.application; - -import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortIn; -import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortOut; -import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; -import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; -import java.util.List; -import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class CreateHouseholdService implements CreateHouseholdPortIn { - - private final CreateHouseholdPortOut portOut; - private final BCryptPasswordEncoder passwordEncoder; - - @Override - public void operate(CreateHouseholdInCmd inCmd) { - portOut.operate(new CreateHouseholdOutCmd( - null, - inCmd.getHouseholdNum(), - inCmd.getOwnerName(), - inCmd.getOwnerAge(), - inCmd.getTel(), - inCmd.getPhone(), - passwordEncoder.encode(StringUtils.right(inCmd.getPhone(), 4)), // 비밀번호 핸드폰 뒤 네자리 - inCmd.getRegionMainCode(), - inCmd.getRegionSubCode(), - inCmd.getRegionDetailCode(), - inCmd.getAddress(), - inCmd.getIndustryLargeCode(), - inCmd.getIndustryMiddleCode(), - inCmd.getIndustrySubMiddle(), - inCmd.getIndustryDetail(), - inCmd.getEmploymentCode(), - inCmd.getIsPanel(), - inCmd.getMemo(), - inCmd.getDropReason(), - List.of("ROLE_GENERAL") - )); - } -} \ No newline at end of file