[hotfix] fix: 댓글 전체를 차단된 사용자가 작성해도 노트 조회되도록 수정

project-lyrics · Nov 24, 2024 · 2bbcac8 · 2bbcac8
1 parent 68a4c67
commit 2bbcac8
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/...ava/com/projectlyrics/server/domain/note/repository/impl/QueryDslNoteQueryRepository.java b/...ava/com/projectlyrics/server/domain/note/repository/impl/QueryDslNoteQueryRepository.java
@@ -54,15 +54,20 @@ public Optional<Note> findById(Long id, Long userId) {
                         .join(note.publisher).fetchJoin()
                         .join(note.song).fetchJoin()
                         .join(song.artist).fetchJoin()
-                        .leftJoin(note.comments, comment).fetchJoin()
-                        .leftJoin(block)
-                            .on(block.blocked.eq(comment.writer)
-                                    .and(block.blocker.id.eq(userId))
-                                    .and(block.deletedAt.isNull()))
+                        .leftJoin(note.comments, comment)
+                            .on(comment.deletedAt.isNull()
+                                    .and(comment.writer.id.notIn(
+                                            JPAExpressions.select(block.blocked.id)
+                                                    .from(block)
+                                                    .where(
+                                                            block.blocker.id.eq(userId),
+                                                            block.deletedAt.isNull()
+                                                    )
+                                    ))
+                        ).fetchJoin()
                         .where(
                                 note.id.eq(id),
-                                note.deletedAt.isNull(),
-                                block.id.isNull()
+                                note.deletedAt.isNull()
                         )
                         .fetchOne()
         );