44import com .somemore .global .auth .oauth .converter .OAuthResponseConverter ;
55import com .somemore .global .auth .oauth .domain .CommonOAuthInfo ;
66import com .somemore .global .auth .oauth .domain .CustomOAuth2User ;
7- import com .somemore .global .auth .oauth .registrar .OAuthInfoRegistrar ;
87import com .somemore .global .auth .oauth .service .OAuthInfoQueryService ;
9- import com .somemore .user .domain .User ;
10- import com .somemore .user .domain .UserRole ;
11- import com .somemore .user .usecase .RegisterUserUseCase ;
8+ import com .somemore .global .auth .sign .up .SignUpUseCase ;
129import lombok .RequiredArgsConstructor ;
1310import lombok .extern .slf4j .Slf4j ;
1411import org .springframework .stereotype .Service ;
15- import org .springframework .transaction .annotation .Transactional ;
1612
1713import java .util .UUID ;
1814
1915@ Slf4j
2016@ Service
2117@ RequiredArgsConstructor
22- @ Transactional
2318public class OAuthUserProcessorImpl implements OAuthUserProcessor {
2419
2520 private final OAuthResponseConverter oauthResponseConverter ;
2621 private final OAuthInfoChecker oauthInfoChecker ;
27- private final OAuthInfoRegistrar oauthInfoRegistrar ;
28- private final RegisterUserUseCase registerUserUseCase ;
2922 private final OAuthInfoQueryService oAuthInfoQueryService ;
23+ private final SignUpUseCase signUpUseCase ;
3024
3125 @ Override
3226 public UUID fetchUserIdByOAuthUser (CustomOAuth2User oauthUser ) {
@@ -36,29 +30,12 @@ public UUID fetchUserIdByOAuthUser(CustomOAuth2User oauthUser) {
3630
3731 private UUID findUserIdByOAuthInfo (CommonOAuthInfo oauthInfo ) {
3832 if (isNewUser (oauthInfo )) {
39- User user = registerOAuthUser (oauthInfo );
40- return user .getId ();
33+ signUpUseCase .signUpOAuthUser (oauthInfo );
4134 }
4235 return oAuthInfoQueryService .getUserIdByCommonOAuthInfo (oauthInfo );
4336 }
4437
45- private User registerOAuthUser (CommonOAuthInfo oauthInfo ) {
46- User user = registerUser (oauthInfo );
47- registerOAuthInfo (user , oauthInfo );
48- // TODO 봉사자 등록 이벤트 발행
49-
50- return user ;
51- }
52-
5338 private boolean isNewUser (CommonOAuthInfo oauthInfo ) {
5439 return !oauthInfoChecker .doesUserExist (oauthInfo .provider (), oauthInfo .oauthId ());
5540 }
56-
57- private User registerUser (CommonOAuthInfo oauthInfo ) {
58- return registerUserUseCase .registerOAuthUser (oauthInfo , UserRole .getOAuthUserDefaultRole ());
59- }
60-
61- private void registerOAuthInfo (User user , CommonOAuthInfo oauthInfo ) {
62- oauthInfoRegistrar .register (user , oauthInfo );
63- }
6441}
0 commit comments