Refactor :: Notification 조회 로직 변경 #346

기존 쿼리를 두 단계로 나눠서 N+1 문제를 변경함 기존 쿼리에선 N+1 이 발생해 조회를 여러번 했는데 이를 2번 쿼리를 나누어 날려 빈도수를 줄이고 속도 개선을 함
apeun-gidaechi · Nov 26, 2024 · 8d89f1f · 8d89f1f
1 parent 132e5bc
commit 8d89f1f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/kotlin/com/seugi/api/domain/notification/domain/NotificationEntity.kt b/src/main/kotlin/com/seugi/api/domain/notification/domain/NotificationEntity.kt
@@ -31,7 +31,6 @@ class NotificationEntity(
     var content: String,
 
     @ElementCollection
-    @Column(nullable = false)
     val emoji: MutableList<NotificationEmoji> = mutableListOf(),
 
     @Column(nullable = false, updatable = false)

diff --git a/src/main/kotlin/com/seugi/api/domain/notification/domain/NotificationRepositoryCustomImpl.kt b/src/main/kotlin/com/seugi/api/domain/notification/domain/NotificationRepositoryCustomImpl.kt
@@ -13,8 +13,8 @@ class NotificationRepositoryCustomImpl(
     override fun findByWorkspaceId(workspaceId: String, pageable: Pageable): List<NotificationEntity> {
         val notice: QNotificationEntity = QNotificationEntity.notificationEntity
 
-        return jpaQueryFactory
-            .select(notice)
+        val noticeIdList = jpaQueryFactory
+            .select(notice.id)
             .from(notice)
             .where(
                 notice.workspaceId.eq(workspaceId),
@@ -24,6 +24,15 @@ class NotificationRepositoryCustomImpl(
             .offset(pageable.offset)
             .limit(pageable.pageSize.toLong())
             .fetch().orEmpty().toList()
+
+        return jpaQueryFactory
+            .select(notice)
+            .from(notice)
+            .leftJoin(notice.user).fetchJoin()
+            .leftJoin(notice.emoji).fetchJoin()
+            .where(notice.id.`in`(noticeIdList))
+            .fetch().orEmpty().toList()
+
     }
 
 }