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 index 3b3ce20d..6a179aed 100644 --- 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 @@ -15,9 +15,17 @@ import org.springframework.web.bind.annotation.RestController; class AdminIdDuplicateCheckPostController { private final CheckAdminIdPortIn checkAdminIdPortIn; + private final String ID_REGEX = "^[a-zA-Z0-9가-힣_-]{4,15}$"; + private final String INVALID_ID_MSG = "아이디는 4~15자, 영문/숫자/한글/특수문자(_,-)만 가능합니다."; @GetMapping("/api/settings/admin/idCheck") ResponseEntity selectIdCheck(@RequestParam String id ) { + if (!id.matches(ID_REGEX)) { + return ResponseEntity + .status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(INVALID_ID_MSG); + } + return ResponseEntity.status(HttpStatus.OK).body(checkAdminIdPortIn.connect(id)); } } 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 f4830b3d..712c56bc 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 @@ -28,4 +28,5 @@ public class AdminCreateBindingVO { private Boolean accountDisabled; /* private Boolean accountLocked;*/ private String roleId; + private Boolean checkDuplicate; } 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 b3a169af..55266472 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 @@ -24,51 +24,68 @@ public class AdminCreateValidator implements Validator { public void validate(Object target, Errors errors) { AdminCreateBindingVO vo = (AdminCreateBindingVO) target; - if (vo.getRoleId() == null || vo.getRoleId().isEmpty()) { - errors.rejectValue("roleId", "error.roleId", "권한을 선택해주세요."); + // [1] 필수값 누락 체크 + if(vo.getRoleId() == null || vo.getRoleId().isEmpty()) { + errors.rejectValue("roleId", "error.roleId", "필수입력항목을 확인해주세요."); + return; + } + if(vo.getId() == null || vo.getId().isBlank()) { + errors.rejectValue("id", "error.id", "필수입력항목을 확인해주세요."); + return; + } + if(vo.getPassword() == null || vo.getPassword().isBlank()) { + errors.rejectValue("password", "error.password", "필수입력항목을 확인해주세요."); + return; } - 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","비밀번호는 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.getRoleId() != null && "ROLE_RESEARCHER".equals(vo.getRoleId())) { + if(vo.getName() == null || vo.getName().isEmpty()) { + errors.rejectValue("name", "error.name", "필수입력항목을 확인해주세요."); + return; } - if (vo.getName().length() > 10) { - errors.rejectValue("name", "error.name", "이름은 10자까지 입력가능합니다."); + if(vo.getPhone1() == null || vo.getPhone1().isBlank()) { + errors.rejectValue("phone1", "error.phone1", "필수입력항목을 확인해주세요."); + return; } - if (vo.getPhone1() == null || vo.getPhone1().isBlank()) { - errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리를 입력해주세요."); - } else if (!vo.getPhone1().matches("^\\d{4}$")) { + if(vo.getPhone2() == null || vo.getPhone2().isBlank()) { + errors.rejectValue("phone2", "error.phone2", "필수입력항목을 확인해주세요."); + return; + } + if (!vo.getPhone1().matches("^\\d{4}$")) { errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리는 4자리 숫자여야 합니다."); + return; } - if (vo.getPhone2() == null || vo.getPhone2().isBlank()) { - errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리를 입력해주세요."); - } else if (!vo.getPhone2().matches("^\\d{4}$")) { + if (!vo.getPhone2().matches("^\\d{4}$")) { errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리는 4자리 숫자여야 합니다."); + return; } } - // ROLE_ADMIN이 아닌 경우 regionMainCode null체크 + + if(vo.getAccountDisabled() == null) { + errors.rejectValue("accountDisabled", "error.accountDisabled", "필수입력항목을 확인해주세요."); + return; + } + + // ROLE_ADMIN이 아닌 경우 실사지역 null체크 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","필수입력항목을 확인해주세요."); } }); + + // [2] 아이디 중복 확인 여부 + if (vo.getCheckDuplicate() == null || !vo.getCheckDuplicate()) { + errors.rejectValue("checkDuplicate", "error.checkDuplicate", "아이디 중복 확인을 먼저 진행해주세요."); + return; + } + + // [3] 비밀번호 형식 검사 + if (!vo.getPassword().matches(PASSWORD_REGEX)) { + errors.rejectValue("password", "valid.common.password.wrong", + "비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다."); + } } } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java index 784e068f..a9a06577 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java @@ -22,39 +22,55 @@ public class AdminUpdateValidator implements Validator { public void validate(Object target, Errors errors) { AdminUpdateBindingVO vo = (AdminUpdateBindingVO) target; - if (vo.getRoleId() == null || vo.getRoleId().isEmpty()) { - errors.rejectValue("roleId", "error.roleId", "권한을 선택해주세요."); + // [1] 필수값 누락 체크 + if(vo.getRoleId() == null || vo.getRoleId().isEmpty()) { + errors.rejectValue("roleId", "error.roleId", "필수입력항목을 확인해주세요."); + return; } - Optional.ofNullable(vo.getUpdatePassword()) - .filter(password -> !password.trim().isEmpty() && !password.matches(PASSWORD_REGEX)) - .ifPresent(password -> errors.rejectValue("updatePassword", "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.getRoleId() != null && "ROLE_RESEARCHER".equals(vo.getRoleId())) { + if(vo.getName() == null || vo.getName().isEmpty()) { + errors.rejectValue("name", "error.name", "필수입력항목을 확인해주세요."); + return; } - if (vo.getName().length() > 10) { - errors.rejectValue("name", "error.name", "이름은 10자까지 입력가능합니다."); + if(vo.getPhone1() == null || vo.getPhone1().isBlank()) { + errors.rejectValue("phone1", "error.phone1", "필수입력항목을 확인해주세요."); + return; } - if (vo.getPhone1() == null || vo.getPhone1().isBlank()) { - errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리를 입력해주세요."); - } else if (!vo.getPhone1().matches("^\\d{4}$")) { + if(vo.getPhone2() == null || vo.getPhone2().isBlank()) { + errors.rejectValue("phone2", "error.phone2", "필수입력항목을 확인해주세요."); + return; + } + if (!vo.getPhone1().matches("^\\d{4}$")) { errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리는 4자리 숫자여야 합니다."); + return; } - if (vo.getPhone2() == null || vo.getPhone2().isBlank()) { - errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리를 입력해주세요."); - } else if (!vo.getPhone2().matches("^\\d{4}$")) { + if (!vo.getPhone2().matches("^\\d{4}$")) { errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리는 4자리 숫자여야 합니다."); + return; } } - // ROLE_ADMIN이 아닌 경우 regionMainCode null체크 + + // 사용여부 + if(vo.getAccountDisabled() == null) { + errors.rejectValue("accountDisabled", "error.accountDisabled", "필수입력항목을 확인해주세요."); + return; + } + + // ROLE_ADMIN이 아닌 경우 실사지역 null체크 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","필수입력항목을 확인해주세요."); } }); + + // [2] 비밀번호 형식 검사 + if (!vo.getUpdatePassword().matches(PASSWORD_REGEX)) { + errors.rejectValue("updatePassword", "valid.common.password.wrong", + "비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다."); + } } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java index 75aff5ef..8e5d90e1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java @@ -15,11 +15,6 @@ class SaveHouseholdVisitInfoDao implements SaveHouseholdVisitInfoPortOut { @Override @Transactional public void operate(SaveHouseholdVisitInfoCmd cmd) { - // 답례품 전달 완료일 경우 기존 방문들 중 true → false로 변경 - if (Boolean.TRUE.equals(cmd.getIsGiftSent())) { - mapper.updateGiftSentToFalse(AuditUtil.update(cmd)); - } - if (cmd.getVisitInfoId() != null) { mapper.findById(cmd.getHouseholdSeq()) .ifPresentOrElse(v -> mapper.updateHouseholdVisitInfo(AuditUtil.update(cmd)), @@ -29,5 +24,10 @@ class SaveHouseholdVisitInfoDao implements SaveHouseholdVisitInfoPortOut { } else { mapper.createHouseholdVisitInfo(AuditUtil.create(cmd)); } + + // 답례품 전달 완료일 경우 기존 방문들 중 true → false로 변경 + if (Boolean.TRUE.equals(cmd.getIsGiftSent())) { + mapper.updateGiftSentToFalse(AuditUtil.update(cmd)); + } } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java index 32274c55..58677f68 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java @@ -67,11 +67,13 @@ public class ResearcherDao implements ResearcherPortOut { @Override @UpdateCommand public Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO) { - if(Boolean.TRUE.equals(reqVO.getIsGiftSent())) { + int updated = researcherMapper.updateVisitHousehold(reqVO); + + if (Boolean.TRUE.equals(reqVO.getIsGiftSent())) { researcherMapper.updateGiftSentToFalse(reqVO); } - return researcherMapper.updateVisitHousehold(reqVO); + return updated; } @Override diff --git a/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml b/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml index 256101ec..5e807c54 100644 --- a/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml +++ b/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml @@ -25,13 +25,18 @@ AND rhh.is_deleted = false WHERE a.is_deleted = false AND a.account_disabled = false - + /* 조사원 검색 */ + + AND ( + a.name ILIKE '%' || #{cmd.searchValue} || '%' + OR a.phone ILIKE '%' || #{cmd.searchValue} || '%' + ) + AND a.name ILIKE '%' || #{cmd.searchValue} || '%' - AND a.phone ILIKE '%' || #{cmd.searchValue} || '%' diff --git a/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml b/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml index cd9f2cca..4f39886f 100644 --- a/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml +++ b/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml @@ -44,8 +44,10 @@ WHERE household_seq = #{householdSeq} AND TO_CHAR(visit_date, 'YYYYMM') = TO_CHAR(TO_DATE(#{visitDate}, 'YYYY-MM-DD'), 'YYYYMM') AND is_gift_sent = true - AND (#{visitInfoId} IS NULL OR id != #{visitInfoId}) AND is_deleted = false + + AND id != #{visitInfoId} + + + + + + + + + + + ID* + +
+
+
+
+ +
+ +
+ 4~15자 / 영문,숫자,한글 가능/ 특수문자 _,- 사용가능 +
+
+ + + + +
+
+ +
+ 총 5자 / 숫자 + 특수문자 1개 이상 (!,@,#,$,%,_,-) +
+ + + + + +
+
+ +
+
+ + + +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+ + + + +
- - +
-
- 에러 메세지 + + + + + +
+
-
- - - - - - -
-
- - -
- 에러 메세지 +
+
-
- 4~15자 / 영문,숫자,한글 가능/ 특수문자 _,- 사용가능 -
- - - -
-
- -
- 에러 메세지 -
-
- 총 5자 / 숫자 + 특수문자 1개 이상 (!,@,#,$,%,_,-) -
- - - - - -
-
- -
- 에러 메세지 -
-
-
- - - -
-
- -
-
-
- -
-
-
-
- -
-
-
-
- 에러 메세지 -
- - - - - -
- -
-
- 에러 메세지 -
- - - - - -
- -
-
- -
-
- 에러 메세지 -
- - - - + + + + -
-
- - +
+
+ + +
@@ -187,8 +176,8 @@ $(document).ready(() => { 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'); @@ -218,19 +207,19 @@ function (code, rstData) { console.log("error : ", code); if(code == 400) alert("아이디를 입력해주세요."); + if(code == 422) alert(rstData.responseText); + checkDuplicate = false; }, 'get', - 'json' + 'json', + { handle422Type: 'alert' } ); } - const createAdmin = () => { - if (!checkDuplicate) { - alert("아이디 중복 확인을 해주세요."); - return false; - } + const createAdmin = () => { const f = document.adminCreateForm; let dataOj = $(f).serializeObject(); + dataOj.checkDuplicate = checkDuplicate; ajaxUtil._ajaxMethod( '/api/settings/admin/create', diff --git a/admin/src/main/resources/templates/admin/adminUpdateForm.html b/admin/src/main/resources/templates/admin/adminUpdateForm.html index b460a668..a3b0f4d3 100644 --- a/admin/src/main/resources/templates/admin/adminUpdateForm.html +++ b/admin/src/main/resources/templates/admin/adminUpdateForm.html @@ -13,161 +13,150 @@ + + + + + + + - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + - - - - - - - - - + +
-
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+ 총 5자 / 숫자 + 특수문자 1개 이상 (!,@,#,$,%,_,-) +
+
+
+
+ +
+
+
+
- +
-
- 에러 메세지 +
+
+ +
+
+
+
+ +
-
-
-
-
- -
-
-
-
-
- -
- 에러 메세지 -
-
- 총 5자 / 숫자 + 특수문자 1개 이상 (!,@,#,$,%,_,-) -
-
-
-
- -
- 에러 메세지 -
-
-
-
-
+
- + +
-
-
- -
-
-
+
에러 메세지
+
-
- -
+
-
+
+ +
+
에러 메세지
-
-
-
- -
-
- 에러 메세지 -
-
-
- -
-
- -
-
- 에러 메세지 -
-
-
+
diff --git a/admin/src/main/resources/templates/common/modal-researcher-mapping.html b/admin/src/main/resources/templates/common/modal-researcher-mapping.html index c58a538d..27312705 100644 --- a/admin/src/main/resources/templates/common/modal-researcher-mapping.html +++ b/admin/src/main/resources/templates/common/modal-researcher-mapping.html @@ -3,7 +3,7 @@ layout:decorate="~{layout/layout}">
-
+ @@ -38,7 +38,9 @@
- +
diff --git a/admin/src/main/resources/templates/households/create.html b/admin/src/main/resources/templates/households/create.html index b648a311..ae0bbb64 100644 --- a/admin/src/main/resources/templates/households/create.html +++ b/admin/src/main/resources/templates/households/create.html @@ -197,7 +197,9 @@
- +
diff --git a/core/src/main/resources/mappers/admin/GetAdminsMapper.xml b/core/src/main/resources/mappers/admin/GetAdminsMapper.xml index 9e99331a..ea4826e9 100644 --- a/core/src/main/resources/mappers/admin/GetAdminsMapper.xml +++ b/core/src/main/resources/mappers/admin/GetAdminsMapper.xml @@ -23,8 +23,14 @@ LEFT JOIN uicode u ON u.parent_id = 'code.region.main' AND u.id = a.region_main_code WHERE a.is_deleted = false - + + + AND ( + a.id ILIKE '%' || #{cmd.searchValue} || '%' + OR a.name ILIKE '%' || #{cmd.searchValue} || '%' + ) + AND a.name LIKE '%' || #{cmd.searchValue} || '%' AND a.id LIKE '%' || #{cmd.searchValue} || '%' @@ -48,24 +54,7 @@ ) - - ORDER BY - - - a.id - a.email - a.account_disabled - a.account_locked - a.created_at - a.updated_at - a.created_at - - - DESC - ASC - - - + ORDER BY a.seq DESC OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY