refactor: 프로필 이미지 가져오는 로직 수정

sapiens2000 · sapiens2000 · commit 005f1f12f28f · 2025-04-01T11:28:23.000+09:00
프로필 이미지 칼럼명 변경 및 주석 제거
diff --git a/src/main/java/com/example/log4u/common/oauth2/dto/GoogleResponseDto.java b/src/main/java/com/example/log4u/common/oauth2/dto/GoogleResponseDto.java
@@ -38,7 +38,7 @@ public String getNickname() {
 	}
 
 	@Override
-	public String getProfileImageUrl() {
+	public String getProfileImage() {
 		return attribute.get("picture").toString();
 	}
 
diff --git a/src/main/java/com/example/log4u/common/oauth2/dto/KakaoResponseDto.java b/src/main/java/com/example/log4u/common/oauth2/dto/KakaoResponseDto.java
@@ -8,14 +8,20 @@
 
 @RequiredArgsConstructor
 public class KakaoResponseDto implements OAuth2Response {
+
+	private static final String KAKAO_ACCOUNT = "kakao_account";
+
 	@Override
 	public String getNickname() {
 		return "";
 	}
 
 	@Override
-	public String getProfileImageUrl() {
-		return "";
+	public String getProfileImage() {
+		// kakao_account.profile.profile_image_url 형태로 응답
+		Map<String, Object> account = (Map<String, Object>)attribute.get(KAKAO_ACCOUNT);
+		Map<String, Object> profile = (Map<String, Object>)account.get("profile");
+		return (String)profile.get("profile_image_url");
 	}
 
 	private final Map<String, Object> attribute;
@@ -32,13 +38,13 @@ public String getProviderId() {
 
 	@Override
 	public String getEmail() {
-		Map<String, Object> account = (Map<String, Object>)attribute.get("kakao_account");
+		Map<String, Object> account = (Map<String, Object>)attribute.get(KAKAO_ACCOUNT);
 		return (String)account.get("email");
 	}
 
 	@Override
 	public String getName() {
-		Map<String, Object> account = (Map<String, Object>)attribute.get("kakao_account");
+		Map<String, Object> account = (Map<String, Object>)attribute.get(KAKAO_ACCOUNT);
 		Map<String, Object> profile = (Map<String, Object>)account.get("profile");
 		return profile.get("nickname").toString();
 	}
diff --git a/src/main/java/com/example/log4u/common/oauth2/dto/NaverResponseDto.java b/src/main/java/com/example/log4u/common/oauth2/dto/NaverResponseDto.java
@@ -38,7 +38,7 @@ public String getNickname() {
 	}
 
 	@Override
-	public String getProfileImageUrl() {
+	public String getProfileImage() {
 		return attribute.get("profile_image").toString();
 	}
 
diff --git a/src/main/java/com/example/log4u/common/oauth2/dto/OAuth2Response.java b/src/main/java/com/example/log4u/common/oauth2/dto/OAuth2Response.java
@@ -13,5 +13,5 @@ public interface OAuth2Response {
 
 	String getNickname();
 
-	String getProfileImageUrl();
+	String getProfileImage();
 }
diff --git a/src/main/java/com/example/log4u/domain/user/dto/UserCreateRequestDto.java b/src/main/java/com/example/log4u/domain/user/dto/UserCreateRequestDto.java
@@ -1,51 +1,53 @@
-package com.example.log4u.common.oauth2.dto;
+package com.example.log4u.domain.user.dto;
 
+import com.example.log4u.common.oauth2.dto.OAuth2Response;
+import com.example.log4u.domain.user.entity.SocialType;
 import com.example.log4u.domain.user.entity.User;
 
-public record UserCreateRequestDto (
-	String provider,
+public record UserCreateRequestDto(
+	SocialType socialType,
 	String providerId,
 	Long userId,
 	String name,
 	String email,
 	String nickname,
-	String profileImageUrl,
+	String profileImage,
 	String role
-){
-	public static User toEntity(UserCreateRequestDto userCreateRequestDto){
+) {
+	public static User toEntity(UserCreateRequestDto userCreateRequestDto) {
 		return User.builder()
-			.provider(userCreateRequestDto.provider)
+			.socialType(userCreateRequestDto.socialType)
 			.providerId(userCreateRequestDto.providerId)
 			.name(userCreateRequestDto.name)
 			.email(userCreateRequestDto.email)
 			.nickname(userCreateRequestDto.nickname)
-			.profileImageUrl(userCreateRequestDto.profileImageUrl)
+			.profileImage(userCreateRequestDto.profileImage)
 			.role(userCreateRequestDto.role)
 			.build();
 	}
 
-	public static UserCreateRequestDto fromOAuth2Response(OAuth2Response oAuth2Response, Long userId, String role){
+	public static UserCreateRequestDto fromOAuth2Response(OAuth2Response oAuth2Response, Long userId, String role) {
 		return new UserCreateRequestDto(
-			oAuth2Response.getProvider(),
+			oAuth2Response.getSocialType(),
 			oAuth2Response.getProviderId(),
 			userId,
 			oAuth2Response.getName(),
 			oAuth2Response.getEmail(),
 			oAuth2Response.getNickname(),
-			oAuth2Response.getProfileImageUrl(),
+			oAuth2Response.getProfileImage(),
 			role
 		);
 	}
 
-	public static UserCreateRequestDto fromEntity(User user){
+	public static UserCreateRequestDto fromEntity(User user) {
 		return new UserCreateRequestDto(
-			user.getProvider(),
+			user.getSocialType(),
 			user.getProviderId(),
 			user.getUserId(),
 			user.getName(),
 			user.getEmail(),
 			user.getNickname(),
-			user.getProfileImageUrl(),
+			user.getProfileImage(),
 			user.getRole()
 		);
 	}
diff --git a/src/main/java/com/example/log4u/domain/user/entity/User.java b/src/main/java/com/example/log4u/domain/user/entity/User.java
@@ -40,7 +40,7 @@ public class User extends BaseEntity {
 	@Column(nullable = false)
 	private String providerId;
 
-	private String profileImageUrl;
+	private String profileImage;
 
 	@Column(nullable = false)
 	private String role;
@@ -51,13 +51,13 @@ public class User extends BaseEntity {
 
 	private String statusMessage;
 
-	// @Column(nullable = false)
-	// private boolean isPremium;
+	@Column(nullable = false)
+	private boolean isPremium = false;
 
 	public void updateOauth2Profile(OAuth2Response oAuth2Response) {
 		this.email = oAuth2Response.getEmail();
 		this.name = oAuth2Response.getName();
 		this.nickname = oAuth2Response.getNickname();
-		this.profileImageUrl = oAuth2Response.getProfileImageUrl();
+		this.profileImage = oAuth2Response.getProfileImage();
 	}
 }
diff --git a/src/test/java/com/example/log4u/fixture/UserFixture.java b/src/test/java/com/example/log4u/fixture/UserFixture.java
@@ -9,7 +9,7 @@ public static User createUserFixture() {
 		return User.builder()
 			.userId(1L)
 			.nickname("testUser")
-			.providerId(123L)
+			.providerId("123")
 			.email("test@example.com")
 			.socialType(SocialType.KAKAO)
 			.statusMessage("상태 메시지")
@@ -21,7 +21,7 @@ public static User createUserFixture(Long userId) {
 		return User.builder()
 			.userId(userId)
 			.nickname("testUser" + userId)
-			.providerId(100L + userId)
+			.providerId("100 + userId")
 			.email("test" + userId + "@example.com")
 			.socialType(SocialType.KAKAO)
 			.statusMessage("상태 메시지 " + userId)
@@ -33,7 +33,7 @@ public static User createPremiumUserFixture(Long userId) {
 		return User.builder()
 			.userId(userId)
 			.nickname("premiumUser" + userId)
-			.providerId(1000L + userId)
+			.providerId("1000L + userId")
 			.email("premium" + userId + "@example.com")
 			.socialType(SocialType.KAKAO)
 			.statusMessage("프리미엄 사용자")

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public String getNickname() {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
`41`		`- public String getProfileImageUrl() {`
	`41`	`+ public String getProfileImage() {`
`42`	`42`	`return attribute.get("picture").toString();`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ public interface OAuth2Response {`
`13`	`13`
`14`	`14`	`String getNickname();`
`15`	`15`
`16`		`- String getProfileImageUrl();`
	`16`	`+ String getProfileImage();`
`17`	`17`	`}`