diff --git a/src/main/java/com/kamco/cd/kamcoback/auth/CustomAuthenticationProvider.java b/src/main/java/com/kamco/cd/kamcoback/auth/CustomAuthenticationProvider.java index 333b673a..9698b1e1 100644 --- a/src/main/java/com/kamco/cd/kamcoback/auth/CustomAuthenticationProvider.java +++ b/src/main/java/com/kamco/cd/kamcoback/auth/CustomAuthenticationProvider.java @@ -26,9 +26,9 @@ public class CustomAuthenticationProvider implements AuthenticationProvider { // 유저 조회 MemberEntity member = - membersRepository - .findByUserId(username) - .orElseThrow(() -> new CustomApiException(AuthErrorCode.LOGIN_ID_NOT_FOUND)); + membersRepository + .findByEmployeeNo(username) + .orElseThrow(() -> new CustomApiException(AuthErrorCode.LOGIN_ID_NOT_FOUND)); // 미사용 상태 if (member.getStatus().equals(StatusType.INACTIVE.getId())) { diff --git a/src/main/java/com/kamco/cd/kamcoback/members/dto/SignInRequest.java b/src/main/java/com/kamco/cd/kamcoback/members/dto/SignInRequest.java index 1ad47961..25f59beb 100644 --- a/src/main/java/com/kamco/cd/kamcoback/members/dto/SignInRequest.java +++ b/src/main/java/com/kamco/cd/kamcoback/members/dto/SignInRequest.java @@ -11,7 +11,7 @@ import lombok.ToString; @ToString(exclude = "password") public class SignInRequest { - @Schema(description = "사용자 ID", example = "admin2") + @Schema(description = "사용자 ID", example = "1234567") private String username; @Schema(description = "비밀번호", example = "Admin2!@#") diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java index b59f71fc..df0bcdc9 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java @@ -67,7 +67,7 @@ public class MembersCoreService { */ public void updateMembers(UUID uuid, MembersDto.UpdateReq updateReq) { MemberEntity memberEntity = - membersRepository.findByUUID(uuid).orElseThrow(MemberNotFoundException::new); + membersRepository.findByUUID(uuid).orElseThrow(MemberNotFoundException::new); if (StringUtils.isNotBlank(updateReq.getName())) { memberEntity.setName(updateReq.getName()); @@ -85,7 +85,7 @@ public class MembersCoreService { } String password = - CommonStringUtils.hashPassword(updateReq.getPassword(), memberEntity.getEmployeeNo()); + CommonStringUtils.hashPassword(updateReq.getPassword(), memberEntity.getEmployeeNo()); memberEntity.setStatus(StatusType.PENDING.getId()); memberEntity.setLoginFailCount(0); @@ -103,7 +103,7 @@ public class MembersCoreService { */ public void resetPassword(String id, MembersDto.InitReq initReq) { MemberEntity memberEntity = - membersRepository.findByEmployeeNo(id).orElseThrow(() -> new MemberNotFoundException()); + membersRepository.findByEmployeeNo(id).orElseThrow(() -> new MemberNotFoundException()); // 기존 패스워드 확인 if (!BCrypt.checkpw(initReq.getOldPassword(), memberEntity.getPassword())) { @@ -111,7 +111,7 @@ public class MembersCoreService { } String password = - CommonStringUtils.hashPassword(initReq.getNewPassword(), memberEntity.getEmployeeNo()); + CommonStringUtils.hashPassword(initReq.getNewPassword(), memberEntity.getEmployeeNo()); memberEntity.setPassword(password); memberEntity.setStatus(StatusType.ACTIVE.getId()); @@ -141,9 +141,9 @@ public class MembersCoreService { */ public String getUserStatus(SignInRequest request) { MemberEntity memberEntity = - membersRepository - .findByUserId(request.getUsername()) - .orElseThrow(MemberNotFoundException::new); + membersRepository + .findByEmployeeNo(request.getUsername()) + .orElseThrow(MemberNotFoundException::new); return memberEntity.getStatus(); } @@ -154,7 +154,7 @@ public class MembersCoreService { */ public void saveLogin(UUID uuid) { MemberEntity memberEntity = - membersRepository.findByUUID(uuid).orElseThrow(() -> new MemberNotFoundException()); + membersRepository.findByUUID(uuid).orElseThrow(() -> new MemberNotFoundException()); if (memberEntity.getFirstLoginDttm() == null) { memberEntity.setFirstLoginDttm(ZonedDateTime.now());