From 7e5a13989b85340ee1f9220d2db619cc00630263 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Mon, 10 Nov 2025 12:24:51 +0100 Subject: [PATCH] Sort fights by start time in descending order and refactor `saveFromStream` method to use `useDb` block. Signed-off-by: Chaoscaot --- CommonCore/SQL/src/de/steamwar/sql/Fight.kt | 3 ++- CommonCore/SQL/src/de/steamwar/sql/NodeData.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CommonCore/SQL/src/de/steamwar/sql/Fight.kt b/CommonCore/SQL/src/de/steamwar/sql/Fight.kt index 9ea72b35..72c14d77 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/Fight.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/Fight.kt @@ -22,6 +22,7 @@ package de.steamwar.sql import de.steamwar.sql.internal.useDb import org.jetbrains.exposed.v1.core.IntegerColumnType import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.core.SortOrder import org.jetbrains.exposed.v1.core.dao.id.EntityID import org.jetbrains.exposed.v1.core.dao.id.IntIdTable import org.jetbrains.exposed.v1.core.eq @@ -80,7 +81,7 @@ class Fight(id: EntityID) : IntEntity(id) { @JvmStatic fun getPage(page: Int, pageSize: Int): List = useDb { - val fights = all().limit(pageSize).offset((pageSize * page).toLong()) + val fights = all().orderBy(FightTable.startTime to SortOrder.DESC).limit(pageSize).offset((pageSize * page).toLong()) val fightPlayer = FightPlayer.batchGet(fights.map { it.id.value }) for (fight in fights) { diff --git a/CommonCore/SQL/src/de/steamwar/sql/NodeData.kt b/CommonCore/SQL/src/de/steamwar/sql/NodeData.kt index fd9a2446..f9f6fff8 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/NodeData.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/NodeData.kt @@ -74,7 +74,7 @@ class NodeData(id: EntityID): CompositeEntity(id) { } @JvmStatic - fun saveFromStream(node: SchematicNode, blob: InputStream, format: SchematicFormat) { + fun saveFromStream(node: SchematicNode, blob: InputStream, format: SchematicFormat) = useDb { NodeDataTable.insertIgnore { it[NodeDataTable.nodeId] = EntityID(node.getId(), SchematicNodeTable) it[NodeDataTable.nodeFormat] = format