Merge remote-tracking branch 'origin/develop' into develop

AdultOfNineteen · May 20, 2024 · edb66d9 · edb66d9
2 parents d224545 + 793451c
commit edb66d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Winey-API/src/main/java/com/example/wineyapi/user/converter/UserConverter.java b/Winey-API/src/main/java/com/example/wineyapi/user/converter/UserConverter.java
@@ -3,6 +3,7 @@
 import com.example.wineyapi.user.dto.UserRequest;
 import com.example.wineyapi.user.dto.UserResponse;
 import com.example.wineyapi.user.service.UserService;
+import com.example.wineycommon.constants.WineyStatic;
 import com.example.wineydomain.common.model.PreferenceStatus;
 import com.example.wineydomain.common.model.Status;
 import com.example.wineydomain.common.model.VerifyMessageStatus;
@@ -66,7 +67,8 @@ public static UserResponse.LoginUserDTO toLoginUserDTO(User user, String accessT
 	}
 
 	public static User toUser(KakaoUserInfoDto kakaoUserInfoDto) {
-		String nickName = staticNickNameFeignClient.getNickName().getWords().get(0);
+//		String nickName = staticNickNameFeignClient.getNickName().getWords().get(0);
+		String nickName = WineyStatic.DEFAULT_RANDOM_NICKNAME;
 
 		return User.builder()
 			.profileImgUrl(kakaoUserInfoDto.getProfileUrl())

diff --git a/Winey-Common/src/main/java/com/example/wineycommon/constants/WineyStatic.java b/Winey-Common/src/main/java/com/example/wineycommon/constants/WineyStatic.java
@@ -55,4 +55,6 @@ public class WineyStatic {
     public static final int VERIFICATION_MESSAGE_NUMBER_LENGTH = 6;
 
     public static final int VERIFICATION_MESSAGE_EXPIRE_AT = 5;
+
+    public static final String DEFAULT_RANDOM_NICKNAME = "하품하는 와이니";
 }