Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Sort fights by start time in descending order and refactor saveFromStream method to use useDb block.

Browse Source 
Signed-off-by: Chaoscaot <max@maxsp.de>
This commit is contained in:
Chaoscaot
2025-11-10 12:24:51 +01:00
parent 990a03ca6c
commit 7e5a13989b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CommonCore/SQL/src/de/steamwar/sql/Fight.kt
+2 -1
View File
@@ -22,6 +22,7 @@ package de.steamwar.sql
import de.steamwar.sql.internal.useDb import de.steamwar.sql.internal.useDb
import org.jetbrains.exposed.v1.core.IntegerColumnType import org.jetbrains.exposed.v1.core.IntegerColumnType
import org.jetbrains.exposed.v1.core.ReferenceOption 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.EntityID
import org.jetbrains.exposed.v1.core.dao.id.IntIdTable import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
import org.jetbrains.exposed.v1.core.eq import org.jetbrains.exposed.v1.core.eq
@@ -80,7 +81,7 @@ class Fight(id: EntityID<Int>) : IntEntity(id) {
@JvmStatic @JvmStatic
fun getPage(page: Int, pageSize: Int): List<Fight> = useDb { fun getPage(page: Int, pageSize: Int): List<Fight> = 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 }) val fightPlayer = FightPlayer.batchGet(fights.map { it.id.value })
for (fight in fights) { for (fight in fights) {
CommonCore/SQL/src/de/steamwar/sql/NodeData.kt
+1 -1
View File
@@ -74,7 +74,7 @@ class NodeData(id: EntityID<CompositeID>): CompositeEntity(id) {
} }
@JvmStatic @JvmStatic
fun saveFromStream(node: SchematicNode, blob: InputStream, format: SchematicFormat) { fun saveFromStream(node: SchematicNode, blob: InputStream, format: SchematicFormat) = useDb {
NodeDataTable.insertIgnore { NodeDataTable.insertIgnore {
it[NodeDataTable.nodeId] = EntityID(node.getId(), SchematicNodeTable) it[NodeDataTable.nodeId] = EntityID(node.getId(), SchematicNodeTable)
it[NodeDataTable.nodeFormat] = format it[NodeDataTable.nodeFormat] = format