Merge pull request #93 from marshmallowing/fix/profile

#92 Fix: 프로필 이미지 가져오는 방식 수정

Author: marshmallowing

src/main/java/com/memesphere/domain/image/controller/ImageController.java

@@ -5,9 +5,11 @@
 import com.memesphere.domain.image.service.ImageService;
 import com.memesphere.domain.image.service.ProfileService;
 import com.memesphere.global.apipayload.ApiResponse;
+import com.memesphere.global.jwt.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("/image")
@@ -33,14 +35,14 @@ public ApiResponse<PresignedUrlResponse> uploadFile(@RequestBody ImageExtensionR
         return ApiResponse.onSuccess(url);
     }
 
-    //프로필 이미지 조회 Api
-    @GetMapping("/profile/{user_id}")
+    // 프로필 이미지 조회 Api
+    @GetMapping("/profile")
     @Operation(summary = "프로필 이미지 조회 API",
-            description = "회원가입한 유저의 프로필 이미지를 반환합니다.")
-    public ApiResponse<String> getProfile(@PathVariable("user_id") Long user_id) {
-        String profileImage = profileService.getProfileImage(user_id);
+            description = "현재 로그인한 유저의 프로필 이미지를 반환합니다.")
+    public ApiResponse<String> getProfile(@AuthenticationPrincipal CustomUserDetails customUserDetails) {
+        // 현재 로그인한 유저 정보에서 프로필 이미지 가져오기
+        String profileImage = profileService.getProfileImage(customUserDetails);
 
-        // null이거나 ""이면 result를 null로 반환
         return ApiResponse.onSuccess((profileImage == null || profileImage.isEmpty()) ? "null" : profileImage);
     }
 

src/main/java/com/memesphere/domain/image/service/ProfileService.java

@@ -4,18 +4,23 @@
 import com.memesphere.domain.user.repository.UserRepository;
 import com.memesphere.global.apipayload.code.status.ErrorStatus;
 import com.memesphere.global.apipayload.exception.GeneralException;
+import com.memesphere.global.jwt.CustomUserDetails;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
 public class ProfileService {
-    private final UserRepository userRepository;
 
     // 프로필 이미지 반환
-    public String getProfileImage(Long userId) {
-        User user = userRepository.findById(userId)
-                .orElseThrow(() -> new GeneralException(ErrorStatus.USER_NOT_FOUND));
+    public String getProfileImage(@AuthenticationPrincipal CustomUserDetails customUserDetails) {
+        if (customUserDetails == null || customUserDetails.getUser() == null) {
+            throw new GeneralException(ErrorStatus.USER_NOT_FOUND);
+        }
+
+        User user = customUserDetails.getUser();
         return user.getProfileImage();
     }
+
 }