Merge pull request #101 from soma-baekgu/feature/BG-382-chat-alert

[BG-382]: 채팅 입력에 대한 알림 (2h / 2h)

.gitignore

@@ -44,5 +44,5 @@ kafka_data
 
 .run
 
-/*/src/*/resources/application-test.yaml
+/*/src/*/resources/application-test*.yaml
 /notification/src/*/resources/firebase/*.json

api/src/main/kotlin/com/backgu/amaker/api/chat/config/ChatServiceConfig.kt

@@ -10,7 +10,7 @@ import com.backgu.amaker.application.chat.service.ChatUserCacheFacadeService
 import com.backgu.amaker.application.event.service.EventAssignedUserService
 import com.backgu.amaker.application.user.service.UserCacheService
 import com.backgu.amaker.application.user.service.UserService
-import com.backgu.amaker.infra.jpa.chat.repository.ChatRepository
+import com.backgu.amaker.infra.jpa.chat.query.ChatRepository
 import com.backgu.amaker.infra.jpa.chat.repository.ChatRoomRepository
 import com.backgu.amaker.infra.jpa.chat.repository.ChatRoomUserRepository
 import com.backgu.amaker.infra.redis.chat.repository.ChatCacheRepository

api/src/main/kotlin/com/backgu/amaker/api/chat/service/ChatFacadeService.kt

@@ -15,6 +15,7 @@ import com.backgu.amaker.application.chat.service.ChatService
 import com.backgu.amaker.application.chat.service.ChatUserCacheFacadeService
 import com.backgu.amaker.application.event.service.EventAssignedUserService
 import com.backgu.amaker.application.event.service.EventService
+import com.backgu.amaker.application.notification.service.NotificationEventService
 import com.backgu.amaker.application.user.service.UserService
 import com.backgu.amaker.common.exception.BusinessException
 import com.backgu.amaker.common.status.StatusCode
@@ -25,6 +26,7 @@ import com.backgu.amaker.domain.chat.ChatType
 import com.backgu.amaker.domain.chat.DefaultChatWithUser
 import com.backgu.amaker.domain.event.Event
 import com.backgu.amaker.domain.event.EventAssignedUser
+import com.backgu.amaker.domain.notifiacation.chat.NewChat
 import com.backgu.amaker.domain.user.User
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
@@ -42,6 +44,7 @@ class ChatFacadeService(
     private val eventAssignedUserService: EventAssignedUserService,
     private val chatUserCacheFacadeService: ChatUserCacheFacadeService,
     private val eventPublisher: ApplicationEventPublisher,
+    private val notificationEventService: NotificationEventService,
 ) {
     @Transactional
     fun createChat(
@@ -57,6 +60,7 @@ class ChatFacadeService(
         chatRoomService.save(chatRoom.updateLastChatId(chat))
 
         eventPublisher.publishEvent(DefaultChatSaveEvent.of(chatRoomId, chat.createDefaultChatWithUser(user)))
+        notificationEventService.publishNotificationEvent(NewChat.of(user, chat, chatRoom))
 
         return DefaultChatWithUserDto.of(chat, user)
     }

api/src/test/kotlin/com/backgu/amaker/api/chat/service/ChatFacadeServiceTest.kt

@@ -173,7 +173,7 @@ class ChatFacadeServiceTest : IntegrationTest() {
         // given
         val userId = "test-user-id"
         val chatRoom: ChatRoom = fixture.setUp(userId = userId)
-        val prevChats: List<Chat> = fixture.chatFixture.createPersistedChats(chatRoom.id, userId, 30)
+        fixture.chatFixture.createPersistedChats(chatRoom.id, userId, 30)
         val currentChat: Chat = fixture.chatFixture.createPersistedChat(chatRoom.id, userId, "현재 테스트 메시지")
 
         // when

domain/src/main/kotlin/com/backgu/amaker/domain/notifiacation/ChatRoomNotification.kt

@@ -0,0 +1,14 @@
+package com.backgu.amaker.domain.notifiacation
+
+import com.backgu.amaker.domain.notifiacation.method.RealTimeNotificationMethod
+
+open class ChatRoomNotification(
+    val chatRoomId: Long,
+    override val method: RealTimeNotificationMethod,
+) : RealTimeBasedNotification(method) {
+    override val keyPrefix: String
+        get() = "CHAT_ROOM"
+
+    override val keyValue: String
+        get() = chatRoomId.toString()
+}

domain/src/main/kotlin/com/backgu/amaker/domain/notifiacation/chat/NewChat.kt

@@ -0,0 +1,39 @@
+package com.backgu.amaker.domain.notifiacation.chat
+
+import com.backgu.amaker.domain.chat.Chat
+import com.backgu.amaker.domain.chat.ChatRoom
+import com.backgu.amaker.domain.notifiacation.ChatRoomNotification
+import com.backgu.amaker.domain.notifiacation.method.TemplateEmailNotificationMethod
+import com.backgu.amaker.domain.user.User
+
+class NewChat(
+    chatRoom: ChatRoom,
+    method: TemplateEmailNotificationMethod,
+) : ChatRoomNotification(
+        chatRoom.id,
+        method,
+    ) {
+    companion object {
+        private fun buildDetailMessage(
+            chatRoom: ChatRoom,
+            chat: Chat,
+        ): String =
+            "${chatRoom.name}에 새로운 메시지가 도착했습니다.\n" +
+                "메시지 내용: ${chat.content}"
+
+        fun of(
+            sender: User,
+            chat: Chat,
+            chatRoom: ChatRoom,
+        ): NewChat =
+            NewChat(
+                chatRoom,
+                TemplateEmailNotificationMethod(
+                    "${sender.name}님이 보낸 메시지",
+                    chat.content,
+                    buildDetailMessage(chatRoom, chat),
+                    "chat-notification",
+                ),
+            )
+    }
+}

infra/src/main/kotlin/com/backgu/amaker/application/chat/service/ChatQueryService.kt

@@ -3,7 +3,7 @@ package com.backgu.amaker.application.chat.service
 import com.backgu.amaker.common.exception.BusinessException
 import com.backgu.amaker.common.status.StatusCode
 import com.backgu.amaker.domain.chat.DefaultChatWithUser
-import com.backgu.amaker.infra.jpa.chat.repository.ChatRepository
+import com.backgu.amaker.infra.jpa.chat.query.ChatRepository
 import org.springframework.stereotype.Service
 
 @Service

infra/src/main/kotlin/com/backgu/amaker/application/chat/service/ChatRoomUserService.kt

@@ -67,4 +67,6 @@ class ChatRoomUserService(
 
     fun findAllByChatRoom(chatRoom: ChatRoom): List<ChatRoomUser> =
         chatRoomUserRepository.findAllByChatRoomId(chatRoom.id).map { it.toDomain() }
+
+    fun findUserIdsByChatRoomId(chatRoomId: Long): List<String> = chatRoomUserRepository.findUserIdsByChatRoomId(chatRoomId)
 }

infra/src/main/kotlin/com/backgu/amaker/application/chat/service/ChatService.kt

@@ -4,7 +4,7 @@ import com.backgu.amaker.common.exception.BusinessException
 import com.backgu.amaker.common.status.StatusCode
 import com.backgu.amaker.domain.chat.Chat
 import com.backgu.amaker.infra.jpa.chat.entity.ChatEntity
-import com.backgu.amaker.infra.jpa.chat.repository.ChatRepository
+import com.backgu.amaker.infra.jpa.chat.query.ChatRepository
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional

infra/src/main/kotlin/com/backgu/amaker/application/user/service/UserService.kt

@@ -59,4 +59,10 @@ class UserService(
         if (users.isEmpty()) throw BusinessException(StatusCode.USER_NOT_FOUND)
         return users
     }
+
+    fun getByChatRoomId(chatRoomId: Long): List<User> {
+        val users = userRepository.findByChatRoomId(chatRoomId).map { it.toDomain() }
+        if (users.isEmpty()) throw BusinessException(StatusCode.USER_NOT_FOUND)
+        return users
+    }
 }

infra/src/main/kotlin/com/backgu/amaker/application/workspace/WorkspaceService.kt

@@ -50,4 +50,8 @@ class WorkspaceService(
     fun getWorkspaceById(workspaceId: Long): Workspace =
         workspaceRepository.findByIdOrNull(workspaceId)?.toDomain()
             ?: throw BusinessException(StatusCode.WORKSPACE_NOT_FOUND)
+
+    fun getWorkspaceIdByChatRoomId(chatRoomId: Long): Long =
+        workspaceRepository.getWorkspaceIdByChatRoomId(chatRoomId)
+            ?: throw BusinessException(StatusCode.WORKSPACE_NOT_FOUND)
 }

infra/src/main/kotlin/com/backgu/amaker/infra/jpa/chat/repository/ChatQueryRepository.kt → infra/src/main/kotlin/com/backgu/amaker/infra/jpa/chat/query/ChatQueryRepository.kt

@@ -1,6 +1,4 @@
-package com.backgu.amaker.infra.jpa.chat.repository
-
-import com.backgu.amaker.infra.jpa.chat.query.ChatWithUserQuery
+package com.backgu.amaker.infra.jpa.chat.query
 
 interface ChatQueryRepository {
     fun findTopByChatRoomIdLittleThanCursorLimitCountWithUser(

infra/src/main/kotlin/com/backgu/amaker/infra/jpa/chat/repository/ChatQueryRepositoryImpl.kt → infra/src/main/kotlin/com/backgu/amaker/infra/jpa/chat/query/ChatQueryRepositoryImpl.kt

@@ -1,8 +1,6 @@
-package com.backgu.amaker.infra.jpa.chat.repository
+package com.backgu.amaker.infra.jpa.chat.query
 
 import com.backgu.amaker.infra.jpa.chat.entity.QChatEntity.chatEntity
-import com.backgu.amaker.infra.jpa.chat.query.ChatWithUserQuery
-import com.backgu.amaker.infra.jpa.chat.query.QChatWithUserQuery
 import com.backgu.amaker.infra.jpa.user.entity.QUserEntity.userEntity
 import com.querydsl.jpa.impl.JPAQueryFactory
 

infra/src/main/kotlin/com/backgu/amaker/infra/jpa/chat/query/ChatRepository.kt

@@ -0,0 +1,7 @@
+package com.backgu.amaker.infra.jpa.chat.query
+
+import com.backgu.amaker.infra.jpa.chat.repository.ChatJpaRepository
+
+interface ChatRepository :
+    ChatJpaRepository,
+    ChatQueryRepository

infra/src/main/kotlin/com/backgu/amaker/infra/jpa/chat/repository/ChatRoomUserRepository.kt

@@ -2,6 +2,7 @@ package com.backgu.amaker.infra.jpa.chat.repository
 
 import com.backgu.amaker.infra.jpa.chat.entity.ChatRoomUserEntity
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
 
 interface ChatRoomUserRepository : JpaRepository<ChatRoomUserEntity, Long> {
     fun existsByUserIdAndChatRoomId(
@@ -24,4 +25,7 @@ interface ChatRoomUserRepository : JpaRepository<ChatRoomUserEntity, Long> {
     ): List<ChatRoomUserEntity>
 
     fun findAllByChatRoomId(chatRoomId: Long): List<ChatRoomUserEntity>
+
+    @Query("select cru.userId from ChatRoomUser cru where cru.chatRoomId = :chatRoomId")
+    fun findUserIdsByChatRoomId(chatRoomId: Long): List<String>
 }

infra/src/main/kotlin/com/backgu/amaker/infra/jpa/user/reposotory/UserRepository.kt

@@ -15,4 +15,7 @@ interface UserRepository : JpaRepository<UserEntity, String> {
 
     @Query("select u from User u join fetch WorkspaceUser wu on u.id = wu.userId where wu.workspaceId = :workspaceId")
     fun findByWorkspaceId(workspaceId: Long): List<UserEntity>
+
+    @Query("select u from User u join fetch ChatRoomUser cru on u.id = cru.userId where cru.chatRoomId = :chatRoomId")
+    fun findByChatRoomId(chatRoomId: Long): List<UserEntity>
 }

infra/src/main/kotlin/com/backgu/amaker/infra/jpa/workspace/repository/WorkspaceRepository.kt

@@ -37,4 +37,7 @@ interface WorkspaceRepository : JpaRepository<WorkspaceEntity, Long> {
     @Lock(LockModeType.PESSIMISTIC_WRITE)
     @Query("select w from Workspace w where w.id = :id")
     fun getLockedWorkspaceById(id: Long): WorkspaceEntity?
+
+    @Query("select ch.workspaceId from ChatRoom ch where ch.id = :chatRoomId")
+    fun getWorkspaceIdByChatRoomId(chatRoomId: Long): Long?
 }

notification/src/main/kotlin/com/backgu/amaker/notification/NotificationApplication.kt

@@ -10,7 +10,13 @@ import org.springframework.scheduling.annotation.EnableAsync
 @EnableAsync
 @SpringBootApplication
 @EntityScan(basePackages = ["com.backgu.amaker.infra"])
-@EnableJpaRepositories(basePackages = ["com.backgu.amaker.infra.jpa.user", "com.backgu.amaker.infra.jpa.workspace"])
+@EnableJpaRepositories(
+    basePackages = [
+        "com.backgu.amaker.infra.jpa.user",
+        "com.backgu.amaker.infra.jpa.workspace",
+        "com.backgu.amaker.infra.jpa.chat.repository",
+    ],
+)
 @EnableRedisRepositories(basePackages = ["com.backgu.amaker.infra.redis"])
 class NotificationApplication
 

notification/src/main/kotlin/com/backgu/amaker/notification/chatroom/config/ChatRoomServiceConfig.kt

@@ -0,0 +1,12 @@
+package com.backgu.amaker.notification.chatroom.config
+
+import com.backgu.amaker.application.chat.service.ChatRoomUserService
+import com.backgu.amaker.infra.jpa.chat.repository.ChatRoomUserRepository
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class ChatRoomServiceConfig {
+    @Bean
+    fun chatRoomUserService(chatRoomUserRepository: ChatRoomUserRepository) = ChatRoomUserService(chatRoomUserRepository)
+}

notification/src/main/kotlin/com/backgu/amaker/notification/realtime/handler/RealTimeHandler.kt

@@ -10,10 +10,10 @@ class RealTimeHandler(
     private val realTimeCallService: RealTimeCallService,
 ) {
     fun handleUserRealTimeNotification(
-        userId: String,
+        userIds: List<String>,
         realTimeServer: RealTimeServer,
         event: RealTimeBasedNotification,
-    ): List<String> = realTimeCallService.sendUserRealTimeNotification(listOf(userId), realTimeServer, event)
+    ): List<String> = realTimeCallService.sendUserRealTimeNotification(userIds, realTimeServer, event)
 
     fun handlerWorkspaceRealTimeNotification(
         workspaceId: Long,

notification/src/main/kotlin/com/backgu/amaker/notification/service/adapter/RealTimeChatRoomHandlerAdapter.kt

@@ -0,0 +1,53 @@
+package com.backgu.amaker.notification.service.adapter
+
+import com.backgu.amaker.application.chat.service.ChatRoomUserService
+import com.backgu.amaker.application.user.service.UserDeviceService
+import com.backgu.amaker.application.workspace.WorkspaceService
+import com.backgu.amaker.domain.notifiacation.ChatRoomNotification
+import com.backgu.amaker.domain.notifiacation.Notification
+import com.backgu.amaker.domain.notifiacation.method.NotificationMethod
+import com.backgu.amaker.domain.notifiacation.method.RealTimeNotificationMethod
+import com.backgu.amaker.domain.realtime.RealTimeServer
+import com.backgu.amaker.domain.session.Session
+import com.backgu.amaker.notification.realtime.handler.RealTimeHandler
+import com.backgu.amaker.notification.realtime.service.RealTimeService
+import com.backgu.amaker.notification.workspace.service.WorkspaceSessionService
+import org.springframework.context.ApplicationEventPublisher
+import org.springframework.stereotype.Component
+
+@Component
+class RealTimeChatRoomHandlerAdapter(
+    private val realTimeHandler: RealTimeHandler,
+    private val realTimeService: RealTimeService,
+    private val workspaceSessionService: WorkspaceSessionService,
+    private val workspaceService: WorkspaceService,
+    private val chatRoomUserService: ChatRoomUserService,
+    private val userDeviceService: UserDeviceService,
+    private val applicationEventPublisher: ApplicationEventPublisher,
+) : NotificationHandlerAdapter<ChatRoomNotification, RealTimeNotificationMethod> {
+    override fun supportsNotification(notification: Notification): Boolean = notification is ChatRoomNotification
+
+    override fun supportsMethod(method: NotificationMethod): Boolean = method is RealTimeNotificationMethod
+
+    override fun process(
+        notification: ChatRoomNotification,
+        method: RealTimeNotificationMethod,
+    ) {
+        val workspaceId: Long = workspaceService.getWorkspaceIdByChatRoomId(notification.chatRoomId)
+        val sessions: List<Session> = workspaceSessionService.findByWorkspaceId(workspaceId)
+        val realTimeServerSet: Set<RealTimeServer> =
+            realTimeService.findByIdsToSet(sessions.mapTo(mutableSetOf()) { it.realtimeId })
+
+        val chatRoomUsers = chatRoomUserService.findUserIdsByChatRoomId(notification.chatRoomId)
+        val successUsers: List<String> =
+            realTimeServerSet
+                .map {
+                    realTimeHandler.handleUserRealTimeNotification(chatRoomUsers, it, notification)
+                }.flatten()
+
+        val failedUsers: List<String> = chatRoomUsers.filterNot { it in successUsers }
+
+        val pushNotification = notification.toPushNotification(userDeviceService.findByUserIds(failedUsers))
+        applicationEventPublisher.publishEvent(pushNotification)
+    }
+}

notification/src/main/kotlin/com/backgu/amaker/notification/service/adapter/RealTimeUserHandlerAdapter.kt

@@ -34,7 +34,7 @@ class RealTimeUserHandlerAdapter(
             realTimeService.findByIdsToSet(sessions.mapTo(mutableSetOf()) { it.realtimeId })
         val successUser =
             realTimeServerSet.map {
-                realTimeHandler.handleUserRealTimeNotification(notification.userId, it, notification)
+                realTimeHandler.handleUserRealTimeNotification(listOf(notification.userId), it, notification)
             }
 
         if (successUser.isEmpty()) {

notification/src/main/kotlin/com/backgu/amaker/notification/service/adapter/TemplateEmailChatRoomHandlerAdapter.kt

@@ -0,0 +1,27 @@
+package com.backgu.amaker.notification.service.adapter
+
+import com.backgu.amaker.application.user.service.UserService
+import com.backgu.amaker.domain.notifiacation.ChatRoomNotification
+import com.backgu.amaker.domain.notifiacation.Notification
+import com.backgu.amaker.domain.notifiacation.method.NotificationMethod
+import com.backgu.amaker.domain.notifiacation.method.TemplateEmailNotificationMethod
+import com.backgu.amaker.notification.email.service.TemplateEmailHandler
+import org.springframework.stereotype.Component
+
+@Component
+class TemplateEmailChatRoomHandlerAdapter(
+    private val userService: UserService,
+    private val templateEmailHandler: TemplateEmailHandler,
+) : NotificationHandlerAdapter<ChatRoomNotification, TemplateEmailNotificationMethod> {
+    override fun supportsNotification(notification: Notification): Boolean = notification is ChatRoomNotification
+
+    override fun supportsMethod(method: NotificationMethod): Boolean = method is TemplateEmailNotificationMethod
+
+    override fun process(
+        notification: ChatRoomNotification,
+        method: TemplateEmailNotificationMethod,
+    ) {
+        val users = userService.getByChatRoomId(notification.chatRoomId)
+        users.forEach { templateEmailHandler.handleEmailEvent(it, method) }
+    }
+}

notification/src/main/kotlin/com/backgu/amaker/notification/workspace/config/WorkspaceServiceConfig.kt

@@ -1,12 +1,17 @@
 package com.backgu.amaker.notification.workspace.config
 
+import com.backgu.amaker.application.workspace.WorkspaceService
 import com.backgu.amaker.application.workspace.WorkspaceUserService
+import com.backgu.amaker.infra.jpa.workspace.repository.WorkspaceRepository
 import com.backgu.amaker.infra.jpa.workspace.repository.WorkspaceUserRepository
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 
 @Configuration
 class WorkspaceServiceConfig {
+    @Bean
+    fun workspaceService(workspaceRepository: WorkspaceRepository): WorkspaceService = WorkspaceService(workspaceRepository)
+
     @Bean
     fun workspaceUserService(workspaceUserRepository: WorkspaceUserRepository): WorkspaceUserService =
         WorkspaceUserService(workspaceUserRepository)

notification/src/main/resources/templates/chat-notification.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <title>새로운 채팅</title>
+</head>
+<body>
+<h1 th:text="${title}"></h1>
+<p th:text="${content}"></p>
+</body>
+</html>