Merge pull request #146 from prgrms-web-devcourse-final-project/feature/EA3-158-userimgupload

[EA3-158] fix:회원 이미지 수정 기능 수정

Author: hyeunS-P

src/main/java/grep/neogul_coder/domain/users/controller/UserController.java

@@ -7,9 +7,6 @@
 import grep.neogul_coder.domain.users.service.UserService;
 import grep.neogul_coder.global.auth.Principal;
 import grep.neogul_coder.global.response.ApiResponse;
-import grep.neogul_coder.global.utils.upload.FileUploadResponse;
-import grep.neogul_coder.global.utils.upload.FileUsageType;
-import grep.neogul_coder.global.utils.upload.uploader.GcpFileUploader;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -26,7 +23,6 @@
 public class UserController implements UserSpecification {
 
     private final UserService usersService;
-//    private final GcpFileUploader fileManager;
 
     @GetMapping("/me")
     public ApiResponse<UserResponse> get(@AuthenticationPrincipal Principal principal) {
@@ -46,20 +42,7 @@ public ApiResponse<Void> updateProfile(
             @RequestPart("nickname") String nickname,
             @RequestPart(value = "profileImage", required = false) MultipartFile profileImage
     ) throws IOException {
-
-//        String profileImageUrl = null;
-//
-//        if (profileImage != null && !profileImage.isEmpty()) {
-//            FileUploadResponse response = fileManager.upload(
-//                    profileImage,
-//                    principal.getUserId(),
-//                    FileUsageType.PROFILE,
-//                    principal.getUserId()
-//            );
-//            profileImageUrl = response.fileUrl();
-//        }
-//
-//        usersService.updateProfile(principal.getUserId(), nickname, profileImageUrl);
+        usersService.updateProfile(principal.getUserId(), nickname, profileImage);
         return ApiResponse.noContent();
     }
 

src/main/java/grep/neogul_coder/domain/users/entity/User.java

@@ -43,7 +43,9 @@ public static User UserInit(String email, String password, String nickname) {
 
     public void updateProfile(String nickname, String profileImageUrl) {
         this.nickname = nickname;
-        this.profileImageUrl = profileImageUrl;
+        if (profileImageUrl != null) {
+            this.profileImageUrl = profileImageUrl;
+        }
     }
 
     public void updatePassword(String password) {

src/main/java/grep/neogul_coder/domain/users/service/UserService.java

@@ -16,10 +16,18 @@
 import grep.neogul_coder.domain.users.exception.UserNotFoundException;
 import grep.neogul_coder.domain.users.exception.code.UserErrorCode;
 import grep.neogul_coder.domain.users.repository.UserRepository;
+import grep.neogul_coder.global.utils.upload.FileUploadResponse;
+import grep.neogul_coder.global.utils.upload.FileUsageType;
+import grep.neogul_coder.global.utils.upload.uploader.GcpFileUploader;
+import grep.neogul_coder.global.utils.upload.uploader.LocalFileUploader;
 import jakarta.transaction.Transactional;
+import java.io.IOException;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 @Transactional
 @Service
@@ -34,6 +42,15 @@ public class UserService {
     private final LinkService linkService;
     private final StudyManagementService studyManagementService;
 
+    @Autowired(required = false)
+    private GcpFileUploader gcpFileUploader;
+
+    @Autowired(required = false)
+    private LocalFileUploader localFileUploader;
+
+    @Autowired
+    private Environment environment;
+
 
     public User get(Long id) {
         User user = findUser(id);
@@ -66,10 +83,24 @@ public void signUp(SignUpRequest request) {
         linkRepository.save(Link.LinkInit(user.getId(), null, null));
     }
 
-    public void updateProfile(Long id, String nickname, String profileImageUrl) {
-        User user = findUser(id);
+    @Transactional
+    public void updateProfile(Long userId, String nickname, MultipartFile profileImage)
+        throws IOException {
+
+        User user = findUser(userId);
         isDuplicateNickname(nickname);
-        user.updateProfile(nickname, profileImageUrl);
+
+        String uploadedImageUrl;
+        if (isProfileImgExists(profileImage)) {
+            FileUploadResponse response = isProductionEnvironment()
+                ? gcpFileUploader.upload(profileImage, userId, FileUsageType.PROFILE, userId)
+                : localFileUploader.upload(profileImage, userId, FileUsageType.PROFILE, userId);
+            uploadedImageUrl = response.fileUrl();
+        } else {
+            uploadedImageUrl = user.getProfileImageUrl();
+        }
+
+        user.updateProfile(nickname, uploadedImageUrl);
     }
 
     public void updatePassword(Long id, String password, String newPassword,
@@ -162,6 +193,20 @@ private boolean isNotMatchCurrentPassword(String inputPassword, String storedPas
     private boolean isNotMatchPasswordCheck(String password, String passwordCheck) {
         return !password.equals(passwordCheck);
     }
+
+    private boolean isProductionEnvironment() {
+        for (String profile : environment.getActiveProfiles()) {
+            if ("prod".equals(profile)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isProfileImgExists(MultipartFile profileImage) {
+        return profileImage != null && !profileImage.isEmpty();
+    }
+
 }