Rename server name to id

FAForever · Oct 30, 2023 · 29f1f56 · 29f1f56
1 parent 4d5cc4c
commit 29f1f56
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/main/kotlin/com/faforever/icebreaker/service/Server.kt b/src/main/kotlin/com/faforever/icebreaker/service/Server.kt
@@ -1,6 +1,6 @@
 package com.faforever.icebreaker.service
 
 data class Server(
-    val name: String,
+    val id: String,
     val region: String,
 )
diff --git a/src/main/kotlin/com/faforever/icebreaker/service/coturn/CoturnSessionHandler.kt b/src/main/kotlin/com/faforever/icebreaker/service/coturn/CoturnSessionHandler.kt
@@ -27,7 +27,7 @@ class CoturnSessionHandler(
     }
 
     override fun getIceServers() =
-        coturnServerRepository.findActive().map { Server(name = it.host, region = it.region) }
+        coturnServerRepository.findActive().map { Server(id = it.host, region = it.region) }
 
     override fun getIceServersSession(sessionId: String): List<Session.Server> =
         coturnServerRepository.findActive()

diff --git a/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysSessionHandler.kt b/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysSessionHandler.kt
@@ -78,7 +78,7 @@ class XirsysSessionHandler(
             is XirsysResponse.Success -> result.data
         }
 
-    override fun getIceServers() = listOf(Server(name = SERVER_NAME, region = "Global"))
+    override fun getIceServers() = listOf(Server(id = SERVER_NAME, region = "Global"))
 
     override fun getIceServersSession(sessionId: String): List<Session.Server> =
         when (

diff --git a/src/main/kotlin/com/faforever/icebreaker/web/ServerController.kt b/src/main/kotlin/com/faforever/icebreaker/web/ServerController.kt
@@ -26,7 +26,7 @@ class ServerController(private val sessionService: SessionService) {
         sessionService.getServers().map {
             JsonApiObject(
                 type = "iceServer",
-                id = it.name,
+                id = it.id,
                 attributes = mapOf("region" to it.region),
             )
         },