Skip to content

Commit b43193a

Browse files
committed
refactor: Provider -> SocialType enum 변환
1 parent 4a58412 commit b43193a

File tree

6 files changed

+30
-19
lines changed

6 files changed

+30
-19
lines changed

src/main/java/com/example/log4u/common/oauth2/dto/GoogleResponseDto.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import java.util.Map;
44

5-
import lombok.RequiredArgsConstructor;
5+
import com.example.log4u.domain.user.entity.SocialType;
66

7+
import lombok.RequiredArgsConstructor;
78

89
@RequiredArgsConstructor
9-
public class GoogleResponseDto implements OAuth2Response{
10+
public class GoogleResponseDto implements OAuth2Response {
1011

1112
private final Map<String, Object> attribute;
1213

13-
1414
@Override
15-
public String getProvider() {
16-
return "google";
15+
public SocialType getSocialType() {
16+
return SocialType.GOOGLE;
1717
}
1818

1919
@Override
@@ -25,7 +25,7 @@ public String getProviderId() {
2525
public String getEmail() {
2626
return attribute.get("email").toString();
2727
}
28-
28+
2929
// 구글은 이름이 닉네임
3030
@Override
3131
public String getName() {

src/main/java/com/example/log4u/common/oauth2/dto/KakaoResponseDto.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.util.Map;
44

5+
import com.example.log4u.domain.user.entity.SocialType;
6+
57
import lombok.RequiredArgsConstructor;
68

79
@RequiredArgsConstructor
@@ -19,8 +21,8 @@ public String getProfileImageUrl() {
1921
private final Map<String, Object> attribute;
2022

2123
@Override
22-
public String getProvider() {
23-
return "kakao";
24+
public SocialType getSocialType() {
25+
return SocialType.KAKAO;
2426
}
2527

2628
@Override

src/main/java/com/example/log4u/common/oauth2/dto/NaverResponseDto.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import java.util.Map;
44

5-
public class NaverResponseDto implements OAuth2Response{
5+
import com.example.log4u.domain.user.entity.SocialType;
6+
7+
public class NaverResponseDto implements OAuth2Response {
68

79
private final Map<String, Object> attribute;
810

@@ -11,8 +13,8 @@ public NaverResponseDto(Map<String, Object> attribute) {
1113
}
1214

1315
@Override
14-
public String getProvider() {
15-
return "naver";
16+
public SocialType getSocialType() {
17+
return SocialType.NAVER;
1618
}
1719

1820
@Override
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
package com.example.log4u.common.oauth2.dto;
22

3+
import com.example.log4u.domain.user.entity.SocialType;
4+
35
public interface OAuth2Response {
4-
String getProvider();
6+
SocialType getSocialType();
7+
58
String getProviderId();
9+
610
String getEmail();
11+
712
String getName();
13+
814
String getNickname();
15+
916
String getProfileImageUrl();
1017
}

src/main/java/com/example/log4u/domain/diary/controller/DiaryController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.example.log4u.domain.diary.dto.DiaryRequestDto;
1818
import com.example.log4u.domain.diary.dto.DiaryResponseDto;
1919
import com.example.log4u.domain.diary.service.DiaryService;
20+
import com.example.log4u.domain.user.entity.SocialType;
2021
import com.example.log4u.domain.user.entity.User;
2122

2223
import jakarta.validation.Valid;
@@ -84,7 +85,7 @@ private User mockUser() {
8485
.userId(1L)
8586
.nickname("목유저")
8687
.providerId("12345")
87-
.provider("MOCK")
88+
.socialType(SocialType.NAVER)
8889
8990
.statusMessage("목유저입니다.")
9091
.build();

src/main/java/com/example/log4u/domain/user/entity/User.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
import jakarta.persistence.Column;
77
import jakarta.persistence.Entity;
8+
import jakarta.persistence.EnumType;
9+
import jakarta.persistence.Enumerated;
810
import jakarta.persistence.GeneratedValue;
911
import jakarta.persistence.GenerationType;
1012
import jakarta.persistence.Id;
@@ -33,9 +35,6 @@ public class User extends BaseEntity {
3335
@Column(nullable = false)
3436
private String nickname;
3537

36-
@Column(nullable = false)
37-
private String provider;
38-
3938
private String email;
4039

4140
@Column(nullable = false)
@@ -46,9 +45,9 @@ public class User extends BaseEntity {
4645
@Column(nullable = false)
4746
private String role;
4847

49-
// @Enumerated(EnumType.STRING)
50-
// @Column(nullable = false)
51-
// private SocialType socialType;
48+
@Enumerated(EnumType.STRING)
49+
@Column(nullable = false)
50+
private SocialType socialType;
5251

5352
private String statusMessage;
5453

0 commit comments

Comments
 (0)