diff --git a/admin/src/main/java/app/module/admin/usecase/admin/checkAdminId/adapters/web/AdminIdDuplicateCheckPostController.java b/admin/src/main/java/app/module/admin/usecase/admin/checkAdminId/adapters/web/AdminIdDuplicateCheckPostController.java new file mode 100644 index 00000000..1881e478 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/admin/checkAdminId/adapters/web/AdminIdDuplicateCheckPostController.java @@ -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)); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminListController.java b/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminListController.java index f00d6a39..a94efe2b 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminListController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminListController.java @@ -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"; } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java index c96fe152..f2bf0764 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java @@ -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")); diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java index 5a510cab..f2c474b3 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java @@ -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())); } } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java index f88e4c4c..e8ab7a40 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java @@ -53,6 +53,8 @@ class AdminUpdateGetController { output.getSeq(), output.getId(), null, + output.getName(), + output.getPhone(), output.getRegionMainCode(), output.getPasswordUpdatedAt(), output.getAccountDisabled(), diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java index 6919bb25..07bb43d9 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java @@ -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", diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java index 6698327e..f4830b3d 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java @@ -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 roleIds; - private String regionMainCode; + private String roleId; } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java index a4379a44..b94bf5f2 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java index 7780d5df..cebedec0 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java @@ -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","실사지역은 필수입력값입니다."); } }); } diff --git a/admin/src/main/resources/templates/admin/adminCreateForm.html b/admin/src/main/resources/templates/admin/adminCreateForm.html index 483cef24..89401d56 100644 --- a/admin/src/main/resources/templates/admin/adminCreateForm.html +++ b/admin/src/main/resources/templates/admin/adminCreateForm.html @@ -7,27 +7,28 @@
+ th:object="${bindingVO}" + name="adminCreateForm"> - + @@ -61,11 +67,51 @@ 에러 메세지 + 총 5자 / 숫자 + 특수문자 1개 이상 (!,@,#,$,%,_,-) + + + + + + + + + th:classappend="${bindingVO.roleId != 'ROLE_ADMIN'} ? 'd-none'"> diff --git a/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java b/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java index 8c921526..02c0e791 100644 --- a/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java +++ b/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java @@ -43,13 +43,13 @@ class AdminAuthFailHandlerTest { @BeforeAll public void beforeAll() { - saveAdminPortIn.connect( + /* saveAdminPortIn.connect( 1L, testUsername, "test.1@#$", null, false, - Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); + Arrays.asList("ROLE_SUPER", "ROLE_STAFF"));*/ } @Test diff --git a/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java b/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java index c73fb3b9..daad7bfd 100644 --- a/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java +++ b/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java @@ -38,13 +38,13 @@ class AdminDetailsServiceTest { @BeforeAll public void beforeAll() { - saveAdminPortIn.connect( + /* saveAdminPortIn.connect( 1L, username, password, null, false, - Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); + Arrays.asList("ROLE_SUPER", "ROLE_STAFF"));*/ } diff --git a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java index 7a80d20e..5f4f086c 100644 --- a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java +++ b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java @@ -34,7 +34,7 @@ class AdminCreateUpdateDaoTest { @DisplayName("operate - AdminCreateDao") void operate() { - saveAdminPortIn.connect( + /* saveAdminPortIn.connect( 1L, "admin_for_createDao_test", "test.1@#$", @@ -60,6 +60,6 @@ class AdminCreateUpdateDaoTest { assertEquals( 1, adminViewPortIn.connect("admin_for_createDao_test").orElseThrow().getRoles().size(), - "기존 권한들을 (내부적으로) 삭제하고 새로이 추가 등록되기에 withRoles 의 size 는 1이다."); + "기존 권한들을 (내부적으로) 삭제하고 새로이 추가 등록되기에 withRoles 의 size 는 1이다.");*/ } } diff --git a/api/src/main/resources/messages/validation.properties b/api/src/main/resources/messages/validation.properties index c4aa2c2a..93951883 100644 --- a/api/src/main/resources/messages/validation.properties +++ b/api/src/main/resources/messages/validation.properties @@ -4,7 +4,7 @@ valid.common.required.size.min={0} \uAC1C \uC774\uC0C1 \uD56D\uBAA9\uC774 \uD544 valid.common.required.remove.item=\uC0AD\uC81C\uD560 \uC544\uC774\uD15C\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. valid.common.email.wrong=\uC774\uBA54\uC77C \uD615\uC2DD\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. valid.common.nickname.wrong=\uB2C9\uB124\uC784(2-10\uAE00\uC790)\uC740 \uD55C\uAE00,\uC601\uC5B4 \uB300\uC18C\uBB38\uC790, -, _ \uB9CC \uC785\uB825\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. -valid.common.password.wrong=6\uC790 \uC774\uC0C1 15\uC790 \uC774\uD558 \uB300,\uC18C,\uD2B9\uC218\uBB38\uC790\uAC00 \uD3EC\uD568 \uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4. +valid.common.password.wrong=\uCD1D 5\uC790 / \uC22B\uC790 + \uD2B9\uC218\uBB38\uC790 1\uAC1C \uC774\uC0C1 (!,@,#,$,%,_,-)\uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4. valid.common.already.exists=\uC774\uBBF8 \uB4F1\uB85D\uB41C {0} \uC785\uB2C8\uB2E4. valid.common.endWith.not=\uB9C8\uC9C0\uB9C9\uC774 "{0}"\uC73C\uB85C \uB05D\uB098\uC11C\uB294 \uC548\uB429\uB2C8\uB2E4. valid.common.date.invalid=\uAC8C\uC2DC\uC77C\uC744 \uD655\uC778\uD574 \uC8FC\uC138\uC694. diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java index 1e8a3f13..cbba7c02 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java @@ -27,7 +27,7 @@ public class InitAdminData implements ApplicationRunner { return; } - // 관리자 +/* // 관리자 saveAdminPortIn.connect( null, "test-admin", @@ -52,6 +52,6 @@ public class InitAdminData implements ApplicationRunner { "researcher1@#$", "code.region.main.1", false, - List.of("ROLE_RESEARCHER")); + List.of("ROLE_RESEARCHER"));*/ } } diff --git a/core/src/main/java/app/module/core/usecase/admin/checkAdminId/persistence/CheckAdminIdDao.java b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/persistence/CheckAdminIdDao.java new file mode 100644 index 00000000..637df81c --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/persistence/CheckAdminIdDao.java @@ -0,0 +1,19 @@ +package app.module.core.usecase.admin.checkAdminId.persistence; + +import app.module.core.usecase.admin.checkAdminId.ports.CheckAdminIdPortOut; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +@Component +@RequiredArgsConstructor +class CheckAdminIdDao implements CheckAdminIdPortOut { + + private final CheckAdminIdMapper mapper; + + @Override + @Transactional + public Integer connect(String id) { + return mapper.checkAdminId(id); + } +} diff --git a/core/src/main/java/app/module/core/usecase/admin/checkAdminId/persistence/CheckAdminIdMapper.java b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/persistence/CheckAdminIdMapper.java new file mode 100644 index 00000000..f6ae3017 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/persistence/CheckAdminIdMapper.java @@ -0,0 +1,8 @@ +package app.module.core.usecase.admin.checkAdminId.persistence; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CheckAdminIdMapper { + Integer checkAdminId(String id); +} diff --git a/core/src/main/java/app/module/core/usecase/admin/checkAdminId/persistence/model/DeleteAdminHasRoleParam.java b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/persistence/model/DeleteAdminHasRoleParam.java new file mode 100644 index 00000000..ab08a0e8 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/persistence/model/DeleteAdminHasRoleParam.java @@ -0,0 +1,13 @@ +package app.module.core.usecase.admin.checkAdminId.persistence.model; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class DeleteAdminHasRoleParam extends AuditCommand { + private Long adminSeq; +} diff --git a/core/src/main/java/app/module/core/usecase/admin/checkAdminId/persistence/model/SaveAdminHasRoleParam.java b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/persistence/model/SaveAdminHasRoleParam.java new file mode 100644 index 00000000..e36ebcaf --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/persistence/model/SaveAdminHasRoleParam.java @@ -0,0 +1,16 @@ +package app.module.core.usecase.admin.checkAdminId.persistence.model; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +@Getter +@Setter +@AllArgsConstructor +public class SaveAdminHasRoleParam extends AuditCommand { + private Long adminSeq; + private List roleIds; +} diff --git a/core/src/main/java/app/module/core/usecase/admin/checkAdminId/ports/CheckAdminIdPortIn.java b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/ports/CheckAdminIdPortIn.java new file mode 100644 index 00000000..58f684c0 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/ports/CheckAdminIdPortIn.java @@ -0,0 +1,7 @@ +package app.module.core.usecase.admin.checkAdminId.ports; + + +public interface CheckAdminIdPortIn { + + Integer connect(String id); +} diff --git a/core/src/main/java/app/module/core/usecase/admin/checkAdminId/ports/CheckAdminIdPortOut.java b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/ports/CheckAdminIdPortOut.java new file mode 100644 index 00000000..1cf26d9f --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/ports/CheckAdminIdPortOut.java @@ -0,0 +1,5 @@ +package app.module.core.usecase.admin.checkAdminId.ports; + +public interface CheckAdminIdPortOut { + Integer connect(String id); +} diff --git a/core/src/main/java/app/module/core/usecase/admin/checkAdminId/ports/application/CheckAdminIdService.java b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/ports/application/CheckAdminIdService.java new file mode 100644 index 00000000..b35ac134 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/admin/checkAdminId/ports/application/CheckAdminIdService.java @@ -0,0 +1,17 @@ +package app.module.core.usecase.admin.checkAdminId.ports.application; + +import app.module.core.usecase.admin.checkAdminId.ports.CheckAdminIdPortIn; +import app.module.core.usecase.admin.checkAdminId.ports.CheckAdminIdPortOut; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class CheckAdminIdService implements CheckAdminIdPortIn { + + private final CheckAdminIdPortOut checkAdminIdPortOut; + @Override + public Integer connect(String id) { + return checkAdminIdPortOut.connect(id); + } +} diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java index 8dabfdfe..66a4b1e4 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java @@ -28,17 +28,17 @@ class SaveAdminDao implements SaveAdminPortOut { mapper.deleteAdminRolesByAdminId( AuditUtil.delete(new DeleteAdminHasRoleParam(cmd.getSeq()))); - if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) { + if (!cmd.getRoleId().isEmpty()) { mapper.insertAdminHasRoles( - AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleIds()))); + AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleId()))); } } else { // create mapper.insertAdmin(AuditUtil.create(cmd)); - if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) { + if (!cmd.getRoleId().isEmpty()) { mapper.insertAdminHasRoles( - AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleIds()))); + AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleId()))); } } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java index e1211f5f..ab6d1032 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java @@ -12,5 +12,5 @@ import lombok.Setter; @AllArgsConstructor public class SaveAdminHasRoleParam extends AuditCommand { private Long adminSeq; - private List roleIds; + private String roleId; } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/SaveAdminPortIn.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/SaveAdminPortIn.java index 5abd145a..4cbeb5c3 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/SaveAdminPortIn.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/SaveAdminPortIn.java @@ -1,14 +1,14 @@ package app.module.core.usecase.admin.saveAdmin.ports; -import java.util.List; - public interface SaveAdminPortIn { - String connect( - Long seq, - String id, - String password, - String regionMainCode, - Boolean accountDisabled, - List roleIds); + String apiConnect( + Long seq, + String id, + String password, + String name, + String phone, + String regionMainCode, + Boolean accountDisabled, + String roleId); } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java index 128fcd37..8c25cf97 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java @@ -6,7 +6,6 @@ import app.module.core.usecase.admin.saveAdmin.ports.application.domain.SaveAdmi import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; import java.time.LocalDateTime; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; @@ -20,14 +19,10 @@ public class SaveAdminService implements SaveAdminPortIn { private final BCryptPasswordEncoder passwordEncoder; private final AdminViewPortIn adminViewPortIn; + @Override - public String connect( - Long seq, - String id, - String password, - String regionMainCode, - Boolean accountDisabled, - List roleIds) { + public String apiConnect(Long seq, String id, String password, String name, String phone, String regionMainCode, Boolean accountDisabled, String roleId) { + LocalDateTime passwordUpdatedAt; Integer loginFailCnt; @@ -51,15 +46,19 @@ public class SaveAdminService implements SaveAdminPortIn { } return saveAdminPortOut.connect( - new SaveAdminCmd( - seq, - id, - password, - passwordUpdatedAt, - regionMainCode, - accountDisabled, - loginFailCnt, - roleIds - )); + new SaveAdminCmd( + seq, + id, + password, + passwordUpdatedAt, + name, + phone, + regionMainCode, + accountDisabled, + loginFailCnt, + roleId + )); } + + } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java index bb91497b..9c742d90 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java @@ -16,9 +16,11 @@ public class SaveAdminCmd extends AuditCommand { private String encodedPassword; private LocalDateTime passwordUpdatedAt; /* private String email;*/ + private String name; + private String phone; private String regionMainCode; private Boolean accountDisabled; private Integer loginFailCnt; /* private Boolean accountLocked;*/ - private List roleIds; + private String roleId; } diff --git a/core/src/main/resources/mappers/admin/CheckAdminIdMapper.xml b/core/src/main/resources/mappers/admin/CheckAdminIdMapper.xml new file mode 100644 index 00000000..fb48142e --- /dev/null +++ b/core/src/main/resources/mappers/admin/CheckAdminIdMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml index 0bfbf1b7..3bf7a07b 100644 --- a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml +++ b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml @@ -12,6 +12,8 @@ INSERT INTO admin (seq, id, password, + name, + phone, region_main_code, password_updated_at, account_disabled, @@ -20,6 +22,8 @@ VALUES (#{seq}, #{id}, #{encodedPassword}, + #{name}, + #{phone}, #{regionMainCode}, #{passwordUpdatedAt}, #{accountDisabled}, @@ -32,6 +36,8 @@ UPDATE admin SET password = #{encodedPassword}, + name = #{name}, + phone = #{phone}, region_main_code = #{regionMainCode}, password_updated_at = #{passwordUpdatedAt}, account_disabled = #{accountDisabled}, @@ -48,14 +54,12 @@ role_id, ) VALUES - ( nextval('admin_has_role_seq'), #{adminSeq}, #{roleId}, ) -
-
-
+
에러 메세지
@@ -40,13 +41,18 @@
+
에러 메세지
+ 4~15자 / 영문,숫자,한글 가능/ 특수문자 _,- 사용가능
+
+
+ +
+ 에러 메세지 +
+
+
+
+ 010- +
+
+ +
+
+
+
+ +
+
+
+ 에러 메세지
@@ -118,7 +164,7 @@ -
@@ -137,14 +183,69 @@ } $(document).ready(() => { - const roleSelect = document.getElementById('roleIds'); + const roleSelect = document.getElementById('roleId'); onRoleChange(roleSelect); + }); const onRoleChange = (el) => { const selectedValues = Array.from(el.selectedOptions).map(option => option.value); const isAdmin = !selectedValues.length || selectedValues.includes('ROLE_ADMIN'); + const idResearcher = !selectedValues.length || selectedValues.includes('ROLE_RESEARCHER'); $('.regionMainCodeArea').toggle(!isAdmin); + $('.researcherArea').toggle(idResearcher); }; + + let checkDuplicate = false; + + const adminIdCheckDuplicate = () => { + const f = document.adminCreateForm; + if (!f.id.value) { + alert("아이디를 입력해주세요."); + return; + } + ajaxUtil._ajaxMethod( + '/api/settings/admin/idCheck', + { id : f.id.value }, + function(response) { // 성공 + const message = response > 0 + ? "이미 사용하고 있는 아이디 입니다. 아이디를 입력해주세요." + : "사용 가능한 아이디입니다."; + alert(message); + checkDuplicate = response <= 0; + }, + function (code, rstData) { + console.log("error : ", code); + if(code == 400) alert("아이디를 입력해주세요."); + }, + 'get', + 'json' + ); + } + const createAdmin = () => { + if (!checkDuplicate) { + alert("아이디 중복 확인을 해주세요."); + return false; + } + + const f = document.adminCreateForm; + let dataOj = $(f).serializeObject(); + + ajaxUtil._ajaxMethod( + '/api/settings/admin/create', + JSON.stringify(dataOj), + function(response) { // 성공 + alert("등록이 완료되었습니다."); + location.href = '/settings/admins'; + }, + function (code, rstData) { + if(code == 422) alert(rstData.responseText); + if(code == 400) alert(rstData.responseJSON.message); + }, + 'post', + 'json', + { handle422Type: 'alert' } + ); + } diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index 051725b3..da575633 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -17,14 +17,26 @@
-

+

권한

+
+
+ +
+
+
+
+

@@ -38,13 +50,25 @@
-

권한

+

실사

- - + + +
+
+
+
+

계정사용여부

+
+
+
diff --git a/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html b/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html index f8a38122..63bb2094 100644 --- a/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html +++ b/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html @@ -32,7 +32,11 @@
내용 - +
+
+ +
+