DRAW-347 WebSocket / Core & Domain 의존성 분리 리팩터링 Base

README.md

@@ -1,4 +1,4 @@
-#  Trouble Painter 🪄
+# Trouble Painter 🪄
 
 ![1](https://github.com/user-attachments/assets/e39f0b35-511d-4499-92a2-043c2239f872)
 
@@ -13,7 +13,7 @@
 ## Architecture ✨
 
 <div align=center>
- 
+
 <img width="700" src="https://github.com/user-attachments/assets/6a16defc-611a-4671-8c98-1998a461344a">
 
 </div>
@@ -22,18 +22,18 @@
 
 ## Teck Stack ✨
 
-| IDE | IntelliJ |
-|:---|:---|
-| Language | Kotlin |
-| Framework | Spring Boot 3.2.5, Gradle |
+| IDE  | IntelliJ  |
+|:---------------|:-----------------------------------------------|
+| Language  | Kotlin  |
+| Framework  | Spring Boot 3.2.5, Gradle  |
 | Authentication | Spring Security, JSON Web Tokens, Opaque Token |
-| Orm | Spring Data JPA |
-| Database | MySQL |
-| External | Nginx, Docker, Redis, Kubernetes, ELK |
-| Monitoring | Prometheus, Grafana, Sentry |
-| CI/CD | ArgoCD, Github Action |
-| API Docs | Notion, Swagger |
-| Other Tool | Jira, Discord, Postman, Figma |
+| Orm  | Spring Data JPA  |
+| Database  | MySQL  |
+| External  | Nginx, Docker, Redis, Kubernetes, ELK  |
+| Monitoring  | Prometheus, Grafana, Sentry  |
+| CI/CD  | ArgoCD, Github Action  |
+| API Docs  | Notion, Swagger  |
+| Other Tool  | Jira, Discord, Postman, Figma  |
 
 <br>
 
@@ -68,9 +68,9 @@
 - 일단 포트 역할하는 인터페이스도 이 모듈에 담는다.
 ```
 
-| | app | adapter | core | support | domain |
-|-------------|-----|---------|------|---------|--------|
-| 사용가능한 모듈 여부 | - | - | - | - | - |
+| | app | adapter | core | event | support | domain |
+|-------------|-----|---------|------|-------|---------|--------|
+| 사용가능한 모듈 여부 | - | - | - | - | -  | - |
 
 ### support: 서포트 모듈
 
@@ -79,9 +79,21 @@
 - TimeUtis 등
 ```
 
-| | app | adapter | core | support | domain |
-|-------------|-----|---------|------|---------|--------|
-| 사용가능한 모듈 여부 | - | - | - | - | - |
+| | app | adapter | core | event | support | domain |
+|-------------|-----|---------|------|-------|---------|--------|
+| 사용가능한 모듈 여부 | - | - | - | - | - | - |
+
+### event: 이벤트 모듈
+
+```text
+- 이벤트 모듈
+- 객체간 연결을 느슨하게 하기 위한 객체
+- 이벤트 발생 및 전달을 주로 한다
+```
+
+| | app | adapter | core | event | support | domain |
+|-------------|-----|---------|------|-------|---------|--------|
+| 사용가능한 모듈 여부 | - | Runtime | - | - | O | O |
 
 ### core: 코어 모듈
 
@@ -90,10 +102,9 @@
 - 웹 통신 / DB 관련 객체는 가급적 사용을 피한다.
 ```
 
-| | app | adapter | core | support | domain |
-|-------------|---|---------|------|---------|--------|
-| 사용가능한 모듈 여부 | - | Runtime | - | O | O |
-
+| | app | adapter | core | event | support | domain |
+|-------------|-----|---------|------|-------|---------|--------|
+| 사용가능한 모듈 여부 | - | Runtime | - | O | O | O |
 
 ### adapter : 외부 통신 모듈
 
@@ -102,9 +113,9 @@
 - JPA / Kafka Producer / Http 통신 등이 해당 된다.
 ```
 
-| | app | adapter | core | support | domain |
-|-------------|---|---|------|---------|--------|
-| 사용가능한 모듈 여부 | - | - | - | O | O |
+| | app | adapter | core | event | support | domain |
+|-------------|-----|---------|------|-------|---------|--------|
+| 사용가능한 모듈 여부 | -  | -  | - | O  | O | O |
 
 ### app : 요청 Receive 모듈
 
@@ -113,6 +124,6 @@
 - Web Controller / Kafka Consumer 등이 해당 된다.
 ```
 
-| | app | adapter | core | support | domain |
-|-------------|---|---|------|---------|--------|
-| 사용가능한 모듈 여부 | - | - | O | O | O |
+| | app | adapter | core | event | support | domain |
+|-------------|-----|---------|------|-------|---------|--------|
+| 사용가능한 모듈 여부 | -  | -  | O | O  | O | O |

adapter/firebase/src/main/kotlin/com/xorker/draw/firebase/FcmService.kt

@@ -5,7 +5,6 @@ import com.google.firebase.messaging.Message
 import com.google.firebase.messaging.Notification
 import com.xorker.draw.i18n.MessageService
 import com.xorker.draw.notification.PushMessageUseCase
-import com.xorker.draw.websocket.WaitingQueueSession
 import java.util.Locale
 import org.springframework.stereotype.Service
 
@@ -14,11 +13,7 @@ class FcmService(
  private val messageService: MessageService,
 ) : PushMessageUseCase {
 
- override fun quickStart(session: WaitingQueueSession) {
- quickStart(session.locale, session.user.name)
- }
-
- fun quickStart(localeStr: String, nickname: String) {
+ override fun quickStart(localeStr: String, nickname: String) {
  val locale = Locale(localeStr)
 
  val notification = Notification.builder()

adapter/memory/src/main/kotlin/com/xorker/draw/mafia/MafiaGameAdapter.kt

@@ -1,63 +0,0 @@
-package com.xorker.draw.mafia
-
-import com.xorker.draw.room.Room
-import com.xorker.draw.room.RoomId
-import com.xorker.draw.room.RoomRepository
-import com.xorker.draw.support.metric.MetricManager
-import com.xorker.draw.user.UserId
-import java.util.concurrent.ConcurrentHashMap
-import org.springframework.stereotype.Component
-
-@Component
-internal class MafiaGameAdapter(
- private val metricManager: MetricManager,
-) : MafiaGameRepository, RoomRepository {
- private val data = ConcurrentHashMap<RoomId, MafiaGameInfo>()
- private val userData = ConcurrentHashMap<UserId, RoomId>()
-
- override fun saveGameInfo(gameInfo: MafiaGameInfo) {
- val room = gameInfo.room
- if (room.isEmpty()) {
- removeGameInfo(gameInfo)
- } else {
- if (data.containsKey(room.id).not()) {
- metricManager.increaseGameCount()
- }
- data[room.id] = gameInfo
- room.players.forEach {
- userData[it.userId] = room.id
- }
- }
- }
-
- override fun removeGameInfo(gameInfo: MafiaGameInfo) {
- metricManager.decreaseGameCount()
- gameInfo.room.players
- .map { it.userId }
- .forEach { removePlayer(it) }
-
- val phase = gameInfo.phase
- if (phase is MafiaPhaseWithTimer) {
- phase.job.cancel()
- }
-
- data.remove(gameInfo.room.id)
- }
-
- override fun getGameInfo(roomId: RoomId): MafiaGameInfo? {
- return data[roomId]
- }
-
- override fun getRoom(roomId: RoomId): Room<MafiaPlayer>? {
- return data[roomId]?.room
- }
-
- override fun getGameInfo(userId: UserId): MafiaGameInfo? {
- val roomId = userData[userId] ?: return null
- return data[roomId]
- }
-
- override fun removePlayer(userId: UserId) {
- userData.remove(userId)
- }
-}

adapter/memory/src/main/kotlin/com/xorker/draw/mafia/MafiaGameWaitingQueueAdapter.kt

@@ -1,48 +1,31 @@
 package com.xorker.draw.mafia
 
 import com.xorker.draw.exception.UnSupportedException
-import com.xorker.draw.mafia.event.MafiaGameRandomMatchingEvent
-import com.xorker.draw.notification.PushMessageUseCase
-import com.xorker.draw.websocket.WaitingQueueSession
+import com.xorker.draw.user.User
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentLinkedQueue
-import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Component
 
 @Component
-internal class MafiaGameWaitingQueueAdapter(
- private val eventPublisher: ApplicationEventPublisher,
- private val pushMessageUseCase: PushMessageUseCase,
-) : MafiaGameWaitingQueueRepository {
- private val waitingQueue: ConcurrentHashMap<String, ConcurrentLinkedQueue<WaitingQueueSession>> = ConcurrentHashMap()
+internal class MafiaGameWaitingQueueAdapter : MafiaGameWaitingQueueRepository {
+ private val waitingQueue: ConcurrentHashMap<String, ConcurrentLinkedQueue<User>> = ConcurrentHashMap()
 
- override fun enqueue(size: Int, session: WaitingQueueSession) {
- val queue = waitingQueue.getOrPut(session.locale) { ConcurrentLinkedQueue() }
-
- queue.add(session)
-
- synchronized(this) {
- if (queue.size >= size) {
- val players = mutableListOf<WaitingQueueSession>()
+ override fun size(locale: String): Int {
+ return waitingQueue[locale]?.size ?: 0
+ }
 
- (0 until size).forEach { _ ->
- queue.poll().let {
- players.add(it)
- }
- }
+ override fun enqueue(user: User, locale: String) {
+ val queue = waitingQueue.getOrPut(locale) { ConcurrentLinkedQueue() }
+ queue.add(user)
+ }
 
- val event = MafiaGameRandomMatchingEvent(players)
+ override fun dequeue(locale: String): User {
+ val queue = waitingQueue[locale] ?: throw UnSupportedException
 
- eventPublisher.publishEvent(event)
- } else {
- pushMessageUseCase.quickStart(session)
- }
- }
+ return queue.poll()
  }
 
- override fun dequeue(session: WaitingQueueSession) {
- val queue = waitingQueue[session.locale] ?: throw UnSupportedException
-
- queue.remove(session)
+ override fun remove(user: User, locale: String) {
+ waitingQueue[locale]?.remove(user)
  }
 }

adapter/memory/src/main/kotlin/com/xorker/draw/timer/TimerAdapter.kt

@@ -1,34 +1,45 @@
 package com.xorker.draw.timer
 
+import com.xorker.draw.exception.UnSupportedException
 import com.xorker.draw.mafia.event.JobWithStartTime
+import com.xorker.draw.room.RoomId
 import java.time.Duration
+import java.time.LocalDateTime
+import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Component
 
 @Component
-internal class TimerAdapter(
- private val eventPublisher: ApplicationEventPublisher,
-) : TimerRepository {
+internal class TimerAdapter : TimerRepository {
+ private val jobs = ConcurrentHashMap<RoomId, JobWithStartTime>()
 
- override fun <T : Any> startTimer(interval: Duration, event: T): JobWithStartTime {
+ override fun startTimer(roomId: RoomId, interval: Duration, callback: () -> Unit): JobWithStartTime {
  val job = JobWithStartTime()
- CoroutineScope(Dispatchers.IO + job).launch {
- delay(interval.toMillis())
- eventPublisher.publishEvent(event)
- }
- return job
- }
 
- override fun startTimer(interval: Duration, callback: () -> Unit): JobWithStartTime {
- val job = JobWithStartTime()
+  saveJob(roomId, job)
+
  CoroutineScope(Dispatchers.IO + job).launch {
  delay(interval.toMillis())
  callback.invoke()
  }
  return job
  }
+
+ override fun cancelTimer(roomId: RoomId) {
+ jobs[roomId]?.cancel()
+ jobs.remove(roomId)
+ }
+
+ override fun getTimerStartTime(roomId: RoomId): LocalDateTime {
+ val job = jobs[roomId] ?: throw UnSupportedException
+
+ return job.startTime
+ }
+
+ private fun saveJob(roomId: RoomId, job: JobWithStartTime) {
+ jobs[roomId] = job
+ }
 }

adapter/redis/build.gradle.kts

@@ -0,0 +1,17 @@
+import org.springframework.boot.gradle.tasks.bundling.BootJar
+
+plugins {
+ kotlin("plugin.spring")
+}
+
+dependencies {
+ implementation(project(":domain"))
+ implementation(project(":support:metric"))
+
+ implementation("org.springframework.boot:spring-boot-starter-data-redis:${Versions.SPRING_BOOT}")
+}
+
+tasks {
+ withType<Jar> { enabled = true }
+ withType<BootJar> { enabled = false }
+}