Merge pull request #4 from FlipNoteTeam/feat/update-profile

Feat: 이미지 변경 로직 간소화

Author: dungbik

src/main/java/flipnote/user/user/application/UserService.java

@@ -3,10 +3,10 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import flipnote.image.grpc.v1.ActivateImageRequest;
+import flipnote.image.grpc.v1.ActivateImageResponse;
 import flipnote.image.grpc.v1.ChangeImageRequest;
 import flipnote.image.grpc.v1.ChangeImageResponse;
-import flipnote.image.grpc.v1.GetUrlByReferenceRequest;
-import flipnote.image.grpc.v1.GetUrlByReferenceResponse;
 import flipnote.image.grpc.v1.ImageCommandServiceGrpc;
 import flipnote.image.grpc.v1.Type;
 import flipnote.user.auth.infrastructure.jwt.JwtProvider;
@@ -50,26 +50,35 @@ public UserUpdateResponse updateProfile(Long userId, UpdateProfileRequest reques
 		User user = findActiveUser(userId);
 
 		String profileImageUrl = null;
-		Long imageRefId = null;
 		if (request.getImageRefId() != null) {
-            try {
-                ChangeImageResponse changeImageResponse = imageCommandServiceStub.changeImage(
-                    ChangeImageRequest.newBuilder()
-                        .setReferenceType(Type.USER)
-                        .setReferenceId(userId)
-                        .setImageRefId(request.getImageRefId())
-                        .build());
+			try {
+				if (User.DEFAULT_PROFILE_IMAGE_URL.equals(user.getProfileImageUrl())) {
+					ActivateImageResponse activateImageResponse = imageCommandServiceStub.activateImage(
+						ActivateImageRequest.newBuilder()
+							.setReferenceType(Type.USER)
+							.setReferenceId(userId)
+							.setImageRefId(request.getImageRefId())
+							.build());
 
-                profileImageUrl = changeImageResponse.getUrl();
-                imageRefId = changeImageResponse.getImageRefId();
-            } catch (Exception ex) {
+					profileImageUrl = activateImageResponse.getUrl();
+				} else {
+					ChangeImageResponse changeImageResponse = imageCommandServiceStub.changeImage(
+						ChangeImageRequest.newBuilder()
+							.setReferenceType(Type.USER)
+							.setReferenceId(userId)
+							.setImageRefId(request.getImageRefId())
+							.build());
+
+					profileImageUrl = changeImageResponse.getUrl();
+				}
+			} catch (Exception ex) {
 				log.error("updateProfile", ex);
-                throw new BizException(ImageErrorCode.IMAGE_SERVICE_ERROR);
-            }
+				throw new BizException(ImageErrorCode.IMAGE_SERVICE_ERROR);
+			}
 		}
 
 		user.updateProfile(request.getNickname(), request.getPhone(), request.getSmsAgree(), profileImageUrl);
-		return UserUpdateResponse.from(user, imageRefId);
+		return UserUpdateResponse.from(user, request.getImageRefId());
 	}
 
 	@Transactional

src/main/java/flipnote/user/user/domain/User.java

@@ -15,7 +15,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class User extends BaseEntity {
 
-    private static final String DEFAULT_PROFILE_IMAGE_URL =
+    public static final String DEFAULT_PROFILE_IMAGE_URL =
             "https://flipnote-bucket.s3.ap-northeast-2.amazonaws.com/image/default/user.png";
 
     @Id