[Feat] 피드 삭제 api 개발 및 post soft delete 전략 도입

src/main/java/konkuk/thip/comment/adapter/out/jpa/CommentJpaEntity.java

@@ -10,6 +10,9 @@
 import lombok.*;
 import org.hibernate.annotations.SQLDelete;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Entity
 @Table(name = "comments")
 @Getter
@@ -52,6 +55,10 @@ public class CommentJpaEntity extends BaseJpaEntity {
     @JoinColumn(name = "parent_id")
     private CommentJpaEntity parent;
 
+    // 삭제용 댓글 좋아요 양방향 매핑 관계
+    @OneToMany(mappedBy = "commentJpaEntity", cascade = CascadeType.REMOVE, orphanRemoval = true)
+    private List<CommentLikeJpaEntity> commentLikeList = new ArrayList<>();
+
     public CommentJpaEntity updateFrom(Comment comment) {
         this.reportCount = comment.getReportCount();
         this.likeCount = comment.getLikeCount();

src/main/java/konkuk/thip/comment/adapter/out/persistence/CommentCommandPersistenceAdapter.java

@@ -3,6 +3,7 @@
 import konkuk.thip.comment.adapter.out.jpa.CommentJpaEntity;
 import konkuk.thip.comment.adapter.out.mapper.CommentMapper;
 import konkuk.thip.comment.adapter.out.persistence.repository.CommentJpaRepository;
+import konkuk.thip.comment.adapter.out.persistence.repository.CommentLikeJpaRepository;
 import konkuk.thip.comment.application.port.out.CommentCommandPort;
 import konkuk.thip.comment.domain.Comment;
 import konkuk.thip.common.exception.EntityNotFoundException;
@@ -30,6 +31,8 @@ public class CommentCommandPersistenceAdapter implements CommentCommandPort {
     private final RecordJpaRepository recordJpaRepository;
     private final VoteJpaRepository voteJpaRepository;
     private final UserJpaRepository userJpaRepository;
+    private final CommentLikeJpaRepository commentLikeJpaRepository;
+
     private final CommentMapper commentMapper;
 
     @Override
@@ -89,4 +92,10 @@ public void delete(Comment comment) {
         commentJpaRepository.delete(commentJpaEntity);
     }
 
+    @Override
+    public void softDeleteAllByPostId(Long postId) {
+        commentLikeJpaRepository.deleteAllByPostId(postId);
+        commentJpaRepository.softDeleteAllByPostId(postId);
+    }
+
 }

src/main/java/konkuk/thip/comment/adapter/out/persistence/repository/CommentJpaRepository.java

@@ -3,9 +3,17 @@
 import konkuk.thip.comment.adapter.out.jpa.CommentJpaEntity;
 import konkuk.thip.common.entity.StatusType;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.Optional;
 
 public interface CommentJpaRepository extends JpaRepository<CommentJpaEntity, Long>, CommentQueryRepository {
     Optional<CommentJpaEntity> findByCommentIdAndStatus(Long commentId, StatusType status);
+
+    @Modifying
+    @Query("UPDATE CommentJpaEntity c SET c.status = 'INACTIVE' WHERE c.postJpaEntity.postId = :postId")
+    void softDeleteAllByPostId(@Param("postId") Long postId);
+
 }

src/main/java/konkuk/thip/comment/adapter/out/persistence/repository/CommentLikeJpaRepository.java

@@ -30,4 +30,14 @@ public interface CommentLikeJpaRepository extends JpaRepository<CommentLikeJpaEn
 
     @Query("SELECT c.commentJpaEntity.commentId FROM CommentLikeJpaEntity c WHERE c.userJpaEntity.userId = :userId AND c.commentJpaEntity.commentId IN :commentIds")
     Set<Long> findCommentIdsLikedByUser(@Param("commentIds") Set<Long> commentIds, @Param("userId") Long userId);
+
+    @Modifying
+    @Query("""
+           DELETE FROM CommentLikeJpaEntity cl
+           WHERE cl.commentJpaEntity.commentId IN (
+                SELECT c.commentId FROM CommentJpaEntity c
+                WHERE c.postJpaEntity.postId = :postId
+           )
+           """)
+    void deleteAllByPostId(@Param("postId") Long postId);
 }

src/main/java/konkuk/thip/comment/application/port/out/CommentCommandPort.java

@@ -23,4 +23,5 @@ default Comment getByIdOrThrow(Long id) {
 
     void delete(Comment comment);
 
+    void softDeleteAllByPostId(Long postId);
 }

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -167,6 +167,7 @@ public enum ErrorCode implements ResponseCode {
      * 180000 : Post error
      */
     POST_TYPE_NOT_MATCH(HttpStatus.BAD_REQUEST, 180000, "일치하는 게시물 타입 이름이 없습니다. [FEED, RECORD, VOTE] 중 하나여야 합니다."),
+    POST_ALREADY_DELETED(HttpStatus.BAD_REQUEST, 180001, "이미 삭제된 게시물 입니다."),
 
     /**
      * 185000 : PostLike error

src/main/java/konkuk/thip/common/swagger/SwaggerResponseDescription.java

@@ -192,6 +192,10 @@ public enum SwaggerResponseDescription {
             POST_LIKE_COUNT_UNDERFLOW,
             FEED_ACCESS_FORBIDDEN
     ))),
+    FEED_DELETE(new LinkedHashSet<>(Set.of(
+            FEED_NOT_FOUND,
+            FEED_ACCESS_FORBIDDEN
+    ))),
 
     // Comment
     COMMENT_CREATE(new LinkedHashSet<>(Set.of(

src/main/java/konkuk/thip/feed/adapter/in/web/FeedCommandController.java

@@ -15,6 +15,7 @@
 import konkuk.thip.feed.adapter.in.web.response.FeedIsLikeResponse;
 import konkuk.thip.feed.adapter.in.web.response.FeedIsSavedResponse;
 import konkuk.thip.feed.application.port.in.FeedCreateUseCase;
+import konkuk.thip.feed.application.port.in.FeedDeleteUseCase;
 import konkuk.thip.feed.application.port.in.FeedSavedUseCase;
 import konkuk.thip.feed.application.port.in.FeedUpdateUseCase;
 import konkuk.thip.post.application.port.in.PostLikeUseCase;
@@ -35,6 +36,7 @@ public class FeedCommandController {
     private final FeedUpdateUseCase feedUpdateUseCase;
     private final FeedSavedUseCase feedSavedUseCase;
     private final PostLikeUseCase postLikeUseCase;
+    private final FeedDeleteUseCase feedDeleteUseCase;
 
     @Operation(
             summary = "피드 작성",
@@ -91,4 +93,17 @@ public BaseResponse<FeedIsLikeResponse> likeFeed(
         return BaseResponse.ok(FeedIsLikeResponse.of(postLikeUseCase.changeLikeStatusPost(request.toCommand(userId, feedId))));
     }
 
+    @Operation(
+            summary = "피드 삭제",
+            description = "사용자가 피드를 삭제합니다."
+    )
+    @ExceptionDescription(FEED_DELETE)
+    @DeleteMapping("/feeds/{feedId}")
+    public BaseResponse<Void> deleteFeed(
+            @Parameter(description = "삭제하려는 피드 ID", example = "1") @PathVariable("feedId") final Long feedId,
+            @Parameter(hidden = true) @UserId final Long userId) {
+        feedDeleteUseCase.deleteFeed(feedId, userId);
+        return BaseResponse.ok(null);
+    }
+
 }

src/main/java/konkuk/thip/feed/adapter/out/jpa/FeedJpaEntity.java

@@ -12,6 +12,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Entity
@@ -34,6 +35,14 @@ public class FeedJpaEntity extends PostJpaEntity {
     @OneToMany(mappedBy = "postJpaEntity", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<ContentJpaEntity> contentList;
 
+    // 삭제용 피드 저장 양방향 매핑 관계
+    @OneToMany(mappedBy = "feedJpaEntity", cascade = CascadeType.REMOVE, orphanRemoval = true)
+    private List<SavedFeedJpaEntity> savedFeeds = new ArrayList<>();
+
+    // 삭제용 피드 태그 양방향 매핑 관계
+    @OneToMany(mappedBy = "feedJpaEntity", cascade = CascadeType.REMOVE, orphanRemoval = true)
+    private List<FeedTagJpaEntity> feedTags = new ArrayList<>();
+
     @Builder
     public FeedJpaEntity(String content, Integer likeCount, Integer commentCount, UserJpaEntity userJpaEntity, Boolean isPublic, int reportCount, BookJpaEntity bookJpaEntity, List<ContentJpaEntity> contentList) {
         super(content, likeCount, commentCount, userJpaEntity);

src/main/java/konkuk/thip/feed/adapter/out/persistence/FeedCommandPersistenceAdapter.java

@@ -6,6 +6,7 @@
 import konkuk.thip.feed.adapter.out.jpa.*;
 import konkuk.thip.feed.adapter.out.mapper.ContentMapper;
 import konkuk.thip.feed.adapter.out.mapper.FeedMapper;
+import konkuk.thip.feed.adapter.out.persistence.repository.Content.ContentJpaRepository;
 import konkuk.thip.feed.adapter.out.persistence.repository.FeedJpaRepository;
 import konkuk.thip.feed.adapter.out.persistence.repository.FeedTag.FeedTagJpaRepository;
 import konkuk.thip.feed.adapter.out.persistence.repository.SavedFeedJpaRepository;
@@ -21,6 +22,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import static konkuk.thip.common.entity.StatusType.ACTIVE;
 import static konkuk.thip.common.exception.code.ErrorCode.*;
 
 @Repository
@@ -32,14 +34,16 @@ public class FeedCommandPersistenceAdapter implements FeedCommandPort {
     private final BookJpaRepository bookJpaRepository;
     private final TagJpaRepository tagJpaRepository;
     private final FeedTagJpaRepository feedTagJpaRepository;
+    private final ContentJpaRepository contentJpaRepository;
     private final SavedFeedJpaRepository savedFeedJpaRepository;
 
     private final FeedMapper feedMapper;
     private final ContentMapper contentMapper;
 
+
     @Override
     public Optional<Feed> findById(Long id) {
-        return feedJpaRepository.findById(id)
+        return feedJpaRepository.findByPostIdAndStatus(id,ACTIVE)
                 .map(feedJpaEntity -> {
                     List<TagJpaEntity> tagJpaEntityList = tagJpaRepository.findAllByFeedId(feedJpaEntity.getPostId());
                     return feedMapper.toDomainEntity(feedJpaEntity, tagJpaEntityList);
@@ -78,7 +82,7 @@ public Long update(Feed feed) {
         feedJpaEntity.getContentList().clear(); // 피드 수정시 기존 영속성 컨텍스트 내 엔티티 연결 제거
         applyFeedContents(feed, feedJpaEntity);
 
-        feedTagJpaRepository.deleteAllByFeedJpaEntity(feedJpaEntity); // 피드 수정시 기존 피드의 모든 FeedTag 매핑 row 삭제
+        feedTagJpaRepository.deleteAllByFeedId(feedJpaEntity.getPostId()); // 피드 수정시 기존 피드의 모든 FeedTag 매핑 row 삭제
         applyFeedTags(feed, feedJpaEntity);
 
         return feedJpaEntity.getPostId();
@@ -125,4 +129,16 @@ public void deleteSavedFeed(Long userId, Long feedId) {
         savedFeedJpaRepository.deleteByUserIdAndFeedId(userId, feedId);
     }
 
+    @Override
+    public void delete(Feed feed) {
+        FeedJpaEntity feedJpaEntity = feedJpaRepository.findById(feed.getId())
+                .orElseThrow(() -> new EntityNotFoundException(FEED_NOT_FOUND));
+
+        feedTagJpaRepository.deleteAllByFeedId(feedJpaEntity.getPostId());
+        contentJpaRepository.deleteAllByFeedId(feedJpaEntity.getPostId());
+        savedFeedJpaRepository.deleteAllByFeedId(feedJpaEntity.getPostId());
+
+        feedJpaEntity.softDelete();
+        feedJpaRepository.save(feedJpaEntity);
+    }
 }

src/main/java/konkuk/thip/feed/adapter/out/persistence/repository/Content/ContentJpaRepository.java

@@ -2,6 +2,13 @@
 
 import konkuk.thip.feed.adapter.out.jpa.ContentJpaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface ContentJpaRepository extends JpaRepository<ContentJpaEntity, Long>{
+
+    @Modifying
+    @Query("DELETE FROM ContentJpaEntity c WHERE c.postJpaEntity.postId = :feedId")
+    void deleteAllByFeedId(@Param("feedId") Long feedId);
 }

src/main/java/konkuk/thip/feed/adapter/out/persistence/repository/FeedJpaRepository.java

@@ -6,11 +6,15 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.util.Optional;
+
 public interface FeedJpaRepository extends JpaRepository<FeedJpaEntity, Long>, FeedQueryRepository {
 
     @Query("SELECT COUNT(f) FROM FeedJpaEntity f WHERE f.userJpaEntity.userId = :userId AND f.status = :status")
     long countAllFeedsByUserId(@Param("userId") Long userId, @Param("status") StatusType status);
 
     @Query("SELECT COUNT(f) FROM FeedJpaEntity f WHERE f.userJpaEntity.userId = :userId AND f.isPublic = TRUE AND f.status = :status")
     long countPublicFeedsByUserId(@Param("userId") Long userId, @Param("status") StatusType status);
+
+    Optional<FeedJpaEntity> findByPostIdAndStatus(Long postId, StatusType status);
 }

src/main/java/konkuk/thip/feed/adapter/out/persistence/repository/FeedTag/FeedTagJpaRepository.java

@@ -1,6 +1,5 @@
 package konkuk.thip.feed.adapter.out.persistence.repository.FeedTag;
 
-import konkuk.thip.feed.adapter.out.jpa.FeedJpaEntity;
 import konkuk.thip.feed.adapter.out.jpa.FeedTagJpaEntity;
 import konkuk.thip.feed.application.port.out.dto.FeedIdAndTagProjection;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -12,14 +11,14 @@
 
 public interface FeedTagJpaRepository extends JpaRepository<FeedTagJpaEntity, Long>{
 
-    @Modifying
-    @Query("DELETE FROM FeedTagJpaEntity ft WHERE ft.feedJpaEntity = :feedJpaEntity")
-    void deleteAllByFeedJpaEntity(@Param("feedJpaEntity") FeedJpaEntity feedJpaEntity);
-
     @Query("""
     SELECT ft.feedJpaEntity.postId as feedId, ft.tagJpaEntity as tagJpaEntity
     FROM FeedTagJpaEntity ft
     WHERE ft.feedJpaEntity.postId IN :feedIds
     """)
     List<FeedIdAndTagProjection> findFeedIdAndTagsByFeedIds(@Param("feedIds") List<Long> feedIds);
+
+    @Modifying
+    @Query("DELETE FROM FeedTagJpaEntity ft WHERE ft.feedJpaEntity.postId = :feedId")
+    void deleteAllByFeedId(@Param("feedId") Long feedId);
 }

src/main/java/konkuk/thip/feed/adapter/out/persistence/repository/SavedFeedJpaRepository.java

@@ -11,12 +11,16 @@
 
 public interface SavedFeedJpaRepository extends JpaRepository<SavedFeedJpaEntity, Long> {
     @Modifying
-    @Query(value = "DELETE FROM saved_feeds WHERE user_id = :userId AND post_id = :feedId", nativeQuery = true)
+    @Query("DELETE FROM SavedFeedJpaEntity sf WHERE sf.userJpaEntity.userId = :userId AND sf.feedJpaEntity.postId = :feedId")
     void deleteByUserIdAndFeedId(@Param("userId") Long userId, @Param("feedId") Long feedId);
 
-    @Query(value = "SELECT * FROM saved_feeds WHERE user_id = :userId", nativeQuery = true)
+    @Query("SELECT sf FROM SavedFeedJpaEntity sf WHERE sf.userJpaEntity.userId = :userId")
     List<SavedFeedJpaEntity> findAllByUserId(@Param("userId") Long userId);
 
     @Query("SELECT s.feedJpaEntity.postId FROM SavedFeedJpaEntity s WHERE s.userJpaEntity.userId = :userId AND s.feedJpaEntity.postId IN :feedIds")
     Set<Long> findSavedFeedIdsByUserIdAndFeedIds(@Param("userId") Long userId, @Param("feedIds") Set<Long> feedIds);
+
+    @Modifying
+    @Query("DELETE FROM SavedFeedJpaEntity sf WHERE sf.feedJpaEntity.postId = :feedId")
+    int deleteAllByFeedId(@Param("feedId") Long feedId);
 }

src/main/java/konkuk/thip/feed/application/port/in/FeedDeleteUseCase.java

@@ -0,0 +1,6 @@
+package konkuk.thip.feed.application.port.in;
+
+
+public interface FeedDeleteUseCase {
+    void deleteFeed(Long feedId, Long userId);
+}

src/main/java/konkuk/thip/feed/application/port/out/FeedCommandPort.java

@@ -16,7 +16,7 @@ default Feed getByIdOrThrow(Long id) {
         return findById(id)
                 .orElseThrow(() -> new EntityNotFoundException(FEED_NOT_FOUND));
     }
-
+    void delete(Feed feed);
     void saveSavedFeed(Long userId, Long feedId);
     void deleteSavedFeed(Long userId, Long feedId);
 }

src/main/java/konkuk/thip/feed/application/service/FeedDeleteService.java

@@ -0,0 +1,36 @@
+package konkuk.thip.feed.application.service;
+
+import jakarta.transaction.Transactional;
+import konkuk.thip.comment.application.port.out.CommentCommandPort;
+import konkuk.thip.feed.application.port.in.FeedDeleteUseCase;
+import konkuk.thip.feed.application.port.out.FeedCommandPort;
+import konkuk.thip.feed.domain.Feed;
+import konkuk.thip.post.application.port.out.PostLikeCommandPort;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class FeedDeleteService implements FeedDeleteUseCase {
+
+    private final FeedCommandPort feedCommandPort;
+    private final CommentCommandPort commentCommandPort;
+    private final PostLikeCommandPort postLikeCommandPort;
+
+    @Override
+    @Transactional
+    public void deleteFeed(Long feedId, Long userId) {
+
+        // 1. 피드 조회 및 검증
+        Feed feed = feedCommandPort.getByIdOrThrow(feedId);
+
+        // 2. 피드 삭제 권한 검증
+        feed.validateDeletable(userId);
+
+        // TODO S3 이미지 삭제 이벤트 기반 처리 or 배치 삭제
+        // 3. 피드 삭제
+        commentCommandPort.softDeleteAllByPostId(feedId);
+        postLikeCommandPort.deleteAllByPostId(feedId);
+        feedCommandPort.delete(feed);
+    }
+}

src/main/java/konkuk/thip/feed/domain/Feed.java

@@ -129,10 +129,14 @@ public void validateLike(Long userId){
 
     private void validateCreator(Long userId) {
         if (!this.creatorId.equals(userId)) {
-            throw new InvalidStateException(FEED_ACCESS_FORBIDDEN, new IllegalArgumentException("피드 작성자만 피드를 수정할 수 있습니다."));
+            throw new InvalidStateException(FEED_ACCESS_FORBIDDEN, new IllegalArgumentException("피드 작성자만 피드를 수정/삭제할 수 있습니다."));
         }
     }
 
+    public void validateDeletable(Long userId) {
+        validateCreator(userId);
+    }
+
     public void updateContent(Long userId, String newContent) {
         validateCreator(userId);
         this.content = newContent;