Skip to content

Commit 52aaafb

Browse files
committed
!hotfix: sigh-up field 예외처리 추가
1 parent 37aeff4 commit 52aaafb

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

src/main/java/com/gdg/poppet/auth/application/service/AuthServiceImpl.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,10 @@ public UserDto kakaoOAuthLogin(String accessCode, HttpServletResponse httpServle
3535
return UserDto.of(user.getUsername());
3636
}
3737

38-
3938
private User createNewUser(KakaoProfileDTO kakaoProfile) {
40-
User newUser = AuthConverter.toUser(
41-
kakaoProfile.getId(),
42-
kakaoProfile.getKakaoAccount().getName(),
43-
kakaoProfile.getKakaoAccount().getGender(),
44-
getEstimatedAge(kakaoProfile.getKakaoAccount().getAgeRange())
45-
);
39+
User newUser = AuthConverter.toUser(kakaoProfile);
40+
newUser.setAge(getEstimatedAge(kakaoProfile.getKakaoAccount().getAgeRange()));
41+
4642
return userRepository.save(newUser);
4743
}
4844

src/main/java/com/gdg/poppet/auth/domain/converter/AuthConverter.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
11
package com.gdg.poppet.auth.domain.converter;
22

3+
import com.gdg.poppet.auth.application.dto.response.KakaoProfileDTO;
34
import com.gdg.poppet.email.domain.enums.EmailPeriod;
45
import com.gdg.poppet.user.domain.enums.Gender;
56
import com.gdg.poppet.user.domain.model.User;
67

78
public class AuthConverter {
8-
public static User toUser(long userId, String username, String gender, int age) {
9+
public static User toUser(KakaoProfileDTO kakaoProfile) {
10+
String username = kakaoProfile.getKakaoAccount().getName();
11+
if (username == null) {
12+
username = kakaoProfile.getKakaoAccount().getProfile().getNickname();
13+
}
14+
15+
String gender = kakaoProfile.getKakaoAccount().getGender();
16+
if (gender == null) {
17+
gender = Gender.MALE.toString();
18+
}
19+
920
return User.builder()
10-
.userId(userId)
21+
.userId(kakaoProfile.getId())
1122
.username(username)
1223
.gender(Gender.fromString(gender))
13-
.age(age)
1424
.emailPeriod(EmailPeriod.THREE)
1525
.build();
1626
}

src/main/java/com/gdg/poppet/user/domain/model/User.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,8 @@ public class User extends BaseEntity {
4343
public void updateEmailPeriod(int emailPeriod) {
4444
this.emailPeriod = EmailPeriod.fromValue(emailPeriod);
4545
}
46+
47+
public void setAge(int age) {
48+
this.age = age;
49+
}
4650
}

0 commit comments

Comments
 (0)