내정보, 비밀번호 확인, 내정보 수정 : UX에 따라 수정 필요.

This commit is contained in:
DESKTOP-E9DJS27\etribe
2025-06-14 11:18:58 +09:00
parent 7ab2739e2a
commit 2c7c7894df
25 changed files with 429 additions and 477 deletions

View File

@@ -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);
}
}

View File

@@ -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;
}

View File

@@ -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 {
}

View File

@@ -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));
}
}

View File

@@ -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());

View File

@@ -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;
}

View File

@@ -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);
}
}

View File

@@ -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;
}

View File

@@ -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"));
}
}

View File

@@ -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";
}
}

View File

@@ -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 {
}

View File

@@ -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);
}
}

View File

@@ -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<String> fileMappingId;
}

View File

@@ -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"));
}
}

View File

@@ -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";
}
}

View File

@@ -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 {
}