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 index 8124678d..abd0e471 100644 --- 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/infra/src/main/kotlin/com/backgu/amaker/infra/redis/workspace/dto/WorkspaceSessionRedisData.kt b/infra/src/main/kotlin/com/backgu/amaker/infra/redis/workspace/dto/WorkspaceSessionRedisData.kt index bf822bb3..89d53446 100644 --- a/infra/src/main/kotlin/com/backgu/amaker/infra/redis/workspace/dto/WorkspaceSessionRedisData.kt +++ b/infra/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 deleted file mode 100644 index ce7133c3..00000000 --- a/realtime/src/main/kotlin/com/backgu/amaker/realtime/config/RestClientConfig.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.backgu.amaker.realtime.config - -import com.backgu.amaker.common.http.RestClientAspect -import com.backgu.amaker.realtime.orchestration.config.OrchestrationConfig -import com.backgu.amaker.realtime.orchestration.infra.OrchestrationClient -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration -import org.springframework.web.client.RestClient -import org.springframework.web.client.support.RestClientAdapter -import org.springframework.web.service.invoker.HttpServiceProxyFactory - -@Configuration -class RestClientConfig { - @Bean - fun restClientAspect() = RestClientAspect() - - @Bean - fun orchestrationClient(orchestrationConfig: OrchestrationConfig): OrchestrationClient { - val restClient = RestClient.builder().baseUrl(orchestrationConfig.baseUrl).build() - val adapter = RestClientAdapter.create(restClient) - val factory = HttpServiceProxyFactory.builderFor(adapter).build() - - return factory.createClient(OrchestrationClient::class.java) - } -} diff --git a/realtime/src/main/kotlin/com/backgu/amaker/realtime/workspace/session/WorkspaceWebSocketSession.kt b/realtime/src/main/kotlin/com/backgu/amaker/realtime/workspace/session/WorkspaceWebSocketSession.kt index 7e471c18..986823e5 100644 --- a/realtime/src/main/kotlin/com/backgu/amaker/realtime/workspace/session/WorkspaceWebSocketSession.kt +++ b/realtime/src/main/kotlin/com/backgu/amaker/realtime/workspace/session/WorkspaceWebSocketSession.kt @@ -6,7 +6,7 @@ class WorkspaceWebSocketSession( 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 index 723711fc..d457cb24 100644 --- 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,6 +14,7 @@ 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(session, USER_ID) @@ -21,7 +22,7 @@ class WebSocketSessionHandler( 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/realtime/src/test/kotlin/com/backgu/amaker/realtime/workspace/repository/WorkspaceSessionRepositoryTest.kt b/realtime/src/test/kotlin/com/backgu/amaker/realtime/workspace/repository/WorkspaceSessionRepositoryTest.kt index 1a38eae1..6206b320 100644 --- a/realtime/src/test/kotlin/com/backgu/amaker/realtime/workspace/repository/WorkspaceSessionRepositoryTest.kt +++ b/realtime/src/test/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)