Merge pull request #66 from POPCONG/develop

[ Deploy ] 프로필 편집 기능 작성

Author: chanition

src/main/java/popcong/app/adapter/in/user/UserController.java

@@ -8,7 +8,12 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import popcong.app.application.auth.port.in.GoogleDriveSubmitUseCase;
+import popcong.app.application.image.port.out.ProfileImageUploadPort;
+import popcong.app.application.image.service.ProfileImageService;
+import popcong.app.application.user.dto.response.MyProfileResponseDto;
 import popcong.app.application.user.dto.response.UserResponseDto;
+import popcong.app.application.user.port.in.GetMyProfileUseCase;
+import popcong.app.application.user.port.in.UpdateMyProfileUseCase;
 import popcong.app.application.user.port.in.UserInfoUseCase;
 import popcong.app.domain.user.model.DocumentType;
 import popcong.app.domain.user.model.SignUpUserType;
@@ -31,6 +36,11 @@ public class UserController {
     private final GoogleDriveSubmitUseCase googleDriveSubmitUseCase;
     private final UserInfoUseCase userInfoUseCase;
 
+    private final GetMyProfileUseCase getMyProfileUseCase;
+    private final UpdateMyProfileUseCase updateMyProfileUseCase;
+    private final ProfileImageService profileImageService;
+    private final ProfileImageUploadPort profileImageUploadPort;
+
 
     /**
      * GUEST 파일 업로드 API
@@ -139,4 +149,41 @@ public ResponseDto<UserResponseDto> getUserInfo(@AuthenticationPrincipal User us
                 result
         );
     }
+
+    // 내 프로필 조회
+    @GetMapping("/mypage/me")
+    public ResponseDto<MyProfileResponseDto> getMyProfile(@AuthenticationPrincipal User user) {
+        if (user == null) throw new BusinessException(AuthErrorCode.UNAUTHORIZED);
+
+        MyProfileResponseDto dto = getMyProfileUseCase.get(user.userId());
+
+        return new ResponseDto<>(
+                HttpStatus.OK.value(),
+                "내 프로필 조회 성공",
+                dto
+        );
+    }
+
+    //프로필 편집
+    @PatchMapping(value = "/my/update-profile", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseDto<Void> updateMyProfile(
+            @AuthenticationPrincipal User user,
+            @RequestPart(required = false) String name,
+            @RequestPart(required = false) String introduction,
+            @RequestPart(required = false) MultipartFile profileImage
+    ) {
+        if (user == null) throw new BusinessException(AuthErrorCode.UNAUTHORIZED);
+
+        String profileImageUrl = null;
+        if (profileImage != null && !profileImage.isEmpty()) {
+            // S3 업로드 + IMAGE 테이블 반영 + USER.profile_image_url 동기화
+            profileImageUrl = profileImageUploadPort.uploadProfileImage(user.userId(), profileImage);
+
+        }
+        updateMyProfileUseCase.update(user.userId(), name, introduction, profileImageUrl);
+        return new ResponseDto<>(
+                HttpStatus.OK.value(),
+                "프로필 편집 성공",
+                null);
+    }
 }

src/main/java/popcong/app/adapter/out/persistence/image/repository/ImageJpaRepository.java

@@ -16,4 +16,6 @@ Optional<ImageJpaEntity> findByImageableTypeAndImageableIdAndSaveOrder(
     List<ImageJpaEntity> findByImageableIdAndImageableTypeOrderBySaveOrderAsc(
             Long imageableId, ImageableType imageableType
     );
+
+    void deleteByImageableTypeAndImageableId(ImageableType imageableType, Long imageableId);
 }

src/main/java/popcong/app/adapter/out/persistence/user/repository/UpdateUserAdapter.java

@@ -24,6 +24,5 @@ public void updateProfile(Long userId, String name, String introduction, String
         if (introduction != null) user.changeIntroduction(introduction);
         if (profileImageUrl != null) user.changeProfileImageUrl(profileImageUrl);
 
-
     }
 }

src/main/java/popcong/app/application/image/service/ProfileImageService.java

@@ -0,0 +1,31 @@
+package popcong.app.application.image.service;
+
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import popcong.app.adapter.out.persistence.image.entity.ImageJpaEntity;
+import popcong.app.adapter.out.persistence.image.repository.ImageJpaRepository;
+import popcong.app.domain.image.model.ImageableType;
+
+@Service
+@RequiredArgsConstructor
+public class ProfileImageService {
+
+    private final ImageJpaRepository imageRepo;
+
+    /** 기존 PROFILE 이미지를 지우고 새 URL 1장으로 교체 (IMAGE 테이블만) */
+    @Transactional
+    public void replaceProfileImage(Long userId, String newUrl) {
+        imageRepo.deleteByImageableTypeAndImageableId(ImageableType.PROFILE, userId);
+
+        ImageJpaEntity entity = ImageJpaEntity.builder()
+                .imageUrl(newUrl)
+                .saveOrder(0)
+                .imageableId(userId)
+                .imageableType(ImageableType.PROFILE)
+                .build();
+
+        imageRepo.save(entity);
+    }
+}

src/main/java/popcong/app/application/user/port/in/ProfileImageRecordUseCase.java

@@ -0,0 +1,5 @@
+package popcong.app.application.user.port.in;
+
+public interface ProfileImageRecordUseCase {
+    void recordProfileImage(Long userId, String imageUrl);
+}

src/main/java/popcong/app/application/user/port/out/UpdateUserPort.java

@@ -1,5 +1,6 @@
 package popcong.app.application.user.port.out;
 
 public interface UpdateUserPort {
+
     void updateProfile(Long userId, String name, String introduction, String profileImageUrl);
 }

src/main/java/popcong/app/application/user/service/ProfileImageRecordService.java

@@ -0,0 +1,18 @@
+//package popcong.app.application.user.service;
+//
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Service;
+//import org.springframework.transaction.annotation.Transactional;
+//
+//@Service
+//@RequiredArgsConstructor
+//@Transactional
+//public class ProfileImageRecordService {
+//
+//    private final SaveImagePort saveImagePort;
+//
+//    @Override
+//    public void recordProfileImage(Long userId, String imageUrl) {
+//        saveImagePort.upsertProfileImage(userId, imageUrl, 1); // 프로필은 항상 1순위
+//    }
+//}

src/main/java/popcong/app/application/user/service/UpdateMyProfileService.java

@@ -3,6 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import popcong.app.application.image.service.ProfileImageService;
 import popcong.app.application.user.port.in.UpdateMyProfileUseCase;
 import popcong.app.application.user.port.out.UpdateUserPort;
 
@@ -11,11 +12,18 @@
 public class UpdateMyProfileService implements UpdateMyProfileUseCase {
 
     private final UpdateUserPort updateUserPort;
+    private final ProfileImageService profileImageService;
 
     /** name/introduction/profileImageUrl 각각 null 이면 “해당 항목은 변경 없음” 처리 */
-    @Override
     @Transactional
+    @Override
     public void update(Long userId, String name, String introduction, String profileImageUrl) {
+        // 이름/소개만 업데이트
         updateUserPort.updateProfile(userId, name, introduction, profileImageUrl);
+
+        // 프로필 이미지는 ProfileImageService로 위임
+        if (profileImageUrl != null) {
+            profileImageService.replaceProfileImage(userId, profileImageUrl);
+        }
     }
 }