From 2d536c35920fdf21bef492e39e988b6de169243d Mon Sep 17 00:00:00 2001 From: wlgns12370 Date: Sat, 23 Aug 2025 00:30:49 +0900 Subject: [PATCH 1/2] =?UTF-8?q?MOSU-354=20feat:=20=EA=B0=80=EC=83=81=20?= =?UTF-8?q?=EC=93=B0=EB=A0=88=EB=93=9C=20=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-base.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/application-base.yml b/src/main/resources/application-base.yml index 7301ede7..9af75c7e 100644 --- a/src/main/resources/application-base.yml +++ b/src/main/resources/application-base.yml @@ -10,6 +10,10 @@ server: include-stacktrace: never spring: + threads: + virtual: + enabled: true + config: import: - optional:file:.env[.properties] From fd2547683c53abb9887fd08c51ca97ff3701d867 Mon Sep 17 00:00:00 2001 From: wlgns12370 Date: Sat, 23 Aug 2025 02:43:30 +0900 Subject: [PATCH 2/2] =?UTF-8?q?MOSU=20fix:=20=ED=94=84=EB=A1=9C=ED=95=84?= =?UTF-8?q?=20=EB=93=B1=EB=A1=9D=ED=95=9C=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20?= =?UTF-8?q?=EC=A4=91=EB=B3=B5=20=EC=9C=A0=EC=A0=80=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/processor/SignUpAccountStepProcessor.java | 11 ++++------- .../mosuserver/domain/user/entity/UserJpaEntity.java | 4 ++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/life/mosu/mosuserver/application/auth/processor/SignUpAccountStepProcessor.java b/src/main/java/life/mosu/mosuserver/application/auth/processor/SignUpAccountStepProcessor.java index 4327f543..fa026aac 100644 --- a/src/main/java/life/mosu/mosuserver/application/auth/processor/SignUpAccountStepProcessor.java +++ b/src/main/java/life/mosu/mosuserver/application/auth/processor/SignUpAccountStepProcessor.java @@ -30,13 +30,10 @@ private void validateForNewSignUp(UserJpaEntity user) { userRepository.findByPhoneNumber(user.getOriginPhoneNumber()) .ifPresent(existingUser -> { - if (existingUser.isPendingUser()) { - switch (existingUser.getProvider()) { - case MOSU: - throw new CustomRuntimeException(ErrorCode.USER_ALREADY_EXISTS); - case KAKAO: - throw new CustomRuntimeException(ErrorCode.KAKAO_DUPLICATED); - } + if (existingUser.isKakaoUser()) { + throw new CustomRuntimeException(ErrorCode.KAKAO_DUPLICATED); + } else if (existingUser.isPendingUser() && existingUser.isMosuUser()) { + throw new CustomRuntimeException(ErrorCode.USER_ALREADY_EXISTS); } }); diff --git a/src/main/java/life/mosu/mosuserver/domain/user/entity/UserJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/user/entity/UserJpaEntity.java index 9afe7ec9..23d9bdda 100644 --- a/src/main/java/life/mosu/mosuserver/domain/user/entity/UserJpaEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/user/entity/UserJpaEntity.java @@ -112,6 +112,10 @@ public void updateUserInfo( public boolean isMosuUser() { return this.provider.equals(AuthProvider.MOSU); } + + public boolean isKakaoUser() { + return this.provider.equals(AuthProvider.KAKAO); + } public boolean isPendingUser() { return this.userRole.equals(UserRole.ROLE_PENDING);