forked from SteamWar/SteamWar
Remove Event-related SQL classes and update relevant references across modules
Signed-off-by: Chaoscaot <max@maxsp.de>
This commit is contained in:
@@ -51,7 +51,7 @@ data class ResponseGroups(
|
||||
val points: Map<Int, Int>
|
||||
) {
|
||||
constructor(group: EventGroup, short: Boolean = false) : this(
|
||||
group.id,
|
||||
group.getId(),
|
||||
group.name,
|
||||
group.pointsPerWin,
|
||||
group.pointsPerLoss,
|
||||
@@ -71,12 +71,12 @@ data class ResponseRelation(
|
||||
val fromPlace: Int
|
||||
) {
|
||||
constructor(relation: EventRelation) : this(
|
||||
relation.id,
|
||||
relation.getId(),
|
||||
relation.fightId,
|
||||
relation.fightTeam,
|
||||
relation.fromType,
|
||||
relation.fromFight.map { ResponseEventFight(it) }.orElse(null),
|
||||
relation.fromGroup.map { ResponseGroups(it) }.orElse(null),
|
||||
relation.fromFight?.let { ResponseEventFight(it) },
|
||||
relation.fromGroup?.let { ResponseGroups(it) },
|
||||
relation.fromPlace
|
||||
)
|
||||
}
|
||||
@@ -118,7 +118,7 @@ data class ExtendedResponseEvent(
|
||||
TeamTeilnahme.getTeams(event.eventID).map { ResponseTeam(it) },
|
||||
EventGroup.get(event).map { ResponseGroups(it) },
|
||||
EventFight.getEvent(event.eventID).map { ResponseEventFight(it) },
|
||||
Referee.get(event.eventID).map { ResponseUser(SteamwarUser.byId(it)!!) },
|
||||
Referee.get(event.eventID).map { ResponseUser.get(SteamwarUser.byId(it)!!) },
|
||||
EventRelation.get(event).map { ResponseRelation(it) }
|
||||
)
|
||||
}
|
||||
@@ -176,8 +176,8 @@ fun Route.configureEventsRoute() {
|
||||
csv.append(arrayOf("Start", "BlueTeam", "RedTeam", "WinnerTeam", "Group").joinToString(","))
|
||||
fights.forEach {
|
||||
csv.appendLine()
|
||||
val blue = Team.get(it.teamBlue)
|
||||
val red = Team.get(it.teamRed)
|
||||
val blue = Team.byId(it.teamBlue)
|
||||
val red = Team.byId(it.teamRed)
|
||||
val winner = when (it.ergebnis) {
|
||||
1 -> blue.teamName
|
||||
2 -> red.teamName
|
||||
@@ -187,8 +187,8 @@ fun Route.configureEventsRoute() {
|
||||
csv.append(
|
||||
arrayOf(
|
||||
it.startTime.toString(),
|
||||
Team.get(it.teamBlue).teamName,
|
||||
Team.get(it.teamRed).teamName,
|
||||
Team.byId(it.teamBlue).teamName,
|
||||
Team.byId(it.teamRed).teamName,
|
||||
winner,
|
||||
it.group.map { it.name }.orElse("Ungrouped")
|
||||
).joinToString(",")
|
||||
|
||||
Reference in New Issue
Block a user