Add EventCache for efficient retrieval of event groups and teams

Signed-off-by: Chaoscaot <max@maxsp.de>

WebsiteBackend/src/de/steamwar/routes/EventFights.kt

@@ -20,7 +20,9 @@
 package de.steamwar.routes
 
 import de.steamwar.ResponseError
+import de.steamwar.data.EventCache
 import de.steamwar.sql.*
+import de.steamwar.sql.internal.useDb
 import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.request.*
@@ -41,19 +43,55 @@ data class ResponseEventFight(
     val ergebnis: Int,
     val spectatePort: Int?,
     val group: ResponseGroups?,
-    val hasFinished: Boolean
+    val hasFinished: Boolean,
+    val fightData: FightData? = null
 ) {
-    constructor(eventFight: EventFight) : this(
+    constructor(eventFight: EventFight, cache: EventCache = EventCache()) : this(
         eventFight.fightID,
         eventFight.spielmodus,
         eventFight.map,
-        ResponseTeam(Team.byId(eventFight.teamBlue)),
-        ResponseTeam(Team.byId(eventFight.teamRed)),
+        cache.getTeam(eventFight.teamBlue),
+        cache.getTeam(eventFight.teamRed),
         eventFight.startTime.time,
         eventFight.ergebnis,
         eventFight.spectatePort,
-        eventFight.group.orElse(null)?.let { ResponseGroups(it, short = true) },
-        eventFight.hasFinished()
+        eventFight.groupId?.let { cache.getGroup(it.value) },
+        eventFight.hasFinished(),
+        eventFight.fight?.let { FightData(Fight.getById(it)) }
+    )
+}
+
+@Serializable
+data class FightData(
+    val id: Int,
+    val gamemode: String,
+    val server: String,
+    val start: Long,
+    val duration: Int,
+    val blueLeader: ResponseUser,
+    val redLeader: ResponseUser,
+    val blueSchem: String?,
+    val redSchem: String?,
+    val win: String,
+    val winCondition: String,
+
+    val bluePlayers: List<ResponseUser>,
+    val redPlayers: List<ResponseUser>,
+) {
+    constructor(fight: Fight) : this(
+        fight.id.value,
+        fight.gameMode,
+        fight.server,
+        fight.startTime.time,
+        fight.duration,
+        ResponseUser.get(fight.blueLeader),
+        ResponseUser.get(fight.redLeader),
+        fight.blueSchem?.let { SchematicNode.getSchematicNode(it.value)?.name },
+        fight.redSchem?.let { SchematicNode.getSchematicNode(it.value)?.name },
+        fight.winner.name,
+        fight.winCondition,
+        fight.bluePlayers.map { ResponseUser.get(it.userID) },
+        fight.redPlayers.map { ResponseUser.get(it.userID) },
     )
 }
 

WebsiteBackend/src/de/steamwar/routes/Events.kt

@@ -20,6 +20,7 @@
 package de.steamwar.routes
 
 import de.steamwar.ResponseError
+import de.steamwar.data.EventCache
 import de.steamwar.plugins.SWPermissionCheck
 import de.steamwar.sql.*
 import de.steamwar.sql.EventGroup.EventGroupType
@@ -113,10 +114,10 @@ data class ExtendedResponseEvent(
     val referees: List<ResponseUser>,
     val relations: List<ResponseRelation>
 ) {
-    constructor(event: Event) : this(
+    constructor(event: Event, cache: EventCache = EventCache()) : this(
         ResponseEvent(event),
-        TeamTeilnahme.getTeams(event.eventID).map { ResponseTeam(it) },
-        EventGroup.get(event).map { ResponseGroups(it) },
+        TeamTeilnahme.getTeams(event.eventID).map { cache.convertTeam(it) },
+        EventGroup.get(event).map { cache.convertGroup(it) },
         EventFight.getEvent(event.eventID).map { ResponseEventFight(it) },
         Referee.get(event.eventID).map { ResponseUser.get(SteamwarUser.byId(it)!!) },
         EventRelation.get(event).map { ResponseRelation(it) }