THIP-TextHip · hd0rable · Aug 19, 2026 · Aug 19, 2026 · Aug 19, 2026 · Aug 19, 2026
diff --git a/build.gradle b/build.gradle
@@ -121,11 +121,21 @@ clean.doLast {
 }
 
 tasks.named('test') {
+    // CI 러너는 UTC 다. 일부 테스트가 jdbcTemplate 로 created_at 을 직접 써서, JVM 타임존이
+    // hibernate.jdbc.time_zone 과 어긋나면 커서 경계가 깨진다. 서비스 기준인 KST 로 고정한다.
+    systemProperty 'user.timezone', 'Asia/Seoul'
 	useJUnitPlatform {
         if (System.getenv('CI') == 'true') {
             excludeTags 'concurrency'
         }
     }
+    // 실패 원인이 요약되면 CI 로그만으로 진단할 수 없다
+    testLogging {
+        events 'failed'
+        exceptionFormat = 'full'
+        showStackTraces = true
+        showCauses = true
+    }
 }
 
 apply from: "$rootDir/jacoco.gradle"
diff --git a/src/main/java/konkuk/thip/book/adapter/in/web/BookQueryController.java b/src/main/java/konkuk/thip/book/adapter/in/web/BookQueryController.java
@@ -81,9 +81,10 @@ public BaseResponse<BookRecruitingRoomsResponse> showRecruitingRoomsWithBook(
             @Parameter(description = "책의 ISBN 번호 (13자리 숫자)", example = "9781234567890")
             @PathVariable("isbn") @Pattern(regexp = "\\d{13}") final String isbn,
             @Parameter(description = "커서 (첫번째 요청시 : null, 다음 요청시 : 이전 요청에서 반환받은 nextCursor 값)")
-            @RequestParam(required = false) final String cursor
+            @RequestParam(required = false) final String cursor,
+            @Parameter(hidden = true) @UserId final Long userId
     ) {
-        return BaseResponse.ok(bookRecruitingRoomsUseCase.getRecruitingRoomsWithBook(isbn, cursor));
+        return BaseResponse.ok(bookRecruitingRoomsUseCase.getRecruitingRoomsWithBook(isbn, cursor, userId));
     }
 
     @Operation(

diff --git a/src/main/java/konkuk/thip/book/application/port/in/BookRecruitingRoomsUseCase.java b/src/main/java/konkuk/thip/book/application/port/in/BookRecruitingRoomsUseCase.java
@@ -4,5 +4,5 @@
 
 public interface BookRecruitingRoomsUseCase {
 
-    BookRecruitingRoomsResponse getRecruitingRoomsWithBook(String isbn, String cursor);
+    BookRecruitingRoomsResponse getRecruitingRoomsWithBook(String isbn, String cursor, Long userId);
 }
diff --git a/src/main/java/konkuk/thip/book/application/service/BookRecruitingRoomsService.java b/src/main/java/konkuk/thip/book/application/service/BookRecruitingRoomsService.java
@@ -22,12 +22,12 @@ public class BookRecruitingRoomsService implements BookRecruitingRoomsUseCase {
 
     @Override
     @Transactional(readOnly = true)
-    public BookRecruitingRoomsResponse getRecruitingRoomsWithBook(String isbn, String cursorStr) {
+    public BookRecruitingRoomsResponse getRecruitingRoomsWithBook(String isbn, String cursorStr, Long userId) {
         Integer totalRoomCount = (cursorStr == null || cursorStr.isBlank()) ? // 첫 요청 여부 판단
                 roomQueryPort.countRecruitingRoomsByBookIsbn(isbn) : null;
 
         Cursor cursor = Cursor.from(cursorStr, DEFAULT_PAGE_SIZE);
-        CursorBasedList<RoomQueryDto> roomDtos = roomQueryPort.findRoomsByIsbnOrderByDeadline(isbn, cursor);
+        CursorBasedList<RoomQueryDto> roomDtos = roomQueryPort.findRoomsByIsbnOrderByDeadline(isbn, cursor, userId);
 
         return BookRecruitingRoomsResponse.of(bookQueryMapper.toRecruitingRoomDtoList(roomDtos.contents()), totalRoomCount,
                 roomDtos.nextCursor(), roomDtos.isLast());

diff --git a/...main/java/konkuk/thip/comment/adapter/out/persistence/CommentQueryPersistenceAdapter.java b/...main/java/konkuk/thip/comment/adapter/out/persistence/CommentQueryPersistenceAdapter.java
@@ -22,11 +22,11 @@ public class CommentQueryPersistenceAdapter implements CommentQueryPort {
     private final CommentMapper commentMapper;
 
     @Override
-    public CursorBasedList<CommentQueryDto> findLatestRootCommentsWithDeleted(Long postId, String postTypeStr, Cursor cursor) {
+    public CursorBasedList<CommentQueryDto> findLatestRootCommentsWithDeleted(Long postId, String postTypeStr, Cursor cursor, Long viewerId) {
         LocalDateTime lastCreatedAt = cursor.isFirstRequest() ? null : cursor.getLocalDateTime(0);
         int size = cursor.getPageSize();
 
-        List<CommentQueryDto> commentQueryDtos = commentJpaRepository.findRootCommentsWithDeletedByCreatedAtDesc(postId, postTypeStr, lastCreatedAt, size);
+        List<CommentQueryDto> commentQueryDtos = commentJpaRepository.findRootCommentsWithDeletedByCreatedAtDesc(postId, postTypeStr, lastCreatedAt, size, viewerId);
 
         return CursorBasedList.of(commentQueryDtos, size, commentQueryDto -> {
             Cursor nextCursor = new Cursor(List.of(commentQueryDto.createdAt().toString()));
@@ -35,13 +35,13 @@ public CursorBasedList<CommentQueryDto> findLatestRootCommentsWithDeleted(Long p
     }
 
     @Override
-    public List<CommentQueryDto> findAllActiveChildCommentsOldestFirst(Long rootCommentId) {
-        return commentJpaRepository.findAllActiveChildCommentsByCreatedAtAsc(rootCommentId);
+    public List<CommentQueryDto> findAllActiveChildCommentsOldestFirst(Long rootCommentId, Long viewerId) {
+        return commentJpaRepository.findAllActiveChildCommentsByCreatedAtAsc(rootCommentId, viewerId);
     }
 
     @Override
-    public Map<Long, List<CommentQueryDto>> findAllActiveChildCommentsOldestFirst(Set<Long> rootCommentIds) {
-        return commentJpaRepository.findAllActiveChildCommentsByCreatedAtAsc(rootCommentIds);
+    public Map<Long, List<CommentQueryDto>> findAllActiveChildCommentsOldestFirst(Set<Long> rootCommentIds, Long viewerId) {
+        return commentJpaRepository.findAllActiveChildCommentsByCreatedAtAsc(rootCommentIds, viewerId);
     }
 
     @Override

diff --git a/...n/java/konkuk/thip/comment/adapter/out/persistence/repository/CommentQueryRepository.java b/...n/java/konkuk/thip/comment/adapter/out/persistence/repository/CommentQueryRepository.java
@@ -9,11 +9,11 @@
 
 public interface CommentQueryRepository {
 
-    List<CommentQueryDto> findRootCommentsWithDeletedByCreatedAtDesc(Long postId, String postTypeStr, LocalDateTime lastCreatedAt, int size);
+    List<CommentQueryDto> findRootCommentsWithDeletedByCreatedAtDesc(Long postId, String postTypeStr, LocalDateTime lastCreatedAt, int size, Long viewerId);
 
-    List<CommentQueryDto> findAllActiveChildCommentsByCreatedAtAsc(Long rootCommentId);
+    List<CommentQueryDto> findAllActiveChildCommentsByCreatedAtAsc(Long rootCommentId, Long viewerId);
 
-    Map<Long, List<CommentQueryDto>> findAllActiveChildCommentsByCreatedAtAsc(Set<Long> rootCommentIds);
+    Map<Long, List<CommentQueryDto>> findAllActiveChildCommentsByCreatedAtAsc(Set<Long> rootCommentIds, Long viewerId);
 
     CommentQueryDto findRootCommentId(Long commentId);
 

diff --git a/...va/konkuk/thip/comment/adapter/out/persistence/repository/CommentQueryRepositoryImpl.java b/...va/konkuk/thip/comment/adapter/out/persistence/repository/CommentQueryRepositoryImpl.java
@@ -16,6 +16,7 @@
 import java.util.stream.Collectors;
 
 import static konkuk.thip.common.entity.StatusType.ACTIVE;
+import static konkuk.thip.user.adapter.out.persistence.expression.BlockFilterExpressions.notBlockedWith;
 
 @Repository
 @RequiredArgsConstructor
@@ -34,7 +35,7 @@ public class CommentQueryRepositoryImpl implements CommentQueryRepository {
 
     // 최상위 댓글 조회 (삭제된 댓글 포함, 최신순, 페이징)
     @Override
-    public List<CommentQueryDto> findRootCommentsWithDeletedByCreatedAtDesc(Long postId, String postTypeStr, LocalDateTime lastCreatedAt, int size) {
+    public List<CommentQueryDto> findRootCommentsWithDeletedByCreatedAtDesc(Long postId, String postTypeStr, LocalDateTime lastCreatedAt, int size, Long viewerId) {
         // 최상위 댓글(size+1) 프로젝션 생성
         QCommentQueryDto proj = new QCommentQueryDto(
                 comment.commentId,
@@ -57,6 +58,12 @@ public List<CommentQueryDto> findRootCommentsWithDeletedByCreatedAtDesc(Long pos
                         : Expressions.TRUE
                 );
 
+        // 차단 관계인 작성자의 루트 댓글은 하위 답글까지 통째로 숨긴다
+        BooleanExpression notBlocked = notBlockedWith(commentCreator.userId, viewerId);
+        if (notBlocked != null) {
+            whereClause = whereClause.and(notBlocked);
+        }
+
         // 조회 및 반환
         return queryFactory
                 .select(proj)
@@ -69,7 +76,7 @@ public List<CommentQueryDto> findRootCommentsWithDeletedByCreatedAtDesc(Long pos
     }
 
     @Override
-    public List<CommentQueryDto> findAllActiveChildCommentsByCreatedAtAsc(Long rootCommentId) {
+    public List<CommentQueryDto> findAllActiveChildCommentsByCreatedAtAsc(Long rootCommentId, Long viewerId) {
         List<CommentQueryDto> allDescendants = new ArrayList<>();       // 결과 누적용 리스트
 
         // 1) 부모 ID 집합에 루트 댓글 ID 추가
@@ -101,7 +108,8 @@ public List<CommentQueryDto> findAllActiveChildCommentsByCreatedAtAsc(Long rootC
                     .where(
                             comment.parent.commentId.in(parentIds),     // parentIds 하위의 모든 자식 댓글 조회
                             comment.status.eq(ACTIVE),        // 자식 댓글은 ACTIVE인 것만 조회
-                            commentCreator.status.eq(ACTIVE)    // 자식 댓글 작성자 ACTIVE
+                            commentCreator.status.eq(ACTIVE),    // 자식 댓글 작성자 ACTIVE
+                            notBlockedWith(commentCreator.userId, viewerId)     // 차단 관계인 작성자의 답글 숨김
                     )
                     .fetch();
 
@@ -120,7 +128,7 @@ public List<CommentQueryDto> findAllActiveChildCommentsByCreatedAtAsc(Long rootC
     }
 
     @Override
-    public Map<Long, List<CommentQueryDto>> findAllActiveChildCommentsByCreatedAtAsc(Set<Long> rootCommentIds) {
+    public Map<Long, List<CommentQueryDto>> findAllActiveChildCommentsByCreatedAtAsc(Set<Long> rootCommentIds, Long viewerId) {
         // 1) 루트 ID별로 최상위 매핑 초기화
         Map<Long, Long> idToRoot = new HashMap<>();
         for (Long rootId : rootCommentIds) {
@@ -161,7 +169,8 @@ public Map<Long, List<CommentQueryDto>> findAllActiveChildCommentsByCreatedAtAsc
                     .where(
                             comment.parent.commentId.in(parentIds),     // parentIds 하위의 모든 자식 댓글 조회
                             comment.status.eq(ACTIVE),        // 자식 댓글은 ACTIVE인 것만 조회
-                            commentCreator.status.eq(ACTIVE)    // 자식 댓글 작성자 ACTIVE
+                            commentCreator.status.eq(ACTIVE),    // 자식 댓글 작성자 ACTIVE
+                            notBlockedWith(commentCreator.userId, viewerId)     // 차단 관계인 작성자의 답글 숨김
                     )
                     .fetch();
 

diff --git a/src/main/java/konkuk/thip/comment/application/port/out/CommentQueryPort.java b/src/main/java/konkuk/thip/comment/application/port/out/CommentQueryPort.java
@@ -10,11 +10,11 @@
 
 public interface CommentQueryPort {
 
-    CursorBasedList<CommentQueryDto> findLatestRootCommentsWithDeleted(Long postId, String postTypeStr, Cursor cursor);
+    CursorBasedList<CommentQueryDto> findLatestRootCommentsWithDeleted(Long postId, String postTypeStr, Cursor cursor, Long viewerId);
 
-    List<CommentQueryDto> findAllActiveChildCommentsOldestFirst(Long rootCommentId);
+    List<CommentQueryDto> findAllActiveChildCommentsOldestFirst(Long rootCommentId, Long viewerId);
 
-    Map<Long, List<CommentQueryDto>> findAllActiveChildCommentsOldestFirst(Set<Long> rootCommentIds);
+    Map<Long, List<CommentQueryDto>> findAllActiveChildCommentsOldestFirst(Set<Long> rootCommentIds, Long viewerId);
 
     CommentQueryDto findRootCommentById(Long rootCommentId);
 

diff --git a/src/main/java/konkuk/thip/comment/application/service/CommentCreateService.java b/src/main/java/konkuk/thip/comment/application/service/CommentCreateService.java
@@ -10,13 +10,16 @@
 import konkuk.thip.comment.application.port.out.dto.CommentQueryDto;
 import konkuk.thip.comment.application.service.validator.CommentAuthorizationValidator;
 import konkuk.thip.comment.domain.Comment;
+import konkuk.thip.common.exception.BusinessException;
+import konkuk.thip.common.exception.code.ErrorCode;
 import konkuk.thip.common.exception.InvalidStateException;
 import konkuk.thip.notification.application.port.in.FeedNotificationOrchestrator;
 import konkuk.thip.notification.application.port.in.RoomNotificationOrchestrator;
 import konkuk.thip.post.application.port.out.dto.PostQueryDto;
 import konkuk.thip.post.domain.CountUpdatable;
 import konkuk.thip.post.application.service.handler.PostHandler;
 import konkuk.thip.post.domain.PostType;
+import konkuk.thip.user.application.port.out.UserBlockQueryPort;
 import konkuk.thip.user.application.port.out.UserCommandPort;
 import konkuk.thip.user.domain.User;
 import lombok.RequiredArgsConstructor;
@@ -35,6 +38,7 @@ public class CommentCreateService implements CommentCreateUseCase {
     private final CommentLikeQueryPort commentLikeQueryPort;
     private final CommentQueryMapper commentQueryMapper;
     private final UserCommandPort userCommandPort;
+    private final UserBlockQueryPort userBlockQueryPort;
 
     private final PostHandler postHandler;
     private final CommentAuthorizationValidator commentAuthorizationValidator;
@@ -55,8 +59,11 @@ public CommentCreateResponse createComment(CommentCreateCommand command) {
         // 2-1. 게시글 타입에 따른 댓글 생성 권한 검증
         commentAuthorizationValidator.validateUserCanAccessPostForComment(type, post, command.userId());
 
-        // 2-2. 댓글 생성 푸쉬 알림 전송 (게시글 작성자에게)
+        // 2-2. 차단 관계인 작성자의 게시글에는 댓글을 달 수 없다
         PostQueryDto postQueryDto = postHandler.getPostQueryDto(type, post.getId());
+        validateNotBlocked(command.userId(), postQueryDto.creatorId());
+
+        // 2-3. 댓글 생성 푸쉬 알림 전송 (게시글 작성자에게)
         User actorUser = userCommandPort.findById(command.userId());
         sendNotificationsToPostWriter(postQueryDto, actorUser);
 
@@ -90,6 +97,15 @@ public CommentCreateResponse createComment(CommentCreateCommand command) {
         }
     }
 
+    private void validateNotBlocked(Long userId, Long targetUserId) {
+        if (targetUserId == null || userId.equals(targetUserId)) {
+            return;
+        }
+        if (userBlockQueryPort.existsBlockBetween(userId, targetUserId)) {
+            throw new BusinessException(ErrorCode.USER_BLOCKED_CANNOT_INTERACT);
+        }
+    }
+
     private void sendNotificationsToPostWriter(PostQueryDto postQueryDto, User actorUser) {
         if (postQueryDto.creatorId().equals(actorUser.getId())) return; // 자신이 작성한 게시글 제외
 

diff --git a/src/main/java/konkuk/thip/comment/application/service/CommentLikeService.java b/src/main/java/konkuk/thip/comment/application/service/CommentLikeService.java
@@ -8,12 +8,15 @@
 import konkuk.thip.comment.application.port.out.CommentLikeQueryPort;
 import konkuk.thip.comment.application.service.validator.CommentAuthorizationValidator;
 import konkuk.thip.comment.domain.Comment;
+import konkuk.thip.common.exception.BusinessException;
+import konkuk.thip.common.exception.code.ErrorCode;
 import konkuk.thip.notification.application.port.in.FeedNotificationOrchestrator;
 import konkuk.thip.notification.application.port.in.RoomNotificationOrchestrator;
 import konkuk.thip.post.application.port.out.dto.PostQueryDto;
 import konkuk.thip.post.application.service.handler.PostHandler;
 import konkuk.thip.post.domain.CountUpdatable;
 import konkuk.thip.post.domain.PostType;
+import konkuk.thip.user.application.port.out.UserBlockQueryPort;
 import konkuk.thip.user.application.port.out.UserCommandPort;
 import konkuk.thip.user.domain.User;
 import lombok.RequiredArgsConstructor;
@@ -28,6 +31,7 @@ public class CommentLikeService implements CommentLikeUseCase {
     private final CommentLikeQueryPort commentLikeQueryPort;
     private final CommentLikeCommandPort commentLikeCommandPort;
     private final UserCommandPort userCommandPort;
+    private final UserBlockQueryPort userBlockQueryPort;
 
     private final PostHandler postHandler;
     private final CommentAuthorizationValidator commentAuthorizationValidator;
@@ -50,6 +54,7 @@ public CommentIsLikeResult changeLikeStatusComment(CommentIsLikeCommand command)
 
         // 3. 좋아요 상태변경
         if (command.isLike()) {
+            validateNotBlocked(command.userId(), comment.getCreatorId());    // 차단 관계인 작성자의 댓글에는 좋아요할 수 없다
             comment.validateCanLike(alreadyLiked); // 좋아요 가능 여부 검증
             commentLikeCommandPort.save(command.userId(), command.commentId());
 
@@ -67,6 +72,15 @@ public CommentIsLikeResult changeLikeStatusComment(CommentIsLikeCommand command)
         return CommentIsLikeResult.of(comment.getId(), command.isLike());
     }
 
+    private void validateNotBlocked(Long userId, Long commentCreatorId) {
+        if (userId.equals(commentCreatorId)) {
+            return;
+        }
+        if (userBlockQueryPort.existsBlockBetween(userId, commentCreatorId)) {
+            throw new BusinessException(ErrorCode.USER_BLOCKED_CANNOT_INTERACT);
+        }
+    }
+
     private void sendNotifications(CommentIsLikeCommand command, Comment comment) {
         if (command.userId().equals(comment.getCreatorId())) return; // 자신의 댓글에 좋아요 누르는 경우 제외
 

diff --git a/src/main/java/konkuk/thip/comment/application/service/CommentShowAllService.java b/src/main/java/konkuk/thip/comment/application/service/CommentShowAllService.java
@@ -33,15 +33,15 @@ public CommentForSinglePostResponse showAllCommentsOfPost(CommentShowAllQuery qu
         Cursor cursor = Cursor.from(query.cursorStr(), PAGE_SIZE);
 
         // 1. size 크기만큼의 루트 댓글 최신순 조회 -> 삭제된 루트 댓글 포함해서 전부 조회
-        CursorBasedList<CommentQueryDto> commentQueryDtoCursorBasedList = commentQueryPort.findLatestRootCommentsWithDeleted(query.postId(), query.postType().getType(), cursor);
+        CursorBasedList<CommentQueryDto> commentQueryDtoCursorBasedList = commentQueryPort.findLatestRootCommentsWithDeleted(query.postId(), query.postType().getType(), cursor, query.userId());
         List<CommentQueryDto> rootsInOrder = commentQueryDtoCursorBasedList.contents();
 
         // 2. 조회한 루트 댓글들의 전체 자식 댓귿들을(깊이 무관) 작성 시간순으로 조회
         Set<Long> rootCommentIds = rootsInOrder.stream()
                 .map(CommentQueryDto::commentId)
                 .collect(Collectors.toUnmodifiableSet());
 
-        Map<Long, List<CommentQueryDto>> childrenMap = commentQueryPort.findAllActiveChildCommentsOldestFirst(rootCommentIds);
+        Map<Long, List<CommentQueryDto>> childrenMap = commentQueryPort.findAllActiveChildCommentsOldestFirst(rootCommentIds, query.userId());
 
         // 3. 반환할 모든 댓글(루트 + 자식 모두 포함) 중 유저가 좋아한 댓글 조회
         Set<Long> allCommentIds = parseAllCommentIds(childrenMap);

diff --git a/src/main/java/konkuk/thip/common/exception/code/ErrorCode.java b/src/main/java/konkuk/thip/common/exception/code/ErrorCode.java
@@ -66,6 +66,16 @@ public enum ErrorCode implements ResponseCode {
     USER_CANNOT_FOLLOW_SELF(HttpStatus.BAD_REQUEST, 75002, "사용자는 자신을 팔로우할 수 없습니다."),
     FOLLOW_COUNT_CANNOT_BE_NEGATIVE(HttpStatus.BAD_REQUEST, 75003, "사용자의 팔로우 수가 0일때는 언팔로우는 불가능합니다."),
 
+    /**
+     * 77000 : block error
+     */
+    BLOCK_NOT_FOUND(HttpStatus.NOT_FOUND, 77000, "존재하지 않는 차단 관계입니다."),
+    USER_ALREADY_BLOCKED(HttpStatus.BAD_REQUEST, 77001, "이미 차단한 사용자입니다."),
+    USER_ALREADY_UNBLOCKED(HttpStatus.BAD_REQUEST, 77002, "이미 차단 해제한 사용자입니다."),
+    USER_CANNOT_BLOCK_SELF(HttpStatus.BAD_REQUEST, 77003, "사용자는 자신을 차단할 수 없습니다."),
+    USER_BLOCKED_CANNOT_INTERACT(HttpStatus.BAD_REQUEST, 77004, "차단한 사용자와는 상호작용할 수 없습니다."),
+    ROOM_HOST_BLOCKED(HttpStatus.BAD_REQUEST, 77005, "차단한 사용자가 방장인 모임방에는 참여할 수 없습니다."),
+
     /**
      * 80000 : book error
      */