fix: 기존의 등록 로직 제거

soma-baekgu · Aug 7, 2024 · 9ee7b6b · 9ee7b6b
1 parent 410778f
commit 9ee7b6b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 32 deletions.
diff --git a/domain/src/main/kotlin/com/backgu/amaker/domain/workspace/WorkspaceSession.kt b/domain/src/main/kotlin/com/backgu/amaker/domain/workspace/WorkspaceSession.kt
@@ -9,5 +9,5 @@ data class WorkspaceSession
         @JsonProperty("id") val id: String,
         @JsonProperty("userId") val userId: String,
         @JsonProperty("workspaceId") val workspaceId: Long,
-        @JsonProperty("realtimeId") val realtimeId: Long,
+        @JsonProperty("realtimeId") val realtimeId: String,
     )
diff --git a/.../src/main/kotlin/com/backgu/amaker/infra/redis/workspace/dto/WorkspaceSessionRedisData.kt b/.../src/main/kotlin/com/backgu/amaker/infra/redis/workspace/dto/WorkspaceSessionRedisData.kt
@@ -10,7 +10,7 @@ data class WorkspaceSessionRedisData
         @JsonProperty("id") val id: String,
         @JsonProperty("userId") val userId: String,
         @JsonProperty("workspaceId") val workspaceId: Long,
-        @JsonProperty("realtimeId") val realtimeId: Long,
+        @JsonProperty("realtimeId") val realtimeId: String,
     ) {
         companion object {
             fun of(workspaceSession: WorkspaceSession) =

diff --git a/realtime/src/main/kotlin/com/backgu/amaker/realtime/config/RestClientConfig.kt b/realtime/src/main/kotlin/com/backgu/amaker/realtime/config/RestClientConfig.kt
diff --git a/...src/main/kotlin/com/backgu/amaker/realtime/workspace/session/WorkspaceWebSocketSession.kt b/...src/main/kotlin/com/backgu/amaker/realtime/workspace/session/WorkspaceWebSocketSession.kt
@@ -6,7 +6,7 @@ class WorkspaceWebSocketSession<T>(
     val id: String,
     val userId: String,
     val workspaceId: Long,
-    val realTimeId: Long,
+    val realTimeId: String,
     val session: T,
 ) {
     fun toDomain() = WorkspaceSession(id, userId, workspaceId, realTimeId)

diff --git a/realtime/src/main/kotlin/com/backgu/amaker/realtime/ws/handler/WebSocketSessionHandler.kt b/realtime/src/main/kotlin/com/backgu/amaker/realtime/ws/handler/WebSocketSessionHandler.kt
@@ -1,6 +1,6 @@
 package com.backgu.amaker.realtime.ws.handler
 
-import com.backgu.amaker.realtime.orchestration.ServerRegister
+import com.backgu.amaker.realtime.server.config.ServerConfig
 import com.backgu.amaker.realtime.utils.WebSocketSessionUtils
 import com.backgu.amaker.realtime.workspace.service.WorkspaceSessionFacadeService
 import com.backgu.amaker.realtime.workspace.session.WorkspaceWebSocketSession
@@ -14,14 +14,15 @@ import org.springframework.web.socket.handler.TextWebSocketHandler
 @Component
 class WebSocketSessionHandler(
     private val workspaceSessionFacadeService: WorkspaceSessionFacadeService,
+    private val serverConfig: ServerConfig,
 ) : TextWebSocketHandler() {
     override fun afterConnectionEstablished(session: WebSocketSession) {
         val userId: String = WebSocketSessionUtils.extractAttribute<String>(session, USER_ID)
         val workspaceId = WebSocketSessionUtils.extractAttribute<Long>(session, WORKSPACE_ID)
         workspaceSessionFacadeService.enrollUserToWorkspaceSession(
             userId,
             workspaceId,
-            WorkspaceWebSocketSession(session.id, userId, workspaceId, ServerRegister.serverId, session),
+            WorkspaceWebSocketSession(session.id, userId, workspaceId, serverConfig.id, session),
         )
     }
 
@@ -35,7 +36,7 @@ class WebSocketSessionHandler(
         workspaceSessionFacadeService.dropOutWorkspaceSession(
             userId,
             workspaceId,
-            WorkspaceWebSocketSession(session.id, userId, workspaceId, ServerRegister.serverId, session),
+            WorkspaceWebSocketSession(session.id, userId, workspaceId, serverConfig.id, session),
         )
     }
 }
diff --git a/.../kotlin/com/backgu/amaker/realtime/workspace/repository/WorkspaceSessionRepositoryTest.kt b/.../kotlin/com/backgu/amaker/realtime/workspace/repository/WorkspaceSessionRepositoryTest.kt
@@ -24,7 +24,7 @@ class WorkspaceSessionRepositoryTest : IntegrationTest() {
     fun addWorkspaceSessionTest() {
         // given
         val workspaceId = 1L
-        val workspaceSession = WorkspaceSession(UUID.randomUUID().toString(), "userId", workspaceId, 1)
+        val workspaceSession = WorkspaceSession(UUID.randomUUID().toString(), "userId", workspaceId, "1")
 
         // when
         workspaceSessionRepository.addWorkspaceSession(workspaceId, workspaceSession)