forked from SteamWar/SteamWar
Sort fights by start time in descending order and refactor saveFromStream method to use useDb block.
Signed-off-by: Chaoscaot <max@maxsp.de>
This commit is contained in:
@@ -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<Int>) : IntEntity(id) {
|
||||
|
||||
@JvmStatic
|
||||
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 })
|
||||
for (fight in fights) {
|
||||
|
||||
@@ -74,7 +74,7 @@ class NodeData(id: EntityID<CompositeID>): 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
|
||||
|
||||
Reference in New Issue
Block a user