Skip to content

Commit c8c22ba

Browse files
authored
Merge pull request #359 from mosu-dev/refactor/mosu-358
MOSU-358 refactor: 아이디 찾기 휴대폰 번호 비교 시 U Prefix 추가
2 parents 62e79c0 + d0a3eeb commit c8c22ba

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/main/java/life/mosu/mosuserver/application/user/MyUserService.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static life.mosu.mosuserver.global.util.EncodeUtil.passwordEncode;
44

5+
import life.mosu.mosuserver.domain.user.entity.AuthProvider;
56
import life.mosu.mosuserver.domain.user.entity.UserJpaEntity;
67
import life.mosu.mosuserver.domain.user.repository.UserJpaRepository;
78
import life.mosu.mosuserver.global.exception.CustomRuntimeException;
@@ -42,11 +43,13 @@ public ChangePasswordResponse changePassword(ChangePasswordRequest request,
4243
@Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
4344
public FindLoginIdResponse findLoginId(FindLoginIdRequest request) {
4445
UserJpaEntity user = userJpaRepository.findByNameAndPhoneNumber(request.name(),
45-
request.phoneNumber())
46+
PhoneNumberUtil.formatPhoneNumber(request.phoneNumber()))
4647
.orElseThrow(() -> new CustomRuntimeException(ErrorCode.NOT_FOUND_LOGIN_ID));
4748

49+
if (user.getProvider() == AuthProvider.KAKAO) {
50+
throw new CustomRuntimeException(ErrorCode.KAKAO_ACCOUNT_DUPLICATED);
51+
}
4852
return FindLoginIdResponse.from(user.getLoginId());
49-
5053
}
5154

5255
@Transactional(readOnly = true, propagation = Propagation.SUPPORTS)

src/main/java/life/mosu/mosuserver/global/exception/ErrorCode.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ public enum ErrorCode {
168168

169169
// ID 찾기 관련
170170
NOT_FOUND_LOGIN_ID(HttpStatus.NOT_FOUND, "해당 아이디를 찾을 수 없습니다.", CriticalLevel.LOW),
171+
KAKAO_ACCOUNT_DUPLICATED(HttpStatus.CONFLICT, "카카오로 가입한 사용자입니다", CriticalLevel.LOW),
171172

172173
//결제 API 실패
173174
PAYMENT_API_ERROR(HttpStatus.BAD_REQUEST, "결제 API 호출에 실패하였습니다.", CriticalLevel.CRITICAL),

0 commit comments

Comments
 (0)