From 3f06845ac43e52883693ba066856feafc81864a8 Mon Sep 17 00:00:00 2001
From: Kenneth Endfinger <kaendfinger@gmail.com>
Date: Sat, 8 Jan 2022 16:34:13 -0500
Subject: [PATCH] Gjallarhorn: Use Player Position Changelog in Player Position
 Export

---
 .../commands/PlayerPositionExport.kt            | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/tool-gjallarhorn/src/main/kotlin/cloud/kubelet/foundation/gjallarhorn/commands/PlayerPositionExport.kt b/tool-gjallarhorn/src/main/kotlin/cloud/kubelet/foundation/gjallarhorn/commands/PlayerPositionExport.kt
index 5ff4df0..30ea6cc 100644
--- a/tool-gjallarhorn/src/main/kotlin/cloud/kubelet/foundation/gjallarhorn/commands/PlayerPositionExport.kt
+++ b/tool-gjallarhorn/src/main/kotlin/cloud/kubelet/foundation/gjallarhorn/commands/PlayerPositionExport.kt
@@ -1,5 +1,6 @@
 package cloud.kubelet.foundation.gjallarhorn.commands
 
+import cloud.kubelet.foundation.gjallarhorn.state.PlayerPositionChangelog
 import cloud.kubelet.foundation.gjallarhorn.util.compose
 import cloud.kubelet.foundation.heimdall.table.PlayerPositionTable
 import com.github.ajalt.clikt.core.CliktCommand
@@ -10,7 +11,6 @@ import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.greaterEq
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.lessEq
 import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
 import java.time.Instant
 import java.util.*
@@ -32,17 +32,10 @@ class PlayerPositionExport : CliktCommand(name = "export-player-positions", help
 
     println("time,player,world,x,y,z,pitch,yaw")
     transaction(db) {
-      PlayerPositionTable.select(filter).orderBy(PlayerPositionTable.time).forEach { row ->
-        val time = row[PlayerPositionTable.time]
-        val player = row[PlayerPositionTable.player]
-        val world = row[PlayerPositionTable.world]
-        val x = row[PlayerPositionTable.x]
-        val y = row[PlayerPositionTable.y]
-        val z = row[PlayerPositionTable.z]
-        val pitch = row[PlayerPositionTable.pitch]
-        val yaw = row[PlayerPositionTable.yaw]
-
-        println("${time},${player},${world},${x},${y},${z},${pitch},${yaw}")
+      PlayerPositionChangelog.query(db, filter).changes.forEach { change ->
+        change.apply {
+          println("${time},${player},${world},${x},${y},${z},${pitch},${yaw}")
+        }
       }
     }
   }