Skip to content

Commit 2a6d542

Browse files
author
marshmallowing
committed
feat: 신규유저 포인트 적립
1 parent cce9470 commit 2a6d542

File tree

2 files changed

+26
-18
lines changed

2 files changed

+26
-18
lines changed

src/main/java/com/ongil/backend/domain/auth/service/GoogleLoginService.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,19 @@ public AuthResDto googleLogin(String code) {
5454
boolean isNewUser = !userRepository.existsByLoginTypeAndLoginId(LoginType.GOOGLE, socialId);
5555

5656
User user = userRepository.findByLoginTypeAndLoginId(LoginType.GOOGLE, socialId)
57-
.orElseGet(() -> userRepository.save(
58-
User.builder()
59-
.loginType(LoginType.GOOGLE)
60-
.loginId(socialId)
61-
.email(extractEmail(userInfo))
62-
.profileImg(extractProfileImg(userInfo))
63-
.name(extractName(userInfo))
64-
.build()
65-
));
57+
.orElseGet(() -> {
58+
User newUser = userRepository.save(
59+
User.builder()
60+
.loginType(LoginType.GOOGLE)
61+
.loginId(socialId)
62+
.email(extractEmail(userInfo))
63+
.profileImg(extractProfileImg(userInfo))
64+
.name(extractName(userInfo))
65+
.build()
66+
);
67+
newUser.restorePoints(2000);
68+
return newUser;
69+
});
6670

6771
String accessToken = jwtTokenProvider.createAccessToken(user.getId());
6872
String refreshToken = jwtTokenProvider.createRefreshToken(user.getId());

src/main/java/com/ongil/backend/domain/auth/service/KakaoLoginService.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,19 @@ public AuthResDto kakaoLogin(String code) {
5959
boolean isNewUser = !userRepository.existsByLoginTypeAndLoginId(LoginType.KAKAO, socialId);
6060

6161
User user = userRepository.findByLoginTypeAndLoginId(LoginType.KAKAO, socialId)
62-
.orElseGet(() -> userRepository.save(
63-
User.builder()
64-
.loginType(LoginType.KAKAO)
65-
.loginId(socialId)
66-
.email(extractEmail(userInfo))
67-
.profileImg(extractProfileImg(userInfo))
68-
.name(extractNickname(userInfo))
69-
.build()
70-
));
62+
.orElseGet(() -> {
63+
User newUser = userRepository.save(
64+
User.builder()
65+
.loginType(LoginType.KAKAO)
66+
.loginId(socialId)
67+
.email(extractEmail(userInfo))
68+
.profileImg(extractProfileImg(userInfo))
69+
.name(extractNickname(userInfo))
70+
.build()
71+
);
72+
newUser.restorePoints(2000);
73+
return newUser;
74+
});
7175

7276
// JWT 발급
7377
String accessToken = jwtTokenProvider.createAccessToken(user.getId());

0 commit comments

Comments
 (0)