관리자 작업 중

This commit is contained in:
kangsunlee
2025-06-10 19:22:38 +09:00
parent a8e29ec69c
commit 43ed02600c
25 changed files with 527 additions and 421 deletions

View File

@@ -6,6 +6,7 @@ import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.util.MessageUtil;
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn;
import app.module.core.usecase.role.list.ports.RoleListPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
@@ -22,6 +23,7 @@ public class AdminCreatePostController {
private final RoleListPortIn roleListPortIn;
private final MessageUtil messageUtil;
private final SaveAdminPortIn savePortIn;
private final UICodeListPortIn uiCodeListPortIn;
private final AdminCreateValidator adminCreateValidator;
@PostMapping(path = "/settings/admins/create")
@@ -34,6 +36,7 @@ public class AdminCreatePostController {
adminCreateValidator.validate(bindingVO, bindingResult);
if (bindingResult.hasErrors()) {
model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN));
model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main"));
return "admin/adminCreateForm";
}
@@ -42,6 +45,7 @@ public class AdminCreatePostController {
bindingVO.getId(),
bindingVO.getPassword(),
bindingVO.getEmail(),
bindingVO.getRegionMainCode(),
bindingVO.getAccountDisabled(),
bindingVO.getAccountLocked(),
bindingVO.getRoleIds());

View File

@@ -9,6 +9,7 @@ import app.module.core.config.application.util.MessageUtil;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
import app.module.core.usecase.role.list.ports.RoleListPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import java.util.NoSuchElementException;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
@@ -24,6 +25,7 @@ class AdminUpdateGetController {
private final AdminViewPortIn adminViewPortIn;
private final RoleListPortIn roleListPortIn;
private final UICodeListPortIn uiCodeListPortIn;
private final MessageUtil messageUtil;
@GetMapping(path = "/settings/admins/update/{adminId}")
@@ -52,6 +54,7 @@ class AdminUpdateGetController {
output.getId(),
null,
output.getEmail(),
output.getRegionMainCode(),
output.getPasswordUpdatedAt(),
output.getAccountDisabled(),
output.getLoginFailCnt(),
@@ -60,6 +63,7 @@ class AdminUpdateGetController {
model.addAttribute("bindingVO", bindingVO);
model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN));
model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main"));
return "admin/adminUpdateForm";
}

View File

@@ -1,11 +1,13 @@
package app.module.admin.usecase.admin.saveAdmin.adapters.web;
import app.module.admin.usecase.admin.getAdmins.adapters.web.model.AdminListFilterVO;
import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO;
import app.module.admin.usecase.admin.saveAdmin.adapters.web.validator.AdminUpdateValidator;
import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.util.MessageUtil;
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn;
import app.module.core.usecase.role.list.ports.RoleListPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
@@ -21,6 +23,7 @@ class AdminUpdatePostController {
private final AdminUpdateValidator adminUpdateValidator;
private final RoleListPortIn roleListPortIn;
private final UICodeListPortIn uiCodeListPortIn;
private final SaveAdminPortIn saveAdminPortIn;
private final MessageUtil messageUtil;
@@ -34,6 +37,7 @@ class AdminUpdatePostController {
adminUpdateValidator.validate(bindingVO, bindingResult);
if (bindingResult.hasErrors()) {
model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN));
model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main"));
return "admin/adminUpdateForm";
}
@@ -42,6 +46,7 @@ class AdminUpdatePostController {
bindingVO.getId(),
bindingVO.getUpdatePassword(),
bindingVO.getEmail(),
bindingVO.getRegionMainCode(),
bindingVO.getAccountDisabled(),
bindingVO.getAccountLocked(),
bindingVO.getRoleIds());

View File

@@ -21,9 +21,9 @@ public class AdminCreateBindingVO {
"^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$",
message = "{valid.common.email.wrong}")
private String email;
private String regionMainCode;
private Boolean accountDisabled;
private Boolean accountLocked;
private List<String> roleIds;
private String regionMainCode;
}

View File

@@ -32,6 +32,7 @@ public class AdminUpdateBindingVO implements AuditOutput {
"^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$",
message = "{valid.common.email.wrong}")
private String email;
private String regionMainCode;
private LocalDateTime passwordUpdatedAt;
private Boolean accountDisabled;

View File

@@ -24,14 +24,23 @@ public class AdminCreateValidator implements Validator {
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "valid.common.required");
Optional.ofNullable(vo.getPassword())
.filter(password -> !password.matches(PASSWORD_REGEX))
.ifPresent(password -> errors.rejectValue("password", "valid.common.password.wrong"));
.filter(password -> !password.matches(PASSWORD_REGEX))
.ifPresent(password -> errors.rejectValue("password", "valid.common.password.wrong"));
Optional.ofNullable(vo.getRoleIds())
.filter(ids -> ids.size() < 1)
.ifPresent(
ids ->
errors.rejectValue(
"roleIds", "valid.common.required.size.min", new Object[]{1}, ""));
.filter(ids -> ids.size() < 1)
.ifPresent(
ids ->
errors.rejectValue(
"roleIds", "valid.common.required.size.min", new Object[]{1}, ""));
// ROLE_ADMIN이 아닌 경우 regionMainCode null체크
Optional.ofNullable(vo.getRoleIds())
.filter(ids -> ids.stream().noneMatch(role -> role.equals("ROLE_ADMIN")))
.ifPresent(nonAdmins -> {
if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) {
errors.rejectValue("regionMainCode", "valid.common.required");
}
});
}
}

View File

@@ -30,5 +30,14 @@ public class AdminUpdateValidator implements Validator {
Optional.ofNullable(vo.getUpdatePassword())
.filter(s -> !s.trim().isEmpty() && !s.matches(PASSWORD_REGEX))
.ifPresent(s -> errors.rejectValue("updatePassword", "valid.common.password.wrong"));
// ROLE_ADMIN이 아닌 경우 regionMainCode null체크
Optional.ofNullable(vo.getRoleIds())
.filter(ids -> ids.stream().noneMatch(role -> role.equals("ROLE_ADMIN")))
.ifPresent(nonAdmins -> {
if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) {
errors.rejectValue("regionMainCode", "valid.common.required");
}
});
}
}