관리자 등록 ,목록 수정

This commit is contained in:
주수현
2025-06-19 20:27:47 +09:00
parent 2402be3b44
commit 68b396921f
31 changed files with 400 additions and 112 deletions

View File

@@ -0,0 +1,23 @@
package app.module.admin.usecase.admin.checkAdminId.adapters.web;
import app.module.core.usecase.admin.checkAdminId.ports.CheckAdminIdPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
@RequiredArgsConstructor
class AdminIdDuplicateCheckPostController {
private final CheckAdminIdPortIn checkAdminIdPortIn;
@GetMapping("/api/settings/admin/idCheck")
ResponseEntity<?> updateMappingHousehold(@RequestParam String id ) {
return ResponseEntity.status(HttpStatus.OK).body(checkAdminIdPortIn.connect(id));
}
}

View File

@@ -42,6 +42,7 @@ class AdminListController {
model.addAttribute("listOutput", listOutput);
model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN));
model.addAttribute("pageRows", uiCodeListPortIn.connect("code.pageable.rows"));
model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main"));
return "admin/adminList";
}

View File

@@ -18,8 +18,10 @@ public class AdminCreateGetController {
private final UICodeListPortIn uiCodeListPortIn;
@GetMapping(path = "/settings/admins/create")
String operate(Model model, @ModelAttribute("bindingVO") AdminCreateBindingVO bindingVO) {
String operate(Model model) {
AdminCreateBindingVO bindingVO = new AdminCreateBindingVO();
model.addAttribute("bindingVO", bindingVO);
model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN));
model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main"));

View File

@@ -9,49 +9,44 @@ 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 lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
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.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
@Controller
@Slf4j
@RestController
@RequiredArgsConstructor
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")
String operate(
RedirectAttributes redirectAttributes,
Model model,
@Valid @ModelAttribute("bindingVO") AdminCreateBindingVO bindingVO,
BindingResult bindingResult) {
@PostMapping(path = "/api/settings/admin/create")
ResponseEntity<?> operate(@RequestBody AdminCreateBindingVO bindingVO, BindingResult bindingResult ) {
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";
log.info("############Binding errors: {}", bindingResult.getAllErrors());
log.info("Binding 메세지 errors: {}", bindingResult.getAllErrors().get(0).getDefaultMessage());
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getAllErrors().get(0).getDefaultMessage());
}
savePortIn.connect(
bindingVO.getSeq(),
bindingVO.getId(),
bindingVO.getPassword(),
bindingVO.getRegionMainCode(),
bindingVO.getAccountDisabled(),
bindingVO.getRoleIds());
redirectAttributes.addFlashAttribute(
"operationMessage",
messageUtil.getMessage("operation.settings.admin.created", bindingVO.getId()));
return "redirect:/settings/admins";
return ResponseEntity.status(HttpStatus.OK).body(
savePortIn.apiConnect(bindingVO.getSeq(),
bindingVO.getId(),
bindingVO.getPassword(),
bindingVO.getName(),
"010"+bindingVO.getPhone1()+bindingVO.getPhone2(),
bindingVO.getRegionMainCode(),
bindingVO.getAccountDisabled(),
bindingVO.getRoleId()));
}
}

View File

@@ -53,6 +53,8 @@ class AdminUpdateGetController {
output.getSeq(),
output.getId(),
null,
output.getName(),
output.getPhone(),
output.getRegionMainCode(),
output.getPasswordUpdatedAt(),
output.getAccountDisabled(),

View File

@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import java.util.stream.Collectors;
@Controller
@RequiredArgsConstructor
class AdminUpdatePostController {
@@ -40,13 +42,15 @@ class AdminUpdatePostController {
return "admin/adminUpdateForm";
}
saveAdminPortIn.connect(
saveAdminPortIn.apiConnect(
bindingVO.getSeq(),
bindingVO.getId(),
bindingVO.getUpdatePassword(),
bindingVO.getName(),
bindingVO.getPhone(),
bindingVO.getRegionMainCode(),
bindingVO.getAccountDisabled(),
bindingVO.getRoleIds());
bindingVO.getRoleIds().stream().collect(Collectors.joining()));
redirectAttributes.addFlashAttribute(
"operationMessage",

View File

@@ -1,20 +1,23 @@
package app.module.admin.usecase.admin.saveAdmin.adapters.web.model;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class AdminCreateBindingVO {
private Long seq;
private String id;
private String password;
private String name;
private String phone1;
private String phone2;
private String regionMainCode;
/* @NotBlank(message = "{valid.common.required}")
@Pattern(
regexp =
@@ -24,6 +27,5 @@ public class AdminCreateBindingVO {
private Boolean accountDisabled;
/* private Boolean accountLocked;*/
private List<String> roleIds;
private String regionMainCode;
private String roleId;
}

View File

@@ -32,6 +32,8 @@ 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 name;
private String phone;
private String regionMainCode;
private LocalDateTime passwordUpdatedAt;

View File

@@ -10,7 +10,10 @@ import org.springframework.validation.Validator;
@Component
public class AdminCreateValidator implements Validator {
private final String PASSWORD_REGEX = "^((?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%_\\-])\\S{6,15})$";
// 아이디: 4~15자, 영문/숫자/한글/특수문자(_,-) 허용
private final String ID_REGEX = "^[a-zA-Z0-9가-힣_-]{4,15}$";
// 비밀번호: 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상
private final String PASSWORD_REGEX = "^(?=.*[0-9])(?=.*[!@#$%_\\-]).{5}$";
@Override
public boolean supports(Class<?> clazz) {
@@ -21,25 +24,47 @@ public class AdminCreateValidator implements Validator {
public void validate(Object target, Errors errors) {
AdminCreateBindingVO vo = (AdminCreateBindingVO) target;
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "valid.common.required");
if (vo.getRoleId() == null || vo.getRoleId().isEmpty()) {
errors.rejectValue("roleId", "error.roleId", "권한을 선택해주세요.");
}
if (vo.getAccountDisabled() == null ) {
errors.rejectValue("accountDisabled", "error.accountDisabled", "사용여부를 선택해주세요.");
}
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "id", "valid.common.required","아이디는 필수입력값입니다.");
Optional.ofNullable(vo.getId())
.filter(id -> !id.matches(ID_REGEX))
.ifPresent(id -> errors.rejectValue("id", "valid.common.id.wrong","아이디를 4~15자, 영문/숫자/한글/특수문자(_,-) 입니다."));
// 비밀번호 유효성 검사
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"));
Optional.ofNullable(vo.getRoleIds())
.filter(ids -> ids.size() < 1)
.ifPresent(
ids ->
errors.rejectValue(
"roleIds", "valid.common.required.size.min", new Object[]{1}, ""));
.ifPresent(password -> errors.rejectValue("password", "valid.common.password.wrong","비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다."));
if (vo.getRoleId() != null && "ROLE_RESEARCHER".equals(vo.getRoleId())) {
if (vo.getName() == null || vo.getName().isBlank()) {
errors.rejectValue("name", "error.name", "이름을 입력해주세요.");
}
if (vo.getPhone1() == null || vo.getPhone1().isBlank()) {
errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리를 입력해주세요.");
} else if (!vo.getPhone1().matches("^\\d{4}$")) {
errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리는 4자리 숫자여야 합니다.");
}
if (vo.getPhone2() == null || vo.getPhone2().isBlank()) {
errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리를 입력해주세요.");
} else if (!vo.getPhone2().matches("^\\d{4}$")) {
errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리는 4자리 숫자여야 합니다.");
}
}
// ROLE_ADMIN이 아닌 경우 regionMainCode null체크
Optional.ofNullable(vo.getRoleIds())
.filter(ids -> ids.stream().noneMatch(role -> role.equals("ROLE_ADMIN")))
Optional.ofNullable(vo.getRoleId())
.filter(id -> !id.equals("ROLE_ADMIN"))
.ifPresent(nonAdmins -> {
if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) {
errors.rejectValue("regionMainCode", "valid.common.required");
errors.rejectValue("regionMainCode", "valid.common.required","실사지역은 필수입력값입니다.");
}
});
}