Merge remote-tracking branch 'origin/dev' into fix/287

Author: loseminho

src/main/java/com/back/domain/board/post/service/PostService.java

@@ -17,6 +17,7 @@
 import com.back.domain.file.entity.FileAttachment;
 import com.back.domain.file.repository.AttachmentMappingRepository;
 import com.back.domain.file.repository.FileAttachmentRepository;
+import com.back.domain.file.service.FileService;
 import com.back.domain.user.common.entity.User;
 import com.back.domain.user.common.repository.UserRepository;
 import com.back.global.exception.CustomException;
@@ -40,6 +41,7 @@ public class PostService {
     private final PostCategoryRepository postCategoryRepository;
     private final FileAttachmentRepository fileAttachmentRepository;
     private final AttachmentMappingRepository attachmentMappingRepository;
+    private final FileService fileService;
 
     /**
      * 게시글 생성 서비스
@@ -183,7 +185,15 @@ public void deletePost(Long postId, Long userId) {
             throw new CustomException(ErrorCode.POST_NO_PERMISSION);
         }
 
-        // AttachmentMapping 매핑 제거
+        // 첨부 파일 삭제
+        List<AttachmentMapping> mappings =
+                attachmentMappingRepository.findAllByEntityTypeAndEntityId(EntityType.POST, post.getId());
+        for (AttachmentMapping mapping : mappings) {
+            FileAttachment fileAttachment = mapping.getFileAttachment();
+            if (fileAttachment != null) {
+                fileService.deleteFile(fileAttachment.getId(), userId);
+            }
+        }
         attachmentMappingRepository.deleteAllByEntityTypeAndEntityId(EntityType.POST, post.getId());
 
         // Post 삭제

src/main/java/com/back/domain/file/entity/AttachmentMapping.java

@@ -9,8 +9,8 @@
 @Getter
 @NoArgsConstructor
 public class AttachmentMapping extends BaseEntity {
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "attachment_id")
+    @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
+    @JoinColumn(name = "attachment_id", nullable = false)
     private FileAttachment fileAttachment;
 
     @Enumerated(EnumType.STRING)

src/main/java/com/back/domain/file/entity/FileAttachment.java

@@ -7,9 +7,6 @@
 import lombok.NoArgsConstructor;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Entity
 @Getter
 @NoArgsConstructor
@@ -29,8 +26,8 @@ public class FileAttachment extends BaseEntity {
     @JoinColumn(name = "uploaded_by")
     private User user;
 
-    @OneToMany(mappedBy = "fileAttachment", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<AttachmentMapping> attachmentMappings = new ArrayList<>();
+    @OneToOne(mappedBy = "fileAttachment", fetch = FetchType.LAZY)
+    private AttachmentMapping attachmentMapping;
 
     public FileAttachment(
             String storedName,

src/main/java/com/back/domain/file/repository/AttachmentMappingRepository.java

@@ -9,6 +9,7 @@
 
 public interface AttachmentMappingRepository extends JpaRepository<AttachmentMapping, Long> {
     List<AttachmentMapping> findAllByEntityTypeAndEntityId(EntityType entityType, Long entityId);
+    Optional<AttachmentMapping> findByEntityTypeAndEntityId(EntityType entityType, Long entityId);
 
     void deleteAllByEntityTypeAndEntityId(EntityType entityType, Long entityId);
 }

src/main/java/com/back/domain/file/repository/FileAttachmentRepository.java

@@ -3,5 +3,8 @@
 import com.back.domain.file.entity.FileAttachment;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.Optional;
+
 public interface FileAttachmentRepository extends JpaRepository<FileAttachment, Long> {
+    Optional<FileAttachment> findByPublicURL(String publicUrl);
 }

src/main/java/com/back/domain/user/account/controller/AccountController.java

@@ -5,7 +5,7 @@
 import com.back.domain.board.post.dto.PostListResponse;
 import com.back.domain.user.account.controller.docs.AccountControllerDocs;
 import com.back.domain.user.account.dto.ChangePasswordRequest;
-import com.back.domain.user.account.dto.UpdateUserProfileRequest;
+import com.back.domain.user.account.dto.UserProfileRequest;
 import com.back.domain.user.account.dto.UserDetailResponse;
 import com.back.domain.user.account.service.AccountService;
 import com.back.global.common.dto.RsData;
@@ -42,7 +42,7 @@ public ResponseEntity<RsData<UserDetailResponse>> getMyInfo(
     @PatchMapping
     public ResponseEntity<RsData<UserDetailResponse>> updateMyProfile(
             @AuthenticationPrincipal CustomUserDetails user,
-            @Valid @RequestBody UpdateUserProfileRequest request
+            @Valid @RequestBody UserProfileRequest request
     ) {
         UserDetailResponse updated = accountService.updateUserProfile(user.getUserId(), request);
         return ResponseEntity

src/main/java/com/back/domain/user/account/controller/docs/AccountControllerDocs.java

@@ -4,7 +4,7 @@
 import com.back.domain.board.common.dto.PageResponse;
 import com.back.domain.board.post.dto.PostListResponse;
 import com.back.domain.user.account.dto.ChangePasswordRequest;
-import com.back.domain.user.account.dto.UpdateUserProfileRequest;
+import com.back.domain.user.account.dto.UserProfileRequest;
 import com.back.domain.user.account.dto.UserDetailResponse;
 import com.back.global.common.dto.RsData;
 import com.back.global.security.user.CustomUserDetails;
@@ -307,7 +307,7 @@ ResponseEntity<RsData<UserDetailResponse>> getMyInfo(
     })
     ResponseEntity<RsData<UserDetailResponse>> updateMyProfile(
             @AuthenticationPrincipal CustomUserDetails user,
-            @Valid @RequestBody UpdateUserProfileRequest request
+            @Valid @RequestBody UserProfileRequest request
     );
 
     @Operation(

src/main/java/com/back/domain/user/account/dto/UpdateUserProfileRequest.java renamed to src/main/java/com/back/domain/user/account/dto/UserProfileRequest.java

@@ -13,7 +13,7 @@
  * @param bio               사용자의 자기소개
  * @param birthDate         사용자의 생년월일
  */
-public record UpdateUserProfileRequest(
+public record UserProfileRequest(
         @NotBlank @Size(max = 20) String nickname,
         String profileImageUrl,
         @Size(max = 255) String bio,

src/main/java/com/back/domain/user/account/service/AccountService.java

@@ -5,8 +5,14 @@
 import com.back.domain.board.common.dto.PageResponse;
 import com.back.domain.board.post.dto.PostListResponse;
 import com.back.domain.board.post.repository.PostRepository;
+import com.back.domain.file.entity.AttachmentMapping;
+import com.back.domain.file.entity.EntityType;
+import com.back.domain.file.entity.FileAttachment;
+import com.back.domain.file.repository.AttachmentMappingRepository;
+import com.back.domain.file.repository.FileAttachmentRepository;
+import com.back.domain.file.service.FileService;
 import com.back.domain.user.account.dto.ChangePasswordRequest;
-import com.back.domain.user.account.dto.UpdateUserProfileRequest;
+import com.back.domain.user.account.dto.UserProfileRequest;
 import com.back.domain.user.account.dto.UserDetailResponse;
 import com.back.domain.user.common.entity.User;
 import com.back.domain.user.common.entity.UserProfile;
@@ -23,6 +29,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Optional;
+
 @Service
 @RequiredArgsConstructor
 @Transactional
@@ -31,6 +39,9 @@ public class AccountService {
     private final UserProfileRepository userProfileRepository;
     private final CommentRepository commentRepository;
     private final PostRepository postRepository;
+    private final FileAttachmentRepository fileAttachmentRepository;
+    private final AttachmentMappingRepository attachmentMappingRepository;
+    private final FileService fileService;
     private final PasswordEncoder passwordEncoder;
 
     /**
@@ -54,7 +65,7 @@ public UserDetailResponse getUserInfo(Long userId) {
      * 3. UserProfile 업데이트
      * 4. UserDetailResponse 변환 및 반환
      */
-    public UserDetailResponse updateUserProfile(Long userId, UpdateUserProfileRequest request) {
+    public UserDetailResponse updateUserProfile(Long userId, UserProfileRequest request) {
 
         // 사용자 조회 및 상태 검증
         User user = getValidUser(userId);
@@ -71,10 +82,48 @@ public UserDetailResponse updateUserProfile(Long userId, UpdateUserProfileReques
         profile.setBio(request.bio());
         profile.setBirthDate(request.birthDate());
 
+        // 프로필 이미지 및 매핑 업데이트
+        updateProfileImage(userId, request.profileImageUrl());
+
         // UserDetailResponse로 변환하여 반환
         return UserDetailResponse.from(user);
     }
 
+    /**
+     * 프로필 이미지 및 매핑 교체 로직
+     * - 기존 이미지(S3 + FileAttachment + Mapping) 삭제 후 새 매핑 생성
+     */
+    private void updateProfileImage(Long userId, String newImageUrl) {
+
+        // 기존 매핑 및 파일 삭제
+        attachmentMappingRepository.findByEntityTypeAndEntityId(EntityType.PROFILE, userId)
+                .ifPresent(existingMapping -> {
+                    FileAttachment oldAttachment = existingMapping.getFileAttachment();
+                    if (oldAttachment != null) {
+                        fileService.deleteFile(oldAttachment.getId(), userId);
+                    }
+                    attachmentMappingRepository.delete(existingMapping);
+                });
+
+        // 새 이미지가 없는 경우
+        if (newImageUrl == null || newImageUrl.isBlank()) {
+            return;
+        }
+
+        // 새 파일 조회 및 검증
+        FileAttachment newAttachment = fileAttachmentRepository
+                .findByPublicURL(newImageUrl)
+                .orElseThrow(() -> new CustomException(ErrorCode.FILE_NOT_FOUND));
+
+        if (!newAttachment.getUser().getId().equals(userId)) {
+            throw new CustomException(ErrorCode.FILE_ACCESS_DENIED);
+        }
+
+        // 새 매핑 생성 및 저장
+        AttachmentMapping newMapping = new AttachmentMapping(newAttachment, EntityType.PROFILE, userId);
+        attachmentMappingRepository.save(newMapping);
+    }
+
     /**
      * 비밀번호 변경 서비스
      * 1. 사용자 조회 및 상태 검증
@@ -114,6 +163,9 @@ public void deleteUser(Long userId) {
         // 사용자 조회 및 상태 검증
         User user = getValidUser(userId);
 
+        // 프로필 이미지 및 매핑 삭제
+        deleteProfileImage(userId);
+
         // 상태 변경 (soft delete)
         user.setUserStatus(UserStatus.DELETED);
 
@@ -133,6 +185,20 @@ public void deleteUser(Long userId) {
         }
     }
 
+    /**
+     * 프로필 이미지 및 매핑 삭제
+     */
+    private void deleteProfileImage(Long userId) {
+        attachmentMappingRepository.findByEntityTypeAndEntityId(EntityType.PROFILE, userId)
+                .ifPresent(mapping -> {
+                    FileAttachment attachment = mapping.getFileAttachment();
+                    if (attachment != null) {
+                        fileService.deleteFile(attachment.getId(), userId);
+                    }
+                    attachmentMappingRepository.delete(mapping);
+                });
+    }
+
     /**
      * 내 게시글 목록 조회 서비스
      * 1. 사용자 조회 및 상태 검증

src/main/java/com/back/global/websocket/event/SessionDisconnectedEvent.java

@@ -0,0 +1,20 @@
+package com.back.global.websocket.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * WebSocket 세션 연결이 종료되었을 때 발생하는 내부 이벤트.
+ * 이 이벤트는 SessionManager가 발행하고, ParticipantService가 구독하여 처리합니다.
+ */
+@Getter
+public class SessionDisconnectedEvent extends ApplicationEvent {
+
+    private final Long userId;
+
+    public SessionDisconnectedEvent(Object source, Long userId) {
+        super(source);
+        this.userId = userId;
+    }
+}
+