From 2c7c7894df1d83c8f8f029105f06b9260ae7521f Mon Sep 17 00:00:00 2001 From: "DESKTOP-E9DJS27\\etribe" Date: Sat, 14 Jun 2025 11:18:58 +0900 Subject: [PATCH] =?UTF-8?q?=EB=82=B4=EC=A0=95=EB=B3=B4,=20=EB=B9=84?= =?UTF-8?q?=EB=B0=80=EB=B2=88=ED=98=B8=20=ED=99=95=EC=9D=B8,=20=EB=82=B4?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=20:=20UX=EC=97=90=20?= =?UTF-8?q?=EB=94=B0=EB=9D=BC=20=EC=88=98=EC=A0=95=20=ED=95=84=EC=9A=94.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/application/enums/UiCodeType.java | 2 +- .../application/domain/GetHousehold.java | 74 ++++++ .../domain/UpdateFrontHouseholdCmd.java | 3 +- .../household/UpdateFrontHouseholdMapper.xml | 2 + .../web/UpdateFrontHouseholdController.java | 40 --- .../web/model/UpdateFrontHouseholdReqVO.java | 20 -- .../web/model/UpdateFrontHouseholdResVO.java | 13 - .../adapters/web/UpdateUserController.java | 59 +++++ .../adapters/web/UpdateUserUIController.java} | 14 +- .../adapters/web/model/UpdateUserReqVO.java | 51 ++++ .../adapters/web/CreateUserController.java | 54 ---- .../adapters/web/model/CreateUserReqVO.java | 31 --- .../web/validator/CreateUserValidator.java | 46 ---- .../adapters/web/CreateUserUIController.java | 19 -- .../adapters/web/model/CreateUserUIReqVO.java | 14 -- .../adapters/web/UpdateUserController.java | 39 --- .../adapters/web/model/UpdateUserReqVO.java | 31 --- .../web/validator/UpdateUserValidator.java | 40 --- .../adapters/web/UpdateUserUIController.java | 29 --- .../adapters/web/model/UpdateUserUIReqVO.java | 14 -- .../images/common/ico_cal_arrow_prev.svg | 3 + .../src/main/resources/static/ui/ajaxUtil.js | 61 +++-- .../templates/info/user/password.html | 6 +- .../resources/templates/info/user/user.html | 235 +++++++++++++----- .../resources/templates/security/login.html | 6 +- 25 files changed, 429 insertions(+), 477 deletions(-) delete mode 100644 front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/UpdateFrontHouseholdController.java delete mode 100644 front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdReqVO.java delete mode 100644 front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdResVO.java create mode 100644 front/src/main/java/app/module/front/usecase/info/user/updateUserUI/adapters/web/UpdateUserController.java rename front/src/main/java/app/module/front/usecase/info/user/{getUserUI/adapters/web/GetUserUIController.java => updateUserUI/adapters/web/UpdateUserUIController.java} (68%) create mode 100644 front/src/main/java/app/module/front/usecase/info/user/updateUserUI/adapters/web/model/UpdateUserReqVO.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/createUser/adapters/web/CreateUserController.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/createUser/adapters/web/model/CreateUserReqVO.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/createUser/adapters/web/validator/CreateUserValidator.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/createUserUI/adapters/web/CreateUserUIController.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/createUserUI/adapters/web/model/CreateUserUIReqVO.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/updateUser/adapters/web/UpdateUserController.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/updateUser/adapters/web/model/UpdateUserReqVO.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/updateUser/adapters/web/validator/UpdateUserValidator.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/updateUserUI/adapters/web/UpdateUserUIController.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/updateUserUI/adapters/web/model/UpdateUserUIReqVO.java create mode 100644 front/src/main/resources/static/assets/images/common/ico_cal_arrow_prev.svg diff --git a/core/src/main/java/app/module/core/config/application/enums/UiCodeType.java b/core/src/main/java/app/module/core/config/application/enums/UiCodeType.java index 3f8c0714..b2baacfa 100644 --- a/core/src/main/java/app/module/core/config/application/enums/UiCodeType.java +++ b/core/src/main/java/app/module/core/config/application/enums/UiCodeType.java @@ -8,5 +8,5 @@ import lombok.RequiredArgsConstructor; public enum UiCodeType { REGION_MAIN("code.region.main"), REGION_SUB("code.region.sub"); - private final String desc; + private final String code; } diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java index 9e384d8b..aa5e40ea 100644 --- a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java +++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java @@ -39,4 +39,78 @@ public class GetHousehold { private LocalDateTime updatedAt; private String updatedBy; private Set roles; + + public String getPhone1() { + if(phone==null || !phone.contains("-")){ + return ""; + } else { + String[] phones = phone.split("-"); + if(phones.length > 0){ + return phones[0]; + } else { + return ""; + } + } + } + public String getPhone2() { + if(phone==null || !phone.contains("-")){ + return ""; + } else { + String[] phones = phone.split("-"); + if(phones.length > 1){ + return phones[1]; + } else { + return ""; + } + } + } + public String getPhone3() { + if(phone==null || !phone.contains("-")){ + return ""; + } else { + String[] phones = phone.split("-"); + if(phones.length > 2){ + return phones[2]; + } else { + return ""; + } + } + } + public String getTel1() { + if(tel==null || !tel.contains("-")){ + return ""; + } else { + String[] tels = tel.split("-"); + if(tels.length > 0){ + return tels[0]; + } else { + return ""; + } + } + } + public String getTel2() { + if(tel==null || !tel.contains("-")){ + return ""; + } else { + String[] tels = tel.split("-"); + if(tels.length > 1){ + return tels[1]; + } else { + return ""; + } + } + } + public String getTel3() { + if(tel==null || !tel.contains("-")){ + return ""; + } else { + String[] tels = tel.split("-"); + if(tels.length > 2){ + return tels[2]; + } else { + return ""; + } + } + } + } diff --git a/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java index bdf63b83..98e7e77b 100644 --- a/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java +++ b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java @@ -13,10 +13,11 @@ import lombok.Setter; @AllArgsConstructor public class UpdateFrontHouseholdCmd extends AuditCommand { private Long seq; - private String householdNum; private String ownerName; private Integer ownerAge; private String tel; private String phone; + private String regionMainCode; + private String regionSubCode; private String address; } diff --git a/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml b/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml index 2f5bb94d..83bfe3b4 100644 --- a/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml +++ b/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml @@ -11,6 +11,8 @@ owner_age = #{ownerAge}, tel = #{tel}, phone = #{phone}, + region_main_code = #{regionMainCode}, + region_sub_code = #{regionSubCode}, address = #{address}, WHERE seq = ${seq} diff --git a/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/UpdateFrontHouseholdController.java b/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/UpdateFrontHouseholdController.java deleted file mode 100644 index 47f8463d..00000000 --- a/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/UpdateFrontHouseholdController.java +++ /dev/null @@ -1,40 +0,0 @@ -package app.module.front.usecase.household.updateFrontHousehold.adapters.web; - -import app.module.core.usecase.household.updateFrontHousehold.ports.UpdateFrontHouseholdPortIn; -import app.module.core.usecase.household.updateFrontHousehold.ports.application.domain.UpdateFrontHouseholdCmd; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PatchMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.validation.BindingResult; -import app.module.front.usecase.household.updateFrontHousehold.adapters.web.model.UpdateFrontHouseholdReqVO; -import app.module.front.usecase.household.updateFrontHousehold.adapters.web.model.UpdateFrontHouseholdResVO; - -@RestController -@RequiredArgsConstructor -class UpdateFrontHouseholdController { - private final UpdateFrontHouseholdPortIn updateFrontHouseholdPortIn; - - @PatchMapping(path = "/api/front/household/update") - ResponseEntity operate( - @Valid UpdateFrontHouseholdReqVO reqVO, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) - .body(bindingResult); - } - - updateFrontHouseholdPortIn.operate(new UpdateFrontHouseholdCmd( - reqVO.getSeq(), - reqVO.getHouseholdNum(), - reqVO.getOwnerName(), - reqVO.getOwnerAge(), - reqVO.getTel(), - reqVO.getPhone(), - reqVO.getAddress() - )); - - return ResponseEntity.status(HttpStatus.OK).body(reqVO); - } -} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdReqVO.java b/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdReqVO.java deleted file mode 100644 index 5da30bba..00000000 --- a/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdReqVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.front.usecase.household.updateFrontHousehold.adapters.web.model; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class UpdateFrontHouseholdReqVO { - private Long seq; - private String householdNum; - private String ownerName; - private Integer ownerAge; - private String tel; - private String phone; - private String address; -} diff --git a/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdResVO.java b/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdResVO.java deleted file mode 100644 index 55335f9f..00000000 --- a/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdResVO.java +++ /dev/null @@ -1,13 +0,0 @@ -package app.module.front.usecase.household.updateFrontHousehold.adapters.web.model; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class UpdateFrontHouseholdResVO { -} diff --git a/front/src/main/java/app/module/front/usecase/info/user/updateUserUI/adapters/web/UpdateUserController.java b/front/src/main/java/app/module/front/usecase/info/user/updateUserUI/adapters/web/UpdateUserController.java new file mode 100644 index 00000000..4768e22a --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/user/updateUserUI/adapters/web/UpdateUserController.java @@ -0,0 +1,59 @@ +package app.module.front.usecase.info.user.updateUserUI.adapters.web; + +import app.module.core.config.application.enums.UiCodeType; +import app.module.core.config.application.util.CommonUtil; +import app.module.core.config.application.util.CoreUtil; +import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; +import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold; +import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; +import app.module.core.usecase.household.updateFrontHousehold.ports.UpdateFrontHouseholdPortIn; +import app.module.core.usecase.household.updateFrontHousehold.ports.application.domain.UpdateFrontHouseholdCmd; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserInCmd; +import app.module.front.config.application.response.ApiResponse; +import app.module.front.usecase.info.user.getUserPasswordUI.adapters.web.model.GetUserPasswordReqVO; +import app.module.front.usecase.info.user.updateUserUI.adapters.web.model.UpdateUserReqVO; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Controller +@RequiredArgsConstructor +class UpdateUserController { + + + private final UpdateFrontHouseholdPortIn updateFrontHouseholdPortIn; + + private final GetHouseholdPortIn getHouseholdPortIn; + + + private final CoreUtil coreUtil; + + @PostMapping(path = "/api/front/info/user/update") + ResponseEntity operate(@RequestBody @Valid UpdateUserReqVO reqVO, BindingResult bindingResult){ + if (bindingResult.hasErrors()) { + return coreUtil.getErrorInfo(bindingResult); + } + GetHousehold getHousehold = getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow(); + + updateFrontHouseholdPortIn.operate(new UpdateFrontHouseholdCmd( + getHousehold.getSeq(), + reqVO.getOwnerName(), + reqVO.getOwnerAge(), + reqVO.getTel1() + '-'+ reqVO.getTel2() + '-' + reqVO.getTel3(), + reqVO.getPhone1() + '-'+ reqVO.getPhone2() + '-' + reqVO.getPhone3(), + reqVO.getRegionMainCode(), + reqVO.getRegionSubCode(), + reqVO.getAddress() + )); + + return ResponseEntity.ok(ApiResponse.success(null)); + } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/user/getUserUI/adapters/web/GetUserUIController.java b/front/src/main/java/app/module/front/usecase/info/user/updateUserUI/adapters/web/UpdateUserUIController.java similarity index 68% rename from front/src/main/java/app/module/front/usecase/info/user/getUserUI/adapters/web/GetUserUIController.java rename to front/src/main/java/app/module/front/usecase/info/user/updateUserUI/adapters/web/UpdateUserUIController.java index 3a270e5a..3f1a5583 100644 --- a/front/src/main/java/app/module/front/usecase/info/user/getUserUI/adapters/web/GetUserUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/user/updateUserUI/adapters/web/UpdateUserUIController.java @@ -1,22 +1,25 @@ -package app.module.front.usecase.info.user.getUserUI.adapters.web; +package app.module.front.usecase.info.user.updateUserUI.adapters.web; +import app.module.core.config.application.enums.UiCodeType; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; @Controller @RequiredArgsConstructor -class GetUserUIController { +class UpdateUserUIController { + + private final UICodeListPortIn uiCodeListPortIn; private final GetHouseholdPortIn getHouseholdPortIn; + @GetMapping(path = "/info/user") String operate(Model model, HttpServletRequest request) { @@ -25,6 +28,9 @@ class GetUserUIController { return "redirect:/"; // 요청 처리 중단 } + + model.addAttribute("regionMainList",uiCodeListPortIn.connect(UiCodeType.REGION_MAIN.getCode())); + model.addAttribute("regionSubList",uiCodeListPortIn.connect(UiCodeType.REGION_SUB.getCode())); model.addAttribute("userInfo", getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow()); diff --git a/front/src/main/java/app/module/front/usecase/info/user/updateUserUI/adapters/web/model/UpdateUserReqVO.java b/front/src/main/java/app/module/front/usecase/info/user/updateUserUI/adapters/web/model/UpdateUserReqVO.java new file mode 100644 index 00000000..ac5c8a94 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/user/updateUserUI/adapters/web/model/UpdateUserReqVO.java @@ -0,0 +1,51 @@ +package app.module.front.usecase.info.user.updateUserUI.adapters.web.model; + +import jakarta.validation.constraints.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor // 기본 생성자 자동 추가 +@AllArgsConstructor +public class UpdateUserReqVO { + + @NotBlank(message = "이름은 필수 항목입니다.") + @Pattern(regexp = "^[가-힣]{2,10}$", message = "이름은 2~10자의 한글이어야 합니다.") + private String ownerName; + + @NotNull(message = "나이는 필수 항목입니다.") + @Min(value = 0, message = "나이는 0세 이상이어야 합니다.") + @Max(value = 120, message = "나이는 120세 이하이어야 합니다.") + private Integer ownerAge; + + @Pattern(regexp = "^\\d{2,3}$", message = "가구 연락처는 2~3자리 숫자여야 합니다.") + private String tel1; + + @Pattern(regexp = "^\\d{3,4}$", message = "가운데 번호는 3~4자리 숫자여야 합니다.") + private String tel2; + + @Pattern(regexp = "^\\d{4}$", message = "끝 번호는 4자리 숫자여야 합니다.") + private String tel3; + + @Pattern(regexp = "^\\d{2,3}$", message = "휴대폰 번호는 2~3자리 숫자여야 합니다.") + private String phone1; + + @Pattern(regexp = "^\\d{3,4}$", message = "가운데 번호는 3~4자리 숫자여야 합니다.") + private String phone2; + + @Pattern(regexp = "^\\d{4}$", message = "끝 번호는 4자리 숫자여야 합니다.") + private String phone3; + + @NotBlank(message = "시/도는 필수 항목입니다.") + @Pattern(regexp = "^code\\.region\\.main\\.\\d+$", message = "시/도 형식이 올바르지 않습니다.") + private String regionMainCode; + + @NotBlank(message = "시/군/구는 필수 항목입니다.") + @Pattern(regexp = "^code\\.region\\.sub\\.\\d+$", message = "시/군/구 형식이 올바르지 않습니다.") + private String regionSubCode; + + @NotBlank(message = "주소는 필수 항목입니다.") + @Size(max = 255, message = "주소는 255자 이하여야 합니다.") + private String address; +} diff --git a/front/src/main/java/app/module/front/usecase/user/createUser/adapters/web/CreateUserController.java b/front/src/main/java/app/module/front/usecase/user/createUser/adapters/web/CreateUserController.java deleted file mode 100644 index 3ee3ee31..00000000 --- a/front/src/main/java/app/module/front/usecase/user/createUser/adapters/web/CreateUserController.java +++ /dev/null @@ -1,54 +0,0 @@ -package app.module.front.usecase.user.createUser.adapters.web; - -import app.module.core.config.application.enums.SignUpType; -import app.module.core.config.application.util.CoreUtil; -import app.module.core.usecase.user.createUser.ports.CreateUserPortIn; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUser; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; -import app.module.front.usecase.user.createUser.adapters.web.model.CreateUserReqVO; -import app.module.front.usecase.user.createUser.adapters.web.validator.CreateUserValidator; -import jakarta.validation.Valid; -import java.util.Set; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor -@Slf4j -class CreateUserController { - - private final CreateUserPortIn createUserPortIn; - private final CreateUserValidator createUserValidator; - private final CoreUtil coreUtil; - - @PostMapping(path = "/api/public/user/create") - ResponseEntity operate(@Valid CreateUserReqVO reqVO, BindingResult bindingResult) { - - createUserValidator.validate(reqVO, bindingResult); - if (bindingResult.hasErrors()) { - return coreUtil.getErrorInfo(bindingResult); - } - - CreateUser user = - createUserPortIn - .operate( - new CreateUserCmd( - reqVO.getId(), - reqVO.getPassword(), - reqVO.getEmail(), - reqVO.getNickname(), - SignUpType.NORMAL, - false, - 0, - false, - Set.of("ROLE_GENERAL"))) - .orElseThrow(); - - return ResponseEntity.status(HttpStatus.OK).body(user); - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/createUser/adapters/web/model/CreateUserReqVO.java b/front/src/main/java/app/module/front/usecase/user/createUser/adapters/web/model/CreateUserReqVO.java deleted file mode 100644 index 69b2f39b..00000000 --- a/front/src/main/java/app/module/front/usecase/user/createUser/adapters/web/model/CreateUserReqVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package app.module.front.usecase.user.createUser.adapters.web.model; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Pattern; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class CreateUserReqVO { - - @NotBlank(message = "{valid.common.required}") - private String id; - - @NotBlank(message = "{valid.common.required}") - private String password; - - @NotBlank(message = "{valid.common.required}") - private String passwordRe; - - @NotBlank(message = "{valid.common.required}") - private String email; - - @NotBlank(message = "{valid.common.required}") - @Pattern(regexp = "^[가-힣a-zA-Z0-9_-]{2,10}$", message = "{valid.common.nickname.wrong}") - private String nickname; -} diff --git a/front/src/main/java/app/module/front/usecase/user/createUser/adapters/web/validator/CreateUserValidator.java b/front/src/main/java/app/module/front/usecase/user/createUser/adapters/web/validator/CreateUserValidator.java deleted file mode 100644 index f39fe7a5..00000000 --- a/front/src/main/java/app/module/front/usecase/user/createUser/adapters/web/validator/CreateUserValidator.java +++ /dev/null @@ -1,46 +0,0 @@ -package app.module.front.usecase.user.createUser.adapters.web.validator; - -import app.module.front.usecase.user.createUser.adapters.web.model.CreateUserReqVO; -import java.util.Optional; -import org.springframework.stereotype.Component; -import org.springframework.validation.Errors; -import org.springframework.validation.Validator; - -@Component -public class CreateUserValidator implements Validator { - - private final String ID_REGEX = "^[a-zA-Z0-9_-]{6,12}$"; - private final String PASSWORD_REGEX = "^((?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%_\\-])\\S{6,15})$"; - private final String EMAIL_REGEX = "^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$"; - - @Override - public boolean supports(Class clazz) { - return CreateUserReqVO.class.equals(clazz); - } - - @Override - public void validate(Object target, Errors errors) { - CreateUserReqVO vo = (CreateUserReqVO) target; - - // 아이디 - Optional.ofNullable(vo.getId()) - .filter(id -> !id.isEmpty() && !id.matches(ID_REGEX)) - .ifPresent(id -> errors.rejectValue("id", "valid.common.id.wrong")); - - // 비밀번호 - Optional.ofNullable(vo.getPassword()) - .filter(password -> !password.isEmpty() && !password.matches(PASSWORD_REGEX)) - .ifPresent(password -> errors.rejectValue("password", "valid.common.password.wrong")); - - // 비밀번호 재확인 - Optional.ofNullable(vo.getPasswordRe()) - .filter(passwordRe -> !passwordRe.isEmpty() && !passwordRe.equals(vo.getPassword())) - .ifPresent( - passwordRe -> errors.rejectValue("passwordRe", "valid.common.re.password.wrong")); - - // 이메일 - Optional.ofNullable(vo.getEmail()) - .filter(email -> !email.isEmpty() && !email.matches(EMAIL_REGEX)) - .ifPresent(email -> errors.rejectValue("email", "valid.common.email.wrong")); - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/createUserUI/adapters/web/CreateUserUIController.java b/front/src/main/java/app/module/front/usecase/user/createUserUI/adapters/web/CreateUserUIController.java deleted file mode 100644 index 2584eaa4..00000000 --- a/front/src/main/java/app/module/front/usecase/user/createUserUI/adapters/web/CreateUserUIController.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.front.usecase.user.createUserUI.adapters.web; - -import app.module.front.usecase.user.createUserUI.adapters.web.model.CreateUserUIReqVO; -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; - -@Controller -@RequiredArgsConstructor -class CreateUserUIController { - - @GetMapping(path = "/user/register") - String operate(Model model, @ModelAttribute("reqVO") CreateUserUIReqVO reqVO) { - - return "user/register"; - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/createUserUI/adapters/web/model/CreateUserUIReqVO.java b/front/src/main/java/app/module/front/usecase/user/createUserUI/adapters/web/model/CreateUserUIReqVO.java deleted file mode 100644 index 606aa745..00000000 --- a/front/src/main/java/app/module/front/usecase/user/createUserUI/adapters/web/model/CreateUserUIReqVO.java +++ /dev/null @@ -1,14 +0,0 @@ -package app.module.front.usecase.user.createUserUI.adapters.web.model; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class CreateUserUIReqVO { - -} diff --git a/front/src/main/java/app/module/front/usecase/user/updateUser/adapters/web/UpdateUserController.java b/front/src/main/java/app/module/front/usecase/user/updateUser/adapters/web/UpdateUserController.java deleted file mode 100644 index ba32089e..00000000 --- a/front/src/main/java/app/module/front/usecase/user/updateUser/adapters/web/UpdateUserController.java +++ /dev/null @@ -1,39 +0,0 @@ -package app.module.front.usecase.user.updateUser.adapters.web; - -import app.module.core.config.application.util.CoreUtil; -import app.module.core.usecase.user.updateFrontUser.ports.UpdateFrontUserPortIn; -import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserInCmd; -import app.module.front.usecase.user.updateUser.adapters.web.model.UpdateUserReqVO; -import app.module.front.usecase.user.updateUser.adapters.web.validator.UpdateUserValidator; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.PatchMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor -class UpdateUserController { - - private final UpdateFrontUserPortIn updateFrontUserPortIn; - private final UpdateUserValidator updateUserValidator; - private final CoreUtil coreUtil; - - @PatchMapping(path = "/api/front/user/update") - ResponseEntity operate(@Valid UpdateUserReqVO reqVO, BindingResult bindingResult) { - - updateUserValidator.validate(reqVO, bindingResult); - if (bindingResult.hasErrors()) { - return coreUtil.getErrorInfo(bindingResult); - } - - updateFrontUserPortIn.operate( - new UpdateFrontUserInCmd( - reqVO.getPassword(), reqVO.getEmail(), reqVO.getNickname(), - reqVO.getFileMappingId())); - - return ResponseEntity.status(HttpStatus.OK).body(reqVO); - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/updateUser/adapters/web/model/UpdateUserReqVO.java b/front/src/main/java/app/module/front/usecase/user/updateUser/adapters/web/model/UpdateUserReqVO.java deleted file mode 100644 index ea4eeed7..00000000 --- a/front/src/main/java/app/module/front/usecase/user/updateUser/adapters/web/model/UpdateUserReqVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package app.module.front.usecase.user.updateUser.adapters.web.model; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Pattern; -import java.util.List; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class UpdateUserReqVO { - - @NotBlank(message = "{valid.common.required}") - private String id; - - private String password; - private String passwordRe; - - @NotBlank(message = "{valid.common.required}") - private String email; - - @NotBlank(message = "{valid.common.required}") - @Pattern(regexp = "^[가-힣a-zA-Z0-9_-]{1,15}$", message = "{valid.common.nickname.wrong}") - private String nickname; - - private List fileMappingId; -} diff --git a/front/src/main/java/app/module/front/usecase/user/updateUser/adapters/web/validator/UpdateUserValidator.java b/front/src/main/java/app/module/front/usecase/user/updateUser/adapters/web/validator/UpdateUserValidator.java deleted file mode 100644 index 9b99c25f..00000000 --- a/front/src/main/java/app/module/front/usecase/user/updateUser/adapters/web/validator/UpdateUserValidator.java +++ /dev/null @@ -1,40 +0,0 @@ -package app.module.front.usecase.user.updateUser.adapters.web.validator; - -import app.module.front.usecase.user.updateUser.adapters.web.model.UpdateUserReqVO; -import java.util.Optional; -import org.springframework.stereotype.Component; -import org.springframework.validation.Errors; -import org.springframework.validation.Validator; - -@Component -public class UpdateUserValidator implements Validator { - - private final String PASSWORD_REGEX = "^((?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%_\\-])\\S{6,15})$"; - private final String EMAIL_REGEX = "^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$"; - - @Override - public boolean supports(Class clazz) { - return UpdateUserReqVO.class.equals(clazz); - } - - @Override - public void validate(Object target, Errors errors) { - UpdateUserReqVO vo = (UpdateUserReqVO) target; - - // 비밀번호 - Optional.ofNullable(vo.getPassword()) - .filter(password -> !password.isEmpty() && !password.matches(PASSWORD_REGEX)) - .ifPresent(password -> errors.rejectValue("password", "valid.common.password.wrong")); - - // 비밀번호 재확인 - Optional.ofNullable(vo.getPasswordRe()) - .filter(passwordRe -> !passwordRe.isEmpty() && !passwordRe.equals(vo.getPassword())) - .ifPresent( - passwordRe -> errors.rejectValue("passwordRe", "valid.common.re.password.wrong")); - - // 이메일 - Optional.ofNullable(vo.getEmail()) - .filter(email -> !email.isEmpty() && !email.matches(EMAIL_REGEX)) - .ifPresent(email -> errors.rejectValue("email", "valid.common.email.wrong")); - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/updateUserUI/adapters/web/UpdateUserUIController.java b/front/src/main/java/app/module/front/usecase/user/updateUserUI/adapters/web/UpdateUserUIController.java deleted file mode 100644 index ab0a8009..00000000 --- a/front/src/main/java/app/module/front/usecase/user/updateUserUI/adapters/web/UpdateUserUIController.java +++ /dev/null @@ -1,29 +0,0 @@ -package app.module.front.usecase.user.updateUserUI.adapters.web; - -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; -import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; -import app.module.core.usecase.user.findUser.ports.FindUserPortIn; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; -import app.module.front.usecase.user.updateUserUI.adapters.web.model.UpdateUserUIReqVO; -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; - -@Controller -@RequiredArgsConstructor -class UpdateUserUIController { - - private final GetHouseholdPortIn getHouseholdPortIn; - - @GetMapping(path = "/user/info") - String operate(Model model, @ModelAttribute("reqVO") UpdateUserUIReqVO reqVO) { - - model.addAttribute("userInfo", - getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow()); - - return "user/info"; - } -} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/user/updateUserUI/adapters/web/model/UpdateUserUIReqVO.java b/front/src/main/java/app/module/front/usecase/user/updateUserUI/adapters/web/model/UpdateUserUIReqVO.java deleted file mode 100644 index 431d9a9b..00000000 --- a/front/src/main/java/app/module/front/usecase/user/updateUserUI/adapters/web/model/UpdateUserUIReqVO.java +++ /dev/null @@ -1,14 +0,0 @@ -package app.module.front.usecase.user.updateUserUI.adapters.web.model; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class UpdateUserUIReqVO { - -} diff --git a/front/src/main/resources/static/assets/images/common/ico_cal_arrow_prev.svg b/front/src/main/resources/static/assets/images/common/ico_cal_arrow_prev.svg new file mode 100644 index 00000000..c6ad94ef --- /dev/null +++ b/front/src/main/resources/static/assets/images/common/ico_cal_arrow_prev.svg @@ -0,0 +1,3 @@ + + + diff --git a/front/src/main/resources/static/ui/ajaxUtil.js b/front/src/main/resources/static/ui/ajaxUtil.js index 17805c1c..d81a84ff 100644 --- a/front/src/main/resources/static/ui/ajaxUtil.js +++ b/front/src/main/resources/static/ui/ajaxUtil.js @@ -39,7 +39,9 @@ var ajaxUtil = { message: alertMessage, type: "alert", callback: function() { - console.log("alert callback"); + if (typeof afterEvent === 'function') { + afterEvent(); + } }, }); } else { @@ -47,7 +49,9 @@ var ajaxUtil = { message: alertMessage, type: "alert", callback: function() { - console.log("alert callback"); + if (typeof afterEvent === 'function') { + afterEvent(); + } }, }); } @@ -161,16 +165,23 @@ var ajaxUtil = { }, 422:function(rstData, status) { console.log(rstData) + /** + * TODO + * 폼이 너무 여러가지 형식이 있는데 서버에러를 가지고 처리하는게 맞는지 검토 필요 + * 코드 정리는 나중에 하려고 그냥 만듬.... 정리 필요. + */ + let isResetDone = false; $(rstData.responseJSON.fieldErrors).each((idx, oj) => { const target = $('[name="' + oj.field + '"]'); - + let infoBox = null; if (!isResetDone) { const formElement = target.closest('form'); if (formElement.length > 0) { $(formElement).find('.component-input').removeClass('input-invalid'); + $(formElement).find('.input-flex-group').removeClass('invalid'); $(formElement).find('.select-group').removeClass('input-invalid'); $(formElement).find('.input-info').each(function () { $(this).remove(); @@ -180,28 +191,44 @@ var ajaxUtil = { } if (target.length > 0) { + const component = target.closest('.component-input'); if(component){ - component.addClass('input-invalid'); - let infoBox = component.find('.input-info'); - if (infoBox.length === 0) { - infoBox = $('
    ').appendTo(component); - } - infoBox.html('
  • ' + oj.message + '
  • '); - } - } + component.addClass('input-invalid'); + //연결된 구조 일 경우 상위에 변경 + if(target.closest('.input-flex-group').length > 0){ + infoBox = target.closest('.input-flex-group').find('.input-info'); + } else { + infoBox = component.find('.input-info'); + } - if (target.data('type') == 'select') { - const component = target.parent().parent().closest('.select-group'); - if(component){ - component.addClass('select-invalid'); - let infoBox = component.find('.input-info'); if (infoBox.length === 0) { - infoBox = $('
      ').appendTo(component); + if(target.closest('.input-flex-group').length > 0){ + infoBox = $('
        ').appendTo(target.closest('.input-flex-group')); + target.closest('.input-flex-group').addClass('invalid'); + } else { + infoBox = $('
          ').appendTo(component); + } } infoBox.html('
        • ' + oj.message + '
        • '); } } + + if (target.data('type') === 'select') { + + const component = target.parent().parent().closest('.select-group'); + if (component) { + component.addClass('select-invalid'); + + infoBox = component.find('.input-info'); + if (infoBox.length === 0) { + infoBox = $('
            ').appendTo(component); + } + + infoBox.html('
          • ' + oj.message + '1111
          • '); + } + + } }); if ($('.input-info').length === 0) { diff --git a/front/src/main/resources/templates/info/user/password.html b/front/src/main/resources/templates/info/user/password.html index c1345fd3..7fde7dba 100644 --- a/front/src/main/resources/templates/info/user/password.html +++ b/front/src/main/resources/templates/info/user/password.html @@ -61,12 +61,12 @@ obj, function (rstData, status) { if(rstData.code ==='SUCCESS'){ - location.href = ENV.httpUrl.user; + location.replace(ENV.httpUrl.user); } else if (rstData.code === 'ERROR'){ if(rstData.message ==='INVALID_PASSWORD'){ - ajaxUtil._alert('비밀번호가 일치하지 않습니다.', '비밀번호 확인'); + ajaxUtil._alert('입력하신 정보가 맞지 않습니다.\n 다시 확인해주세요.',null); } else { - ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', '비밀번호 확인'); + ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null); } } }, diff --git a/front/src/main/resources/templates/info/user/user.html b/front/src/main/resources/templates/info/user/user.html index 4e0ba0e8..58a2feda 100644 --- a/front/src/main/resources/templates/info/user/user.html +++ b/front/src/main/resources/templates/info/user/user.html @@ -10,6 +10,7 @@

            필수입력

            +
            @@ -18,7 +19,7 @@
            - +
            @@ -29,19 +30,21 @@
            - +
            -
            -
            + +
            + @@ -54,12 +57,23 @@
              -
            • option1
            • -
            • option2
            • -
            • option3
            • -
            • option4
            • -
            • option5
            • -
            • option6
            • +
            • 02
            • +
            • 31
            • +
            • 033
            • +
            • 042
            • +
            • 043
            • +
            • 051
            • +
            • 052
            • +
            • 053
            • +
            • 054
            • +
            • 055
            • +
            • 061
            • +
            • 062
            • +
            • 063
            • +
            • 064
            • +
            • 010
            • +
            • 011
            • +
            • 111
            @@ -67,12 +81,12 @@
            - +
            - +
            @@ -80,13 +94,16 @@
            -
            -
            + + +
            + @@ -99,12 +116,8 @@
              -
            • option1
            • -
            • option2
            • -
            • option3
            • -
            • option4
            • -
            • option5
            • -
            • option6
            • +
            • 010
            • +
            • 011
            @@ -112,12 +125,12 @@
            - +
            - +
            @@ -131,7 +144,10 @@ *

            -
            + + +
            + @@ -144,20 +160,20 @@
              -
            • option1
            • -
            • option2
            • -
            • option3
            • -
            • option4
            • -
            • option5
            • -
            • option6
            • -
            • option7
            • + +
            • option1
            • +
            + + +
            -
            +
            + @@ -170,13 +186,10 @@
              -
            • option1
            • -
            • option2
            • -
            • option3
            • -
            • option4
            • -
            • option5
            • -
            • option6
            • -
            • option7
            • + +
            • option1
            • +
              +
            @@ -184,15 +197,16 @@
            - +
            +
            -
            @@ -200,42 +214,147 @@
            + + + + + +
            +
            + + +
            +
            + + + + + + + +
            diff --git a/front/src/main/resources/templates/security/login.html b/front/src/main/resources/templates/security/login.html index d65f65e2..2d843fcf 100644 --- a/front/src/main/resources/templates/security/login.html +++ b/front/src/main/resources/templates/security/login.html @@ -17,13 +17,13 @@
            - - ID +
            - +