From 6d35cf5b1c0f9ee884ff59d7846ab59adb2fc8dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Wed, 16 Jul 2025 09:32:35 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9E=98=ED=8D=BC=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=EC=9D=84=20=EA=B8=B0=EB=B3=B8=20=ED=83=80=EC=9E=85=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=A7=8C=EB=93=A4=20=EC=88=98=20=EC=9E=88=EC=9D=8C?= =?UTF-8?q?,=20=EC=BD=94=EB=93=9C=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88,=20=ED=95=84=EB=93=9C=EB=8A=94=20=EB=A1=9C?= =?UTF-8?q?=EC=BB=AC=20=EB=B3=80=EC=88=98=EC=9D=BC=20=EC=88=98=20=EC=9E=88?= =?UTF-8?q?=EC=8A=B5=EB=8B=88=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdminIdDuplicateCheckPostController.java | 7 +++-- .../web/validator/AdminCreateValidator.java | 27 +++++++++---------- .../application/domain/BatchLogType.java | 2 +- .../ExcelUploadCreateHouseholdDao.java | 2 +- .../config/constants/CommonConstants.java | 22 +++++++++++++++ .../security/FrontPublicAccess.java | 2 +- .../adapters/web/DailyStatusUIController.java | 18 +++++-------- 7 files changed, 46 insertions(+), 34 deletions(-) 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 6a179aed..79ebdd7e 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 @@ -1,5 +1,6 @@ package app.module.admin.usecase.admin.checkAdminId.adapters.web; +import app.module.core.config.constants.CommonConstants; import app.module.core.usecase.admin.checkAdminId.ports.CheckAdminIdPortIn; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -15,15 +16,13 @@ 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)) { + if (!id.matches(CommonConstants.ADMIN_ID_REGEX)) { return ResponseEntity .status(HttpStatus.UNPROCESSABLE_ENTITY) - .body(INVALID_ID_MSG); + .body(CommonConstants.ADMIN_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/validator/AdminCreateValidator.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java index 55266472..f06a393a 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 @@ -2,19 +2,16 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web.validator; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminCreateBindingVO; import java.util.Optional; + +import app.module.core.config.constants.CommonConstants; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import org.springframework.validation.Errors; -import org.springframework.validation.ValidationUtils; import org.springframework.validation.Validator; @Component public class AdminCreateValidator implements Validator { - // 아이디: 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) { return AdminCreateBindingVO.class.equals(clazz); @@ -25,30 +22,30 @@ public class AdminCreateValidator implements Validator { AdminCreateBindingVO vo = (AdminCreateBindingVO) target; // [1] 필수값 누락 체크 - if(vo.getRoleId() == null || vo.getRoleId().isEmpty()) { + if(StringUtils.isBlank(vo.getRoleId())) { errors.rejectValue("roleId", "error.roleId", "필수입력항목을 확인해주세요."); return; } - if(vo.getId() == null || vo.getId().isBlank()) { + if(StringUtils.isBlank(vo.getId())) { errors.rejectValue("id", "error.id", "필수입력항목을 확인해주세요."); return; } - if(vo.getPassword() == null || vo.getPassword().isBlank()) { + if(StringUtils.isBlank(vo.getPassword())) { errors.rejectValue("password", "error.password", "필수입력항목을 확인해주세요."); return; } // 권한 조사원으로 선택했을 경우 - if(vo.getRoleId() != null && "ROLE_RESEARCHER".equals(vo.getRoleId())) { - if(vo.getName() == null || vo.getName().isEmpty()) { + if("ROLE_RESEARCHER".equals(vo.getRoleId())) { + if(StringUtils.isBlank(vo.getName())) { errors.rejectValue("name", "error.name", "필수입력항목을 확인해주세요."); return; } - if(vo.getPhone1() == null || vo.getPhone1().isBlank()) { + if(StringUtils.isBlank(vo.getPhone1())) { errors.rejectValue("phone1", "error.phone1", "필수입력항목을 확인해주세요."); return; } - if(vo.getPhone2() == null || vo.getPhone2().isBlank()) { + if(StringUtils.isBlank(vo.getPhone2())) { errors.rejectValue("phone2", "error.phone2", "필수입력항목을 확인해주세요."); return; } @@ -83,9 +80,9 @@ public class AdminCreateValidator implements Validator { } // [3] 비밀번호 형식 검사 - if (!vo.getPassword().matches(PASSWORD_REGEX)) { + if (!vo.getPassword().matches(CommonConstants.ADMIN_PASSWORD_REGEX)) { errors.rejectValue("password", "valid.common.password.wrong", - "비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다."); + CommonConstants.ADMIN_PASSWORD_MSG); } } } diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java index 5e7f5a24..d5bf6ae5 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java @@ -8,5 +8,5 @@ import lombok.RequiredArgsConstructor; public enum BatchLogType { AUTO_SMS, MONTHLY_STATUS, - CARRYOVER; + CARRYOVER } diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java index 5f975f59..6541cde1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -46,7 +46,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut Workbook workbook = WorkbookFactory.create(file.getInputStream()); Sheet sheet = workbook.getSheetAt(0); - Integer success = 0; + int success = 0; List RegionMainCodeList = uiCodeListMapper.findByParentId("code.region.main"); List RegionSubCodeList = uiCodeListMapper.findByParentId("code.region.sub"); diff --git a/core/src/main/java/app/module/core/config/constants/CommonConstants.java b/core/src/main/java/app/module/core/config/constants/CommonConstants.java index ae3392b3..1cd185b5 100644 --- a/core/src/main/java/app/module/core/config/constants/CommonConstants.java +++ b/core/src/main/java/app/module/core/config/constants/CommonConstants.java @@ -14,4 +14,26 @@ public class CommonConstants { * 작업 면적의 직접입력 코드 */ public static final String AREA_CODE_OTHER = "code.record.area.self"; + + /** + * 관리자 아이디 생성 규칙 + * [정책] 아이디: 4~15자, 영문/숫자/한글/특수문자(_,-) 허용 + */ + public static final String ADMIN_ID_REGEX = "^[a-zA-Z0-9가-힣_-]{4,15}$"; + + /** + * 관리자 아이디 유효성 실패 메시지 + */ + public static final String ADMIN_ID_MSG = "아이디는 4~15자, 영문/숫자/한글/특수문자(_,-)만 가능합니다."; + + /** + * 관리자 비밀번호 생성 규칙 + * [정책] 비밀번호: 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상 + */ + public static final String ADMIN_PASSWORD_REGEX = "^[a-zA-Z0-9가-힣_-]{4,15}$"; + + /** + * 관리자 비밀번호 유효성 실패 메시지 + */ + public static final String ADMIN_PASSWORD_MSG = "비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다."; } diff --git a/front/src/main/java/app/module/front/config/application/security/FrontPublicAccess.java b/front/src/main/java/app/module/front/config/application/security/FrontPublicAccess.java index 64023c7c..a1ca55a5 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontPublicAccess.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontPublicAccess.java @@ -7,7 +7,7 @@ public class FrontPublicAccess { private static final FrontPublicAccess INSTANCE = new FrontPublicAccess(); - private List publicAccessURIs = new ArrayList<>(); + private final List publicAccessURIs = new ArrayList<>(); private FrontPublicAccess() { } diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java index c1e7ec34..2525b2e2 100644 --- a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java @@ -69,30 +69,24 @@ public class DailyStatusUIController { @GetMapping(path = "/{step}/{searchMonth}") public String detail(Model model, @PathVariable("step") String step, @PathVariable("searchMonth") String searchMonth) { switch (DailySort.valueOf(step.toUpperCase())) { - case INCOME -> { + case INCOME -> processStep(model, DailySort.INCOME, dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""))); - } - case WORK -> { + case WORK -> processStep(model, DailySort.WORK, dailyWorkPortIn.monthList(new DailyWorkUIReqVO(searchMonth, ""))); - } - case EXPENSE -> { + case EXPENSE -> processStep(model, DailySort.EXPENSE, dailyExpensePortIn.monthList(new DailyExpenseUIReqVO(searchMonth, ""))); - } - case POWER -> { + case POWER -> processStep(model, DailySort.POWER, dailyPowerPortIn.monthList(new DailyPowerUIReqVO(searchMonth, ""))); - } - case FORESTRY -> { + case FORESTRY -> processStep(model, DailySort.FORESTRY, dailyForestryPortIn.monthList(new DailyForestryUIReqVO(searchMonth, ""))); - } - case FARMING -> { + case FARMING -> processStep(model, DailySort.FARMING, dailyFarmingPortIn.monthList(new DailyFarmingUIReqVO(searchMonth, ""))); - } default -> throw new NoMatchingURIException("잘못된 접근"); }