[feat] hibernate filter 적용

build.gradle

@@ -35,6 +35,9 @@ dependencies {
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
 
+    testCompileOnly 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
+
 	//Security
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 
@@ -79,6 +82,9 @@ dependencies {
 	// Spring Boot Actuator
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
+    // AOP
+    implementation 'org.springframework.boot:spring-boot-starter-aop'
+
 	// Flyway
 	implementation "org.flywaydb:flyway-core"
 	implementation "org.flywaydb:flyway-mysql"

src/main/java/konkuk/thip/book/adapter/out/jpa/SavedBookJpaEntity.java

@@ -1,6 +1,7 @@
 package konkuk.thip.book.adapter.out.jpa;
 
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 import konkuk.thip.common.entity.BaseJpaEntity;
 import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
 import lombok.*;
@@ -17,11 +18,11 @@ public class SavedBookJpaEntity extends BaseJpaEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long savedId;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id")
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "user_id", nullable = false)
     private UserJpaEntity userJpaEntity;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "book_id")
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "book_id", nullable = false)
     private BookJpaEntity bookJpaEntity;
 }

src/main/java/konkuk/thip/book/adapter/out/persistence/BookCommandPersistenceAdapter.java

@@ -62,7 +62,7 @@ public void updateForPageCount(Book book) {
 
     @Override
     public Book findBookByRoomId(Long roomId) {
-        BookJpaEntity bookJpaEntity = roomJpaRepository.findById(roomId).orElseThrow(
+        BookJpaEntity bookJpaEntity = roomJpaRepository.findByRoomId(roomId).orElseThrow(
                 () -> new EntityNotFoundException(ROOM_NOT_FOUND)
         ).getBookJpaEntity();
         return bookMapper.toDomainEntity(bookJpaEntity);
@@ -71,7 +71,7 @@ public Book findBookByRoomId(Long roomId) {
     // 사용자가 책을 저장
     @Override
     public void saveSavedBook(Long userId, Long bookId) {
-        UserJpaEntity user = userJpaRepository.findById(userId)
+        UserJpaEntity user = userJpaRepository.findByUserId(userId)
                 .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND));
         BookJpaEntity book = bookJpaRepository.findById(bookId)
                 .orElseThrow(() -> new EntityNotFoundException(BOOK_NOT_FOUND));

src/main/java/konkuk/thip/book/adapter/out/persistence/BookQueryPersistenceAdapter.java

@@ -68,5 +68,4 @@ public CursorBasedList<BookQueryDto> findJoiningRoomsBooksByRoomPercentage(Long
     public Set<Long> findUnusedBookIds() {
         return bookJpaRepository.findUnusedBookIds();
     }
-
 }

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

@@ -7,7 +7,7 @@
 import java.util.Optional;
 import java.util.Set;
 
-public interface BookJpaRepository extends JpaRepository<BookJpaEntity, Long>,BookQueryRepository {
+public interface BookJpaRepository extends JpaRepository<BookJpaEntity, Long>, BookQueryRepository {
     Optional<BookJpaEntity> findByIsbn(String isbn);
 
     boolean existsByIsbn(String isbn);

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

@@ -39,18 +39,21 @@ public class CommentJpaEntity extends BaseJpaEntity {
     private int likeCount = 0;
 
     //TODO 상속구조 해지하면서 postType만 가질지, postId + postType가질지 논의 필요
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(name = "post_id", nullable = false)
     private PostJpaEntity postJpaEntity;
 
     @Enumerated(EnumType.STRING)
     @Column(name = "post_type", nullable = false, length = 10)
     private PostType postType;
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(name = "user_id", nullable = false)
     private UserJpaEntity userJpaEntity;
 
+    /**
+     * nullable = true : 최상위 댓글인 경우 null
+     */
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "parent_id")
     private CommentJpaEntity parent;
@@ -71,5 +74,4 @@ public CommentJpaEntity updateFrom(Comment comment) {
     public void updateLikeCount(int likeCount) {
         this.likeCount = likeCount;
     }
-
-}
+}

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

@@ -18,11 +18,11 @@ public class CommentLikeJpaEntity extends BaseJpaEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long likeId;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id")
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "user_id", nullable = false)
     private UserJpaEntity userJpaEntity;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "comment_id")
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "comment_id", nullable = false)
     private CommentJpaEntity commentJpaEntity;
 }

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

@@ -19,7 +19,6 @@
 
 import java.util.Optional;
 
-import static konkuk.thip.common.entity.StatusType.ACTIVE;
 import static konkuk.thip.common.exception.code.ErrorCode.*;
 
 @Repository
@@ -39,7 +38,7 @@ public class CommentCommandPersistenceAdapter implements CommentCommandPort {
     public Long save(Comment comment) {
 
         // 1. 작성자(User) 조회 및 존재 검증
-        UserJpaEntity userJpaEntity = userJpaRepository.findById(comment.getCreatorId()).orElseThrow(
+        UserJpaEntity userJpaEntity = userJpaRepository.findByUserId(comment.getCreatorId()).orElseThrow(
                 () -> new EntityNotFoundException(USER_NOT_FOUND)
         );
 
@@ -49,7 +48,7 @@ public Long save(Comment comment) {
         // 3. 부모 댓글 조회 (있을 경우)
         CommentJpaEntity parentCommentJpaEntity = null;
         if (comment.getParentCommentId() != null) {
-            parentCommentJpaEntity = commentJpaRepository.findById(comment.getParentCommentId())
+            parentCommentJpaEntity = commentJpaRepository.findByCommentId(comment.getParentCommentId())
                     .orElseThrow(() -> new EntityNotFoundException(COMMENT_NOT_FOUND));
         }
 
@@ -60,24 +59,24 @@ public Long save(Comment comment) {
 
     private PostJpaEntity findPostJpaEntity(PostType postType, Long postId) {
         return switch (postType) {
-            case FEED -> feedJpaRepository.findById(postId)
+            case FEED -> feedJpaRepository.findByPostId(postId)
                     .orElseThrow(() -> new EntityNotFoundException(FEED_NOT_FOUND));
-            case RECORD -> recordJpaRepository.findById(postId)
+            case RECORD -> recordJpaRepository.findByPostId(postId)
                     .orElseThrow(() -> new EntityNotFoundException(RECORD_NOT_FOUND));
-            case VOTE -> voteJpaRepository.findById(postId)
+            case VOTE -> voteJpaRepository.findByPostId(postId)
                     .orElseThrow(() -> new EntityNotFoundException(VOTE_NOT_FOUND));
         };
     }
 
     @Override
     public Optional<Comment> findById(Long id) {
-        return commentJpaRepository.findByCommentIdAndStatus(id, ACTIVE)
+        return commentJpaRepository.findByCommentId(id)
                 .map(commentMapper::toDomainEntity);
     }
 
     @Override
     public void update(Comment comment) {
-        CommentJpaEntity commentJpaEntity = commentJpaRepository.findById(comment.getId()).orElseThrow(
+        CommentJpaEntity commentJpaEntity = commentJpaRepository.findByCommentId(comment.getId()).orElseThrow(
                 () -> new EntityNotFoundException(COMMENT_NOT_FOUND)
         );
 
@@ -86,7 +85,7 @@ public void update(Comment comment) {
 
     @Override
     public void delete(Comment comment) {
-        CommentJpaEntity commentJpaEntity = commentJpaRepository.findById(comment.getId()).orElseThrow(
+        CommentJpaEntity commentJpaEntity = commentJpaRepository.findByCommentId(comment.getId()).orElseThrow(
                 () -> new EntityNotFoundException(COMMENT_NOT_FOUND)
         );
         commentJpaRepository.delete(commentJpaEntity);

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

@@ -24,7 +24,7 @@ public class CommentLikeCommandPersistenceAdapter implements CommentLikeCommandP
     @Override
     public void save(Long userId, Long commentId) {
 
-        UserJpaEntity user = userJpaRepository.findById(userId)
+        UserJpaEntity user = userJpaRepository.findByUserId(userId)
                 .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND));
         CommentJpaEntity comment = commentJpaRepository.findById(commentId)
                 .orElseThrow(() -> new EntityNotFoundException(COMMENT_NOT_FOUND));

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

@@ -1,7 +1,6 @@
 package konkuk.thip.comment.adapter.out.persistence.repository;
 
 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;
@@ -10,7 +9,11 @@
 import java.util.Optional;
 
 public interface CommentJpaRepository extends JpaRepository<CommentJpaEntity, Long>, CommentQueryRepository {
-    Optional<CommentJpaEntity> findByCommentIdAndStatus(Long commentId, StatusType status);
+
+    /**
+     * 소프트 딜리트 적용 대상 entity 단건 조회 메서드
+     */
+    Optional<CommentJpaEntity> findByCommentId(Long commentId);
 
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("UPDATE CommentJpaEntity c SET c.status = 'INACTIVE' WHERE c.postJpaEntity.postId = :postId")

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

@@ -15,17 +15,24 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static konkuk.thip.common.entity.StatusType.ACTIVE;
+
 @Repository
 @RequiredArgsConstructor
 public class CommentQueryRepositoryImpl implements CommentQueryRepository {
 
+    /**
+     * 댓글 관련 queryDsl 코드에서는 status 값 명시해야함 (서비스 메서드에서 status filter off가 전제)
+     */
+
     private final JPAQueryFactory queryFactory;
 
     private final QCommentJpaEntity comment = QCommentJpaEntity.commentJpaEntity;
     private final QUserJpaEntity commentCreator = QUserJpaEntity.userJpaEntity;
     private final QCommentJpaEntity parentComment = new QCommentJpaEntity("parentComment");
     private final QUserJpaEntity parentCommentCreator = new QUserJpaEntity("parentCommentCreator");
 
+    // 최상위 댓글 조회 (삭제된 댓글 포함, 최신순, 페이징)
     @Override
     public List<CommentQueryDto> findRootCommentsWithDeletedByCreatedAtDesc(Long postId, String postTypeStr, LocalDateTime lastCreatedAt, int size) {
         // 최상위 댓글(size+1) 프로젝션 생성
@@ -44,6 +51,7 @@ public List<CommentQueryDto> findRootCommentsWithDeletedByCreatedAtDesc(Long pos
         BooleanExpression whereClause = comment.postJpaEntity.postId.eq(postId)
                 .and(comment.postJpaEntity.dtype.eq(postTypeStr))       // dType 필터링 추가
                 .and(comment.parent.isNull())       // 게시글의 최상위 댓글 조회
+                .and(commentCreator.status.eq(ACTIVE))  // 댓글 작성자 ACTIVE
                 .and(lastCreatedAt != null      // 최신순 정렬
                         ? comment.createdAt.lt(lastCreatedAt)
                         : Expressions.TRUE
@@ -53,7 +61,7 @@ public List<CommentQueryDto> findRootCommentsWithDeletedByCreatedAtDesc(Long pos
         return queryFactory
                 .select(proj)
                 .from(comment)
-                .leftJoin(comment.userJpaEntity, commentCreator)
+                .join(comment.userJpaEntity, commentCreator)
                 .where(whereClause)
                 .orderBy(comment.createdAt.desc())
                 .limit(size + 1)        // size + 1 개 조회
@@ -89,10 +97,11 @@ public List<CommentQueryDto> findAllActiveChildCommentsByCreatedAtAsc(Long rootC
                     .from(comment)
                     .leftJoin(comment.parent, parentComment)
                     .leftJoin(parentComment.userJpaEntity, parentCommentCreator)
-                    .leftJoin(comment.userJpaEntity, commentCreator)
+                    .join(comment.userJpaEntity, commentCreator)
                     .where(
                             comment.parent.commentId.in(parentIds),     // parentIds 하위의 모든 자식 댓글 조회
-                            comment.status.eq(StatusType.ACTIVE)        // 자식 댓글은 ACTIVE인 것만 조회
+                            comment.status.eq(ACTIVE),        // 자식 댓글은 ACTIVE인 것만 조회
+                            commentCreator.status.eq(ACTIVE)    // 자식 댓글 작성자 ACTIVE
                     )
                     .fetch();
 
@@ -148,10 +157,11 @@ public Map<Long, List<CommentQueryDto>> findAllActiveChildCommentsByCreatedAtAsc
                     .from(comment)
                     .leftJoin(comment.parent, parentComment)
                     .leftJoin(parentComment.userJpaEntity, parentCommentCreator)
-                    .leftJoin(comment.userJpaEntity, commentCreator)
+                    .join(comment.userJpaEntity, commentCreator)
                     .where(
                             comment.parent.commentId.in(parentIds),     // parentIds 하위의 모든 자식 댓글 조회
-                            comment.status.eq(StatusType.ACTIVE)        // 자식 댓글은 ACTIVE인 것만 조회
+                            comment.status.eq(ACTIVE),        // 자식 댓글은 ACTIVE인 것만 조회
+                            commentCreator.status.eq(ACTIVE)    // 자식 댓글 작성자 ACTIVE
                     )
                     .fetch();
 
@@ -196,7 +206,7 @@ public CommentQueryDto findRootCommentId(Long rootCommentId) {
                 .join(comment.userJpaEntity, commentCreator)
                 .where(
                         comment.commentId.eq(rootCommentId),
-                        comment.status.eq(StatusType.ACTIVE)
+                        comment.status.eq(ACTIVE)
                 )
                 .fetchOne();
     }
@@ -225,8 +235,8 @@ public CommentQueryDto findChildCommentId(Long rootCommentId, Long replyCommentI
                 .join(comment.userJpaEntity, commentCreator)
                 .where(
                         comment.parent.commentId.eq(rootCommentId),
-                        parentComment.status.eq(StatusType.ACTIVE),
-                        comment.status.eq(StatusType.ACTIVE),
+                        parentComment.status.eq(ACTIVE),
+                        comment.status.eq(ACTIVE),
                         comment.commentId.eq(replyCommentId)
                 )
                 .fetchOne();

src/main/java/konkuk/thip/comment/application/service/CommentShowAllService.java

@@ -7,10 +7,12 @@
 import konkuk.thip.comment.application.port.out.CommentLikeQueryPort;
 import konkuk.thip.comment.application.port.out.CommentQueryPort;
 import konkuk.thip.comment.application.port.out.dto.CommentQueryDto;
+import konkuk.thip.common.annotation.persistence.Unfiltered;
 import konkuk.thip.common.util.Cursor;
 import konkuk.thip.common.util.CursorBasedList;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -25,6 +27,8 @@ public class CommentShowAllService implements CommentShowAllUseCase {
     private final CommentQueryMapper commentQueryMapper;
 
     @Override
+    @Transactional(readOnly = true)
+    @Unfiltered
     public CommentForSinglePostResponse showAllCommentsOfPost(CommentShowAllQuery query) {
         Cursor cursor = Cursor.from(query.cursorStr(), PAGE_SIZE);
 

src/main/java/konkuk/thip/common/annotation/DomainService.java → src/main/java/konkuk/thip/common/annotation/application/DomainService.java

@@ -1,4 +1,4 @@
-package konkuk.thip.common.annotation;
+package konkuk.thip.common.annotation.application;
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.stereotype.Component;

src/main/java/konkuk/thip/common/annotation/HelperService.java → src/main/java/konkuk/thip/common/annotation/application/HelperService.java

@@ -1,4 +1,4 @@
-package konkuk.thip.common.annotation;
+package konkuk.thip.common.annotation.application;
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.stereotype.Service;

src/main/java/konkuk/thip/common/annotation/persistence/IncludeInactive.java

@@ -0,0 +1,11 @@
+package konkuk.thip.common.annotation.persistence;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface IncludeInactive {
+}

src/main/java/konkuk/thip/common/annotation/persistence/Unfiltered.java

@@ -0,0 +1,11 @@
+package konkuk.thip.common.annotation.persistence;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Unfiltered {
+}