Merge pull request #350 from apeun-gidaechi/refactor/#346

Refactor :: Notification N+1 이슈 및 캐싱 적용 #346

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)

src/main/kotlin/com/seugi/api/domain/notification/domain/NotificationRepositoryCustomImpl.kt

@@ -13,16 +13,27 @@ 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),
                 notice.deleted.isFalse
             )
             .offset(pageable.offset)
             .limit(pageable.pageSize.toLong())
+            .orderBy(notice.id.desc())
+            .fetch().orEmpty().toList()
+
+        return jpaQueryFactory
+            .select(notice)
+            .from(notice)
+            .leftJoin(notice.user).fetchJoin()
+            .leftJoin(notice.emoji).fetchJoin()
+            .where(notice.id.`in`(noticeIdList))
+            .orderBy(notice.id.desc())
             .fetch().orEmpty().toList()
+
     }
 
 }

src/main/kotlin/com/seugi/api/domain/notification/presentation/dto/response/NotificationEmojiResponse.kt

@@ -1,6 +1,6 @@
 package com.seugi.api.domain.notification.presentation.dto.response
 
 data class NotificationEmojiResponse(
-    val emoji: String,
-    val userList: List<Long>,
+    val emoji: String? = null,
+    val userList: List<Long>? = null,
 )

src/main/kotlin/com/seugi/api/domain/notification/service/NotificationCacheService.kt

@@ -0,0 +1,33 @@
+package com.seugi.api.domain.notification.service
+
+import com.seugi.api.domain.notification.presentation.dto.response.NotificationResponse
+import com.seugi.api.domain.notification.domain.NotificationRepository
+import com.seugi.api.domain.notification.domain.mapper.NotificationMapper
+import org.springframework.cache.annotation.Cacheable
+import org.springframework.cache.annotation.CacheEvict
+import org.springframework.data.domain.Pageable
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Propagation
+import org.springframework.transaction.annotation.Transactional
+
+@Service
+class NotificationCacheService(
+    private val noticeRepository: NotificationRepository,
+    private val noticeMapper: NotificationMapper
+) {
+
+    @Transactional(readOnly = true)
+    @Cacheable(value = ["notifications"], key = "#workspaceId")
+    fun getNotices(workspaceId: String, pageable: Pageable): List<NotificationResponse> {
+        return noticeRepository.findByWorkspaceId(workspaceId, pageable).map {
+            noticeMapper.transferNoticeResponse(
+                noticeMapper.toDomain(it)
+            )
+        }
+    }
+
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @CacheEvict(value = ["notifications"], key = "#workspaceId")
+    fun deleteCache(workspaceId: String) {}
+
+}

src/main/kotlin/com/seugi/api/domain/notification/service/NotificationServiceImpl.kt

@@ -25,6 +25,7 @@ class NotificationServiceImpl(
     private val noticeRepository: NotificationRepository,
     private val noticeMapper: NotificationMapper,
     private val fcmService: FCMService,
+    private val notificationCacheService: NotificationCacheService
 ) : NotificationService {
 
     @Transactional(readOnly = true)
@@ -52,7 +53,7 @@ class NotificationServiceImpl(
         noticeRepository.save(notice)
 
         sendAlert(workspaceEntity, userId, createNoticeRequest.title)
-
+        notificationCacheService.deleteCache(createNoticeRequest.workspaceId)
     }
 
     @Transactional(readOnly = true)
@@ -61,12 +62,7 @@ class NotificationServiceImpl(
         userId: Long,
         pageable: Pageable,
     ): List<NotificationResponse> {
-
-        return noticeRepository.findByWorkspaceId(workspaceId, pageable).map {
-            noticeMapper.transferNoticeResponse(
-                noticeMapper.toDomain(it)
-            )
-        }
+        return notificationCacheService.getNotices(workspaceId, pageable)
     }
 
     @Transactional
@@ -76,9 +72,8 @@ class NotificationServiceImpl(
         if (noticeEntity.user!!.id != userId) throw CustomException(NotificationErrorCode.FORBIDDEN)
 
         noticeEntity.updateNotice(updateNoticeRequest)
-
         noticeRepository.save(noticeEntity)
-
+        notificationCacheService.deleteCache(noticeEntity.workspaceId)
     }
 
     @Transactional
@@ -95,7 +90,7 @@ class NotificationServiceImpl(
 
         notice.deleteNotice()
         noticeRepository.save(notice)
-
+        notificationCacheService.deleteCache(workspaceId)
     }
 
     private fun addEmoji(
@@ -131,8 +126,6 @@ class NotificationServiceImpl(
         }
 
         noticeRepository.save(notification)
-
+        notificationCacheService.deleteCache(notification.workspaceId)
     }
-
-
 }

src/main/kotlin/com/seugi/api/global/config/RedisConfig.kt

@@ -65,9 +65,11 @@ class RedisConfig(
             .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(GenericJackson2JsonRedisSerializer()))
 
         val schedulesCacheConfig = defaultCacheConfig.entryTtl(Duration.ofDays(1))
+        val notificationCacheConfig = defaultCacheConfig.entryTtl(Duration.ofHours(1))
 
         val cacheConfigurations: MutableMap<String, RedisCacheConfiguration> = mutableMapOf()
         cacheConfigurations["schedules"] = schedulesCacheConfig
+        cacheConfigurations["notification"] = notificationCacheConfig
 
         return RedisCacheManager.RedisCacheManagerBuilder.fromConnectionFactory(redisConnectionFactory)
             .cacheDefaults(defaultCacheConfig)