Skip to content

Commit 7e086ea

Browse files
committed
🐛 트랜잭션을 한군데서만 사용
1 parent 9414c10 commit 7e086ea

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/java/com/boggle_boggle/bbegok/oauth/service/CustomOAuth2UserService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
4848
}
4949
}
5050

51-
@Transactional
5251
protected OAuth2User process(OAuth2UserRequest userRequest, OAuth2User user) {
5352
ProviderType providerType = ProviderType.valueOf(userRequest.getClientRegistration().getRegistrationId().toUpperCase());
5453
OAuth2UserInfo userInfo = OAuth2UserInfoFactory.getOAuth2UserInfo(providerType, user.getAttributes());
@@ -61,7 +60,7 @@ protected OAuth2User process(OAuth2UserRequest userRequest, OAuth2User user) {
6160
" account. Please use your " + savedUser.getProviderType() + " account to login."
6261
);
6362
}
64-
updateUser(savedUser, userInfo);
63+
updateUser(userInfo);
6564
} else {
6665
//가입한적 없다면 회원가입을 진행.
6766
savedUser = createUser(userInfo, providerType);
@@ -73,7 +72,8 @@ protected OAuth2User process(OAuth2UserRequest userRequest, OAuth2User user) {
7372
}
7473

7574
@Transactional
76-
public void updateUser(User user, OAuth2UserInfo userInfo) {
75+
public void updateUser( OAuth2UserInfo userInfo) {
76+
User user = userRepository.findByUserIdAndIsDeleted(userInfo.getId(), false);
7777
log.debug("### OAUTH2 EMAIL <1> : {}", userInfo.getEmail());
7878
if(userInfo.getEmail() == null) return;
7979
if(user.getEmail() == null || (!user.getEmail().equals(userInfo.getEmail()))) {

0 commit comments

Comments
 (0)