From f2286759eba5517aa8388696726117b6afadd4fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=EC=9E=AC=EC=A4=91?= <126754298+m-a-king@users.noreply.github.com> Date: Thu, 23 Jan 2025 16:19:44 +0900 Subject: [PATCH] =?UTF-8?q?refactor(auth):=20OAuth=20=EC=9C=A0=EC=A0=80=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EB=A1=9C=EC=A7=81=20=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `registerOAuthUser` 메서드 제거 및 `SignUpUseCase`로 대체 - `RegisterUserUseCase`와 `OAuthInfoRegistrar` 종속성 제거 - OAuth 유저 등록과 관련된 책임을 `SignUpUseCase`로 위임 --- .../processor/OAuthUserProcessorImpl.java | 29 ++----------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/somemore/global/auth/oauth/processor/OAuthUserProcessorImpl.java b/src/main/java/com/somemore/global/auth/oauth/processor/OAuthUserProcessorImpl.java index 8bbd19eb..cb2618bf 100644 --- a/src/main/java/com/somemore/global/auth/oauth/processor/OAuthUserProcessorImpl.java +++ b/src/main/java/com/somemore/global/auth/oauth/processor/OAuthUserProcessorImpl.java @@ -4,29 +4,23 @@ import com.somemore.global.auth.oauth.converter.OAuthResponseConverter; import com.somemore.global.auth.oauth.domain.CommonOAuthInfo; import com.somemore.global.auth.oauth.domain.CustomOAuth2User; -import com.somemore.global.auth.oauth.registrar.OAuthInfoRegistrar; import com.somemore.global.auth.oauth.service.OAuthInfoQueryService; -import com.somemore.user.domain.User; -import com.somemore.user.domain.UserRole; -import com.somemore.user.usecase.RegisterUserUseCase; +import com.somemore.global.auth.sign.up.SignUpUseCase; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.UUID; @Slf4j @Service @RequiredArgsConstructor -@Transactional public class OAuthUserProcessorImpl implements OAuthUserProcessor { private final OAuthResponseConverter oauthResponseConverter; private final OAuthInfoChecker oauthInfoChecker; - private final OAuthInfoRegistrar oauthInfoRegistrar; - private final RegisterUserUseCase registerUserUseCase; private final OAuthInfoQueryService oAuthInfoQueryService; + private final SignUpUseCase signUpUseCase; @Override public UUID fetchUserIdByOAuthUser(CustomOAuth2User oauthUser) { @@ -36,29 +30,12 @@ public UUID fetchUserIdByOAuthUser(CustomOAuth2User oauthUser) { private UUID findUserIdByOAuthInfo(CommonOAuthInfo oauthInfo) { if (isNewUser(oauthInfo)) { - User user = registerOAuthUser(oauthInfo); - return user.getId(); + signUpUseCase.signUpOAuthUser(oauthInfo); } return oAuthInfoQueryService.getUserIdByCommonOAuthInfo(oauthInfo); } - private User registerOAuthUser(CommonOAuthInfo oauthInfo) { - User user = registerUser(oauthInfo); - registerOAuthInfo(user, oauthInfo); - // TODO 봉사자 등록 이벤트 발행 - - return user; - } - private boolean isNewUser(CommonOAuthInfo oauthInfo) { return !oauthInfoChecker.doesUserExist(oauthInfo.provider(), oauthInfo.oauthId()); } - - private User registerUser(CommonOAuthInfo oauthInfo) { - return registerUserUseCase.registerOAuthUser(oauthInfo, UserRole.getOAuthUserDefaultRole()); - } - - private void registerOAuthInfo(User user, CommonOAuthInfo oauthInfo) { - oauthInfoRegistrar.register(user, oauthInfo); - } }