diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/updateUser/ports/application/domain/UpdateUserFrontCmd.java b/front/src/main/java/app/module/front/usecase/info/userFront/updateUser/ports/application/domain/UpdateUserFrontCmd.java
index 6120738c..a069b4df 100644
--- a/front/src/main/java/app/module/front/usecase/info/userFront/updateUser/ports/application/domain/UpdateUserFrontCmd.java
+++ b/front/src/main/java/app/module/front/usecase/info/userFront/updateUser/ports/application/domain/UpdateUserFrontCmd.java
@@ -14,7 +14,7 @@ public class UpdateUserFrontCmd extends AuditCommand {
private Integer ownerAge;
private String tel;
private String phone;
- private String regionMainCode;
private String regionSubCode;
+ private String regionDetailCode;
private String address;
}
diff --git a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java
index 6e0692e9..3f42d32f 100644
--- a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java
+++ b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java
@@ -42,8 +42,8 @@ class UpdateUserController {
reqVO.getOwnerAge(),
reqVO.getTel1() + '-'+ reqVO.getTel2() + '-' + reqVO.getTel3(),
reqVO.getPhone1() + '-'+ reqVO.getPhone2() + '-' + reqVO.getPhone3(),
- reqVO.getRegionMainCode(),
reqVO.getRegionSubCode(),
+ reqVO.getRegionDetailCode(),
reqVO.getAddress()
));
diff --git a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserUIController.java b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserUIController.java
index 9a7ab339..7e4eb5e3 100644
--- a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserUIController.java
+++ b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserUIController.java
@@ -1,8 +1,7 @@
package app.module.front.usecase.info.userUI.updateUserUI.adapters.web;
-import app.module.core.config.application.enums.UiCodeType;
import app.module.core.config.application.util.CommonUtil;
-import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
+import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn;
import app.module.front.usecase.info.userFront.getUserFront.ports.GetUserFrontPortIn;
import app.module.front.usecase.info.userFront.getUserFront.ports.application.domain.GetUserFrontCmd;
import jakarta.servlet.http.HttpServletRequest;
@@ -14,12 +13,9 @@ import org.springframework.web.bind.annotation.GetMapping;
@Controller
@RequiredArgsConstructor
class UpdateUserUIController {
-
- private final UICodeListPortIn uiCodeListPortIn;
-
+ private final UICodeTopTierPortIn uiCodeTopTierPortIn;
private final GetUserFrontPortIn getUserPortIn;
-
@GetMapping(path = "/info/user")
String operate(Model model, HttpServletRequest request) {
@@ -28,9 +24,8 @@ class UpdateUserUIController {
return "redirect:/"; // 요청 처리 중단
}
-
- model.addAttribute("regionMainList",uiCodeListPortIn.connect(UiCodeType.REGION_MAIN.getCode()));
- model.addAttribute("regionSubList",uiCodeListPortIn.connect(UiCodeType.REGION_SUB.getCode()));
+ // 지역 + 세부지역 공통코드
+ model.addAttribute("regionSubList", uiCodeTopTierPortIn.connect("code.region.sub"));
model.addAttribute("userInfo",
getUserPortIn.operate(new GetUserFrontCmd(CommonUtil.getLoginUsername())).orElseThrow());
diff --git a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java
index 041b0c64..ed3f7a19 100644
--- a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java
+++ b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java
@@ -38,12 +38,12 @@ public class UpdateUserReqVO {
private String phone3;
@NotBlank(message = "지역을 선택해주세요.")//"시/도는 필수 항목입니다.")
- @Pattern(regexp = "^code\\.region\\.main\\.\\d+$", message = "지역을 선택해주세요.")//"시/도 형식이 올바르지 않습니다.")
- private String regionMainCode;
+ @Pattern(regexp = "^code\\.region\\.sub\\.\\d+$", message = "지역을 선택해주세요.")//"시/도 형식이 올바르지 않습니다.")
+ private String regionSubCode;
@NotBlank(message = "세부 지역을 선택해주세요.")//"시/군/구는 필수 항목입니다.")
- @Pattern(regexp = "^code\\.region\\.sub\\.\\d+$", message = "세부 지역을 선택해주세요.")//"시/군/구 형식이 올바르지 않습니다.")
- private String regionSubCode;
+ @Pattern(regexp = "^code\\.region\\.detail\\.\\d+$", message = "세부 지역을 선택해주세요.")//"시/군/구 형식이 올바르지 않습니다.")
+ private String regionDetailCode;
@NotBlank(message = "전체 주소를 입력해주세요.")//"주소는 필수 항목입니다.")
@Size(max = 255, message = "전체 주소를 입력해주세요.")//"주소는 255자 이하여야 합니다.")
diff --git a/front/src/main/resources/mappers/userFront/UpdateUserMapper.xml b/front/src/main/resources/mappers/userFront/UpdateUserMapper.xml
index 436d59c7..5e1afdf6 100644
--- a/front/src/main/resources/mappers/userFront/UpdateUserMapper.xml
+++ b/front/src/main/resources/mappers/userFront/UpdateUserMapper.xml
@@ -11,8 +11,8 @@
owner_age = #{ownerAge},
tel = #{tel},
phone = #{phone},
- region_main_code = #{regionMainCode},
region_sub_code = #{regionSubCode},
+ region_detail_code = #{regionDetailCode},
address = #{address},
- 도로명 주소 + 주소 *