From b7eb55c8f85be7e0f0edce598523a39b3555d626 Mon Sep 17 00:00:00 2001 From: dungbik Date: Thu, 12 Mar 2026 14:49:53 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Feat:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=A1=9C=EC=A7=81=20=EA=B0=84=EC=86=8C?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/flipnote/user/user/application/UserService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/flipnote/user/user/application/UserService.java b/src/main/java/flipnote/user/user/application/UserService.java index 3365975..b0f7c0a 100644 --- a/src/main/java/flipnote/user/user/application/UserService.java +++ b/src/main/java/flipnote/user/user/application/UserService.java @@ -50,7 +50,6 @@ 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( @@ -61,7 +60,6 @@ public UserUpdateResponse updateProfile(Long userId, UpdateProfileRequest reques .build()); profileImageUrl = changeImageResponse.getUrl(); - imageRefId = changeImageResponse.getImageRefId(); } catch (Exception ex) { log.error("updateProfile", ex); throw new BizException(ImageErrorCode.IMAGE_SERVICE_ERROR); @@ -69,7 +67,7 @@ public UserUpdateResponse updateProfile(Long userId, UpdateProfileRequest reques } user.updateProfile(request.getNickname(), request.getPhone(), request.getSmsAgree(), profileImageUrl); - return UserUpdateResponse.from(user, imageRefId); + return UserUpdateResponse.from(user, request.getImageRefId()); } @Transactional From cf90bc449b6125fd0a2cfcc47e3adcd7c6d4006b Mon Sep 17 00:00:00 2001 From: dungbik Date: Thu, 12 Mar 2026 18:51:44 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Feat:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/user/application/UserService.java | 37 ++++++++++++------- .../java/flipnote/user/user/domain/User.java | 2 +- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/main/java/flipnote/user/user/application/UserService.java b/src/main/java/flipnote/user/user/application/UserService.java index b0f7c0a..220bb07 100644 --- a/src/main/java/flipnote/user/user/application/UserService.java +++ b/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; @@ -51,19 +51,30 @@ public UserUpdateResponse updateProfile(Long userId, UpdateProfileRequest reques String profileImageUrl = 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(); - } 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); diff --git a/src/main/java/flipnote/user/user/domain/User.java b/src/main/java/flipnote/user/user/domain/User.java index 411549a..d09f98e 100644 --- a/src/main/java/flipnote/user/user/domain/User.java +++ b/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