[feat] 기록 삭제 api 개발

src/main/java/konkuk/thip/book/adapter/out/persistence/repository/SavedBookJpaRepository.java

@@ -10,7 +10,7 @@ public interface SavedBookJpaRepository extends JpaRepository<SavedBookJpaEntity
            "WHERE s.userJpaEntity.userId = :userId AND s.bookJpaEntity.bookId = :bookId")
     boolean existsByUserIdAndBookId(Long userId, Long bookId);
 
-    @Modifying
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("DELETE FROM SavedBookJpaEntity s WHERE s.userJpaEntity.userId = :userId AND s.bookJpaEntity.bookId = :bookId")
     void deleteByUserIdAndBookId(Long userId, Long bookId);
 }

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

@@ -12,7 +12,7 @@
 public interface CommentJpaRepository extends JpaRepository<CommentJpaEntity, Long>, CommentQueryRepository {
     Optional<CommentJpaEntity> findByCommentIdAndStatus(Long commentId, StatusType status);
 
-    @Modifying
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
     @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

@@ -15,7 +15,7 @@ public interface CommentLikeJpaRepository extends JpaRepository<CommentLikeJpaEn
     List<CommentLikeJpaEntity> findAllByUserId(@Param("userId") Long userId);
 
 
-    @Modifying
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("DELETE FROM CommentLikeJpaEntity cl WHERE cl.userJpaEntity.userId = :userId AND cl.commentJpaEntity.commentId = :commentId")
     void deleteByUserIdAndCommentId(@Param("userId") Long userId, @Param("commentId") Long commentId);
 
@@ -24,14 +24,14 @@ public interface CommentLikeJpaRepository extends JpaRepository<CommentLikeJpaEn
             "WHERE cl.userJpaEntity.userId = :userId AND cl.commentJpaEntity.commentId = :commentId")
     boolean existsByUserIdAndCommentId(@Param("userId") Long userId, @Param("commentId") Long commentId);
 
-    @Modifying
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("DELETE FROM CommentLikeJpaEntity cl WHERE cl.commentJpaEntity.commentId = :commentId")
     void deleteAllByCommentId(@Param("commentId") Long commentId);
 
     @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
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("""
            DELETE FROM CommentLikeJpaEntity cl
            WHERE cl.commentJpaEntity.commentId IN (

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

@@ -120,6 +120,7 @@ public enum ErrorCode implements ResponseCode {
     RECORD_NOT_FOUND(HttpStatus.NOT_FOUND, 130000, "존재하지 않는 RECORD 입니다."),
     RECORD_CANNOT_BE_OVERVIEW(HttpStatus.BAD_REQUEST, 130001, "총평이 될 수 없는 RECORD 입니다."),
     INVALID_RECORD_PAGE_RANGE(HttpStatus.BAD_REQUEST, 130002, "RECORD의 page 값이 유효하지 않습니다."),
+    RECORD_ACCESS_FORBIDDEN(HttpStatus.FORBIDDEN, 130003, "기록 접근 권한이 없습니다."),
 
     /**
      * 140000 : roomParticipant error

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

@@ -131,6 +131,11 @@ public enum SwaggerResponseDescription {
             BOOK_NOT_FOUND,
             ROOM_ACCESS_FORBIDDEN
     ))),
+    RECORD_DELETE(new LinkedHashSet<>(Set.of(
+            ROOM_ACCESS_FORBIDDEN,
+            RECORD_NOT_FOUND,
+            RECORD_ACCESS_FORBIDDEN
+    ))),
 
     // Vote
     VOTE_CREATE(new LinkedHashSet<>(Set.of(

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

@@ -8,7 +8,7 @@
 
 public interface ContentJpaRepository extends JpaRepository<ContentJpaEntity, Long>{
 
-    @Modifying
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
     @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/FeedTag/FeedTagJpaRepository.java

@@ -18,7 +18,7 @@ public interface FeedTagJpaRepository extends JpaRepository<FeedTagJpaEntity, Lo
     """)
     List<FeedIdAndTagProjection> findFeedIdAndTagsByFeedIds(@Param("feedIds") List<Long> feedIds);
 
-    @Modifying
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
     @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

@@ -10,7 +10,8 @@
 import java.util.Set;
 
 public interface SavedFeedJpaRepository extends JpaRepository<SavedFeedJpaEntity, Long> {
-    @Modifying
+
+    @Modifying(clearAutomatically = true, flushAutomatically = 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);
 
@@ -20,7 +21,7 @@ public interface SavedFeedJpaRepository extends JpaRepository<SavedFeedJpaEntity
     @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
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("DELETE FROM SavedFeedJpaEntity sf WHERE sf.feedJpaEntity.postId = :feedId")
     int deleteAllByFeedId(@Param("feedId") Long feedId);
 }

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

@@ -29,8 +29,11 @@ public void deleteFeed(Long feedId, Long userId) {
 
         // TODO S3 이미지 삭제 이벤트 기반 처리 or 배치 삭제
         // 3. 피드 삭제
+        // 3-1. 피드 게시물 댓글 삭제
         commentCommandPort.softDeleteAllByPostId(feedId);
+        // 3-2. 피드 게시물 좋아요 삭제
         postLikeCommandPort.deleteAllByPostId(feedId);
+        // 3-3. 피드 삭제 및 관련 엔티티(피드_태그, 콘텐츠, 피드 저장) 삭제
         feedCommandPort.delete(feed);
     }
 }

src/main/java/konkuk/thip/post/adapter/out/persistence/PostLikeJpaRepository.java

@@ -21,11 +21,11 @@ Set<Long> findPostIdsLikedByUser(@Param("postIds") Set<Long> postIds,
             "WHERE pl.userJpaEntity.userId = :userId AND pl.postJpaEntity.postId = :postId")
     boolean existsByUserIdAndPostId(@Param("userId") Long userId, @Param("postId") Long postId);
 
-    @Modifying
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("DELETE FROM PostLikeJpaEntity pl WHERE pl.userJpaEntity.userId = :userId AND pl.postJpaEntity.postId = :postId")
     void deleteByUserIdAndPostId(@Param("userId") Long userId, @Param("postId") Long postId);
 
-    @Modifying
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("DELETE FROM PostLikeJpaEntity pl WHERE pl.postJpaEntity.postId = :postId")
     void deleteAllByPostId(@Param("postId") Long postId);
 }

src/main/java/konkuk/thip/recentSearch/adapter/out/persistence/repository/RecentSearchJpaRepository.java

@@ -9,7 +9,7 @@
 
 @Repository
 public interface RecentSearchJpaRepository extends JpaRepository<RecentSearchJpaEntity, Long>, RecentSearchQueryRepository {
-    @Modifying
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("UPDATE RecentSearchJpaEntity r SET r.modifiedAt = CURRENT_TIMESTAMP WHERE r.recentSearchId = :recentSearchId")
     void updateModifiedAt(@Param("recentSearchId") Long recentSearchId);
 }

src/main/java/konkuk/thip/record/adapter/in/web/RecordCommandController.java

@@ -9,12 +9,12 @@
 import konkuk.thip.common.swagger.annotation.ExceptionDescription;
 import konkuk.thip.record.adapter.in.web.request.RecordCreateRequest;
 import konkuk.thip.record.adapter.in.web.response.RecordCreateResponse;
+import konkuk.thip.record.adapter.in.web.response.RecordDeleteResponse;
 import konkuk.thip.record.application.port.in.RecordCreateUseCase;
+import konkuk.thip.record.application.port.in.RecordDeleteUseCase;
+import konkuk.thip.record.application.port.in.dto.RecordDeleteCommand;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import static konkuk.thip.common.swagger.SwaggerResponseDescription.*;
 
@@ -23,6 +23,7 @@
 @RequiredArgsConstructor
 public class RecordCommandController {
     private final RecordCreateUseCase recordCreateUseCase;
+    private final RecordDeleteUseCase recordDeleteUseCase;
 
     @Operation(
             summary = "기록 생성",
@@ -41,4 +42,17 @@ public BaseResponse<RecordCreateResponse> createRecord(
                 ));
     }
 
+    @Operation(
+            summary = "기록 삭제",
+            description = "사용자가 기록을 삭제합니다."
+    )
+    @ExceptionDescription(RECORD_DELETE)
+    @DeleteMapping("/rooms/{roomId}/record/{recordId}")
+    public BaseResponse<RecordDeleteResponse> deleteRecord(
+            @Parameter(description = "삭제하려는 기록 ID", example = "1") @PathVariable("recordId") final Long recordId,
+            @Parameter(description = "삭제하려는 기록이 작성된 모임 ID", example = "1") @PathVariable("roomId") final Long roomId,
+            @Parameter(hidden = true) @UserId final Long userId) {
+        return BaseResponse.ok(RecordDeleteResponse.of(recordDeleteUseCase.deleteRecord(new RecordDeleteCommand(roomId, recordId, userId))));
+    }
+
 }

src/main/java/konkuk/thip/record/adapter/in/web/response/RecordDeleteResponse.java

@@ -0,0 +1,7 @@
+package konkuk.thip.record.adapter.in.web.response;
+
+public record RecordDeleteResponse(Long roomId) {
+    public static RecordDeleteResponse of(Long roomId) {
+        return new RecordDeleteResponse(roomId);
+    }
+}

src/main/java/konkuk/thip/record/adapter/out/jpa/RecordJpaEntity.java

@@ -49,5 +49,10 @@ public void updateLikeCount(int likeCount) {
         this.likeCount = likeCount;
     }
 
+    @VisibleForTesting
+    public void updateCommentCount(int commentCount) {
+        this.commentCount = commentCount;
+    }
+
 }
 

src/main/java/konkuk/thip/record/adapter/out/persistence/RecordCommandPersistenceAdapter.java

@@ -15,6 +15,7 @@
 
 import java.util.Optional;
 
+import static konkuk.thip.common.entity.StatusType.ACTIVE;
 import static konkuk.thip.common.exception.code.ErrorCode.*;
 
 @Repository
@@ -43,10 +44,20 @@ public Long saveRecord(Record record) {
 
     @Override
     public Optional<Record> findById(Long id) {
-        return recordJpaRepository.findById(id)
+        return recordJpaRepository.findByPostIdAndStatus(id, ACTIVE)
                 .map(recordMapper::toDomainEntity);
     }
 
+    @Override
+    public void delete(Record record) {
+        RecordJpaEntity recordJpaEntity = recordJpaRepository.findById(record.getId()).orElseThrow(
+                () -> new EntityNotFoundException(RECORD_NOT_FOUND)
+        );
+
+        recordJpaEntity.softDelete();
+        recordJpaRepository.save(recordJpaEntity);
+    }
+
     @Override
     public void update(Record record) {
         RecordJpaEntity recordJpaEntity = recordJpaRepository.findById(record.getId()).orElseThrow(

src/main/java/konkuk/thip/record/adapter/out/persistence/repository/RecordJpaRepository.java

@@ -1,8 +1,11 @@
 package konkuk.thip.record.adapter.out.persistence.repository;
 
+import konkuk.thip.common.entity.StatusType;
 import konkuk.thip.record.adapter.out.jpa.RecordJpaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface RecordJpaRepository extends JpaRepository<RecordJpaEntity, Long>, RecordQueryRepository {
+import java.util.Optional;
 
+public interface RecordJpaRepository extends JpaRepository<RecordJpaEntity, Long>, RecordQueryRepository {
+    Optional<RecordJpaEntity> findByPostIdAndStatus(Long postId, StatusType status);
 }

src/main/java/konkuk/thip/record/application/port/in/RecordDeleteUseCase.java

@@ -0,0 +1,7 @@
+package konkuk.thip.record.application.port.in;
+
+import konkuk.thip.record.application.port.in.dto.RecordDeleteCommand;
+
+public interface RecordDeleteUseCase {
+    Long deleteRecord(RecordDeleteCommand command);
+}

src/main/java/konkuk/thip/record/application/port/in/dto/RecordDeleteCommand.java

@@ -0,0 +1,10 @@
+package konkuk.thip.record.application.port.in.dto;
+
+public record RecordDeleteCommand(
+        Long roomId,
+
+        Long recordId,
+
+        Long userId
+) {
+}

src/main/java/konkuk/thip/record/application/port/out/RecordCommandPort.java

@@ -20,4 +20,6 @@ default Record getByIdOrThrow(Long id) {
         return findById(id)
                 .orElseThrow(() -> new EntityNotFoundException(RECORD_NOT_FOUND));
     }
+
+    void delete(Record record);
 }

src/main/java/konkuk/thip/record/application/service/RecordDeleteService.java

@@ -0,0 +1,46 @@
+package konkuk.thip.record.application.service;
+
+import jakarta.transaction.Transactional;
+import konkuk.thip.comment.application.port.out.CommentCommandPort;
+import konkuk.thip.post.application.port.out.PostLikeCommandPort;
+import konkuk.thip.record.application.port.in.RecordDeleteUseCase;
+import konkuk.thip.record.application.port.in.dto.RecordDeleteCommand;
+import konkuk.thip.record.application.port.out.RecordCommandPort;
+import konkuk.thip.record.domain.Record;
+import konkuk.thip.room.application.service.validator.RoomParticipantValidator;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class RecordDeleteService implements RecordDeleteUseCase {
+
+    private final RecordCommandPort recordCommandPort;
+    private final CommentCommandPort commentCommandPort;
+    private final PostLikeCommandPort postLikeCommandPort;
+
+    private final RoomParticipantValidator roomParticipantValidator;
+
+    @Override
+    @Transactional
+    public Long deleteRecord(RecordDeleteCommand command) {
+
+        // 1. 방 참여자 검증
+        roomParticipantValidator.validateUserIsRoomMember(command.roomId(), command.userId());
+
+        // 2. 기록 조회 및 검증
+        Record record = recordCommandPort.getByIdOrThrow(command.recordId());
+        // 2-1. 기록 삭제 권한 검증
+        record.validateDeletable(command.userId(),command.roomId());
+
+        // 3. 기록 삭제
+        // 3-1. 기록 게시물 댓글 삭제
+        commentCommandPort.softDeleteAllByPostId(command.recordId());
+        // 3-2. 피드 게시물 좋아요 삭제
+        postLikeCommandPort.deleteAllByPostId(command.recordId());
+        // 3-3. 기록 삭제
+        recordCommandPort.delete(record);
+
+        return command.roomId();
+    }
+}

src/main/java/konkuk/thip/record/domain/Record.java

@@ -96,4 +96,22 @@ private void checkCommentCountNotUnderflow() {
             throw new InvalidStateException(COMMENT_COUNT_UNDERFLOW);
         }
     }
-}
+
+    private void validateCreator(Long userId) {
+        if (!this.creatorId.equals(userId)) {
+            throw new InvalidStateException(RECORD_ACCESS_FORBIDDEN, new IllegalArgumentException("기록 작성자만 기록을 수정/삭제할 수 있습니다."));
+        }
+    }
+
+    public void validateDeletable(Long userId,Long roomId) {
+        validateRoomId(roomId);
+        validateCreator(userId);
+    }
+
+    private void validateRoomId(Long roomId) {
+        if (!this.roomId.equals(roomId)) {
+            throw new InvalidStateException(RECORD_ACCESS_FORBIDDEN, new IllegalArgumentException("기록이 해당 방에 속하지 않습니다."));
+        }
+    }
+
+}