refactor: Extract database models to own modules

16 files changed, 52 insertions, 328 deletions

diff --git a/mod/build.gradle.kts b/mod/build.gradle.kts
index a989fa5..0ad4aa6 100644
--- a/mod/build.gradle.kts
+++ b/mod/build.gradle.kts
@@ -66,7 +66,7 @@ dependencies {
 	shadowImpl("org.notenoughupdates.moulconfig:legacy:3.0.0-beta.9")
 	shadowImpl("io.azam.ulidj:ulidj:1.0.4")
 	shadowImpl(project(":dependency-injection"))
-	shadowImpl(project(":database:core"))
+	shadowImpl(project(":database:impl"))
 	shadowImpl("moe.nea:libautoupdate:1.3.1") {
 		exclude(module = "gson")
 	}
diff --git a/mod/src/main/kotlin/moe/nea/ledger/ItemChange.kt b/mod/src/main/kotlin/moe/nea/ledger/ItemChange.kt
deleted file mode 100644
index fda709c..0000000
--- a/mod/src/main/kotlin/moe/nea/ledger/ItemChange.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package moe.nea.ledger
-
-import moe.nea.ledger.database.DBItemEntry
-import moe.nea.ledger.database.ResultRow
-import net.minecraft.event.HoverEvent
-import net.minecraft.util.ChatComponentText
-import net.minecraft.util.ChatStyle
-import net.minecraft.util.EnumChatFormatting
-import net.minecraft.util.IChatComponent
-
-data class ItemChange(
-	val itemId: ItemId,
-	val count: Double,
-	val direction: ChangeDirection,
-) {
-	fun formatChat(): IChatComponent {
-		return ChatComponentText(" ")
-			.appendSibling(direction.chatFormat)
-			.appendText(" ")
-			.appendSibling(ChatComponentText("$count").setChatStyle(ChatStyle().setColor(EnumChatFormatting.WHITE)))
-			.appendSibling(ChatComponentText("x").setChatStyle(ChatStyle().setColor(EnumChatFormatting.DARK_GRAY)))
-			.appendText(" ")
-			.appendSibling(ChatComponentText(itemId.string).setChatStyle(ChatStyle().setParentStyle(ChatStyle().setColor(
-				EnumChatFormatting.WHITE))))
-	}
-
-	enum class ChangeDirection {
-		GAINED,
-		TRANSFORM,
-		SYNC,
-		CATALYST,
-		LOST;
-
-		val chatFormat by lazy { formatChat0() }
-		private fun formatChat0(): IChatComponent {
-			val (text, color) = when (this) {
-				GAINED -> "+" to EnumChatFormatting.GREEN
-				TRANSFORM -> "~" to EnumChatFormatting.YELLOW
-				SYNC -> "=" to EnumChatFormatting.BLUE
-				CATALYST -> "*" to EnumChatFormatting.DARK_PURPLE
-				LOST -> "-" to EnumChatFormatting.RED
-			}
-			return ChatComponentText(text)
-				.setChatStyle(
-					ChatStyle()
-						.setColor(color)
-						.setChatHoverEvent(HoverEvent(HoverEvent.Action.SHOW_TEXT,
-						                              ChatComponentText(name).setChatStyle(ChatStyle().setColor(color)))))
-		}
-	}
-
-	companion object {
-		fun gainCoins(number: Double): ItemChange {
-			return gain(ItemId.COINS, number)
-		}
-
-		fun unpair(direction: ChangeDirection, pair: Pair<ItemId, Double>): ItemChange {
-			return ItemChange(pair.first, pair.second, direction)
-		}
-
-		fun unpairGain(pair: Pair<ItemId, Double>) = unpair(ChangeDirection.GAINED, pair)
-		fun unpairLose(pair: Pair<ItemId, Double>) = unpair(ChangeDirection.LOST, pair)
-
-		fun gain(itemId: ItemId, amount: Number): ItemChange {
-			return ItemChange(itemId, amount.toDouble(), ChangeDirection.GAINED)
-		}
-
-		fun lose(itemId: ItemId, amount: Number): ItemChange {
-			return ItemChange(itemId, amount.toDouble(), ChangeDirection.LOST)
-		}
-
-		fun loseCoins(number: Double): ItemChange {
-			return lose(ItemId.COINS, number)
-		}
-
-		fun from(result: ResultRow): ItemChange {
-			return ItemChange(
-				result[DBItemEntry.itemId],
-				result[DBItemEntry.size],
-				result[DBItemEntry.mode],
-			)
-		}
-	}
-}
\ No newline at end of file
diff --git a/mod/src/main/kotlin/moe/nea/ledger/Ledger.kt b/mod/src/main/kotlin/moe/nea/ledger/Ledger.kt
index bc667e4..043b83e 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/Ledger.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/Ledger.kt
@@ -119,6 +119,7 @@ class Ledger {
 		di.registerSingleton(gson)
 		di.register(LedgerConfig::class.java, DIProvider { managedConfig.instance })
 		di.register(Config::class.java, DIProvider.fromInheritance(LedgerConfig::class.java))
+		di.register(Database::class.java, DIProvider { Database(dataFolder) })
 		di.registerInjectableClasses(
 			AccessorySwapperDetection::class.java,
 			AllowanceDetection::class.java,
@@ -129,7 +130,6 @@ class Ledger {
 			BitsDetection::class.java,
 			BitsShopDetection::class.java,
 			ConfigCommand::class.java,
-			Database::class.java,
 			DebugDataCommand::class.java,
 			DragonEyePlacementDetection::class.java,
 			DragonSacrificeDetection::class.java,
diff --git a/mod/src/main/kotlin/moe/nea/ledger/NumberUtil.kt b/mod/src/main/kotlin/moe/nea/ledger/NumberUtil.kt
index 438f342..fa295b0 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/NumberUtil.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/NumberUtil.kt
@@ -115,3 +115,38 @@ fun Instant.formatChat(): IChatComponent {
 			.setColor(EnumChatFormatting.AQUA))
 	return text
 }
+
+private val formatChatDirection = run {
+	fun ItemChange.ChangeDirection.formatChat0(): IChatComponent {
+		val (text, color) = when (this) {
+			ItemChange.ChangeDirection.GAINED -> "+" to EnumChatFormatting.GREEN
+			ItemChange.ChangeDirection.TRANSFORM -> "~" to EnumChatFormatting.YELLOW
+			ItemChange.ChangeDirection.SYNC -> "=" to EnumChatFormatting.BLUE
+			ItemChange.ChangeDirection.CATALYST -> "*" to EnumChatFormatting.DARK_PURPLE
+			ItemChange.ChangeDirection.LOST -> "-" to EnumChatFormatting.RED
+		}
+		return ChatComponentText(text)
+			.setChatStyle(
+				ChatStyle()
+					.setColor(color)
+					.setChatHoverEvent(HoverEvent(HoverEvent.Action.SHOW_TEXT,
+					                              ChatComponentText(name).setChatStyle(ChatStyle().setColor(color)))))
+	}
+	ItemChange.ChangeDirection.entries.associateWith { it.formatChat0() }
+}
+
+fun ItemChange.ChangeDirection.formatChat(): IChatComponent {
+	return formatChatDirection[this]!!
+}
+
+fun ItemChange.formatChat(): IChatComponent {
+	return ChatComponentText(" ")
+		.appendSibling(direction.formatChat())
+		.appendText(" ")
+		.appendSibling(ChatComponentText("$count").setChatStyle(ChatStyle().setColor(EnumChatFormatting.WHITE)))
+		.appendSibling(ChatComponentText("x").setChatStyle(ChatStyle().setColor(EnumChatFormatting.DARK_GRAY)))
+		.appendText(" ")
+		.appendSibling(ChatComponentText(itemId.string).setChatStyle(ChatStyle().setParentStyle(ChatStyle().setColor(
+			EnumChatFormatting.WHITE))))
+}
+
diff --git a/mod/src/main/kotlin/moe/nea/ledger/QueryCommand.kt b/mod/src/main/kotlin/moe/nea/ledger/QueryCommand.kt
index 19bd5d0..abdc13a 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/QueryCommand.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/QueryCommand.kt
@@ -103,7 +103,7 @@ class QueryCommand : CommandBase() {
 			val timestamp = transactionId.getTimestamp()
 			val items = DBItemEntry.selectAll(database.connection)
 				.where(Clause { column(DBItemEntry.transactionId) eq string(transactionId.wrapped) })
-				.map { ItemChange.from(it) }
+				.map { DBItemEntry.objMap(it) }
 			val text = ChatComponentText("")
 				.setChatStyle(ChatStyle().setColor(EnumChatFormatting.YELLOW))
 				.appendSibling(
diff --git a/mod/src/main/kotlin/moe/nea/ledger/TransactionType.kt b/mod/src/main/kotlin/moe/nea/ledger/TransactionType.kt
deleted file mode 100644
index 33c633d..0000000
--- a/mod/src/main/kotlin/moe/nea/ledger/TransactionType.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package moe.nea.ledger
-
-enum class TransactionType {
-	ACCESSORIES_SWAPPING,
-	ALLOWANCE_GAIN,
-	AUCTION_BOUGHT,
-	AUCTION_LISTING_CHARGE,
-	AUCTION_SOLD,
-	AUTOMERCHANT_PROFIT_COLLECT,
-	BANK_DEPOSIT,
-	BANK_WITHDRAW,
-	BAZAAR_BUY_INSTANT,
-	BAZAAR_BUY_ORDER,
-	BAZAAR_SELL_INSTANT,
-	BAZAAR_SELL_ORDER,
-	BITS_PURSE_STATUS,
-	BOOSTER_COOKIE_ATE,
-	CAPSAICIN_EYEDROPS_USED,
-	COMMUNITY_SHOP_BUY,
-	CORPSE_DESECRATED,
-	DIE_ROLLED,
-	DRACONIC_SACRIFICE,
-	DUNGEON_CHEST_OPEN,
-	FORGED,
-	GOD_POTION_DRANK,
-	GOD_POTION_MIXIN_DRANK,
-	KAT_TIMESKIP,
-	KAT_UPGRADE,
-	KISMET_REROLL,
-	KUUDRA_CHEST_OPEN,
-	NPC_BUY,
-	NPC_SELL,
-	VISITOR_BARGAIN,
-	WYRM_EVOKED,
-}
\ No newline at end of file
diff --git a/mod/src/main/kotlin/moe/nea/ledger/database/DBLogEntry.kt b/mod/src/main/kotlin/moe/nea/ledger/database/DBLogEntry.kt
deleted file mode 100644
index b162c6f..0000000
--- a/mod/src/main/kotlin/moe/nea/ledger/database/DBLogEntry.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package moe.nea.ledger.database
-
-import moe.nea.ledger.ItemChange
-import moe.nea.ledger.ItemId
-import moe.nea.ledger.TransactionType
-import moe.nea.ledger.database.columns.DBDouble
-import moe.nea.ledger.database.columns.DBEnum
-import moe.nea.ledger.database.columns.DBString
-import moe.nea.ledger.database.columns.DBUlid
-import moe.nea.ledger.database.columns.DBUuid
-
-object DBLogEntry : Table("LogEntry") {
-	val transactionId = column("transactionId", DBUlid)
-	val type = column("type", DBEnum<TransactionType>())
-	val profileId = column("profileId", DBUuid)
-	val playerId = column("playerId", DBUuid)
-}
-
-object DBItemEntry : Table("ItemEntry") {
-	val transactionId = column("transactionId", DBUlid) // TODO: add foreign keys
-	val mode = column("mode", DBEnum<ItemChange.ChangeDirection>())
-	val itemId = column("item", DBString.mapped(ItemId::string, ::ItemId))
-	val size = column("size", DBDouble)
-}
diff --git a/mod/src/main/kotlin/moe/nea/ledger/database/DBUpgrade.kt b/mod/src/main/kotlin/moe/nea/ledger/database/DBUpgrade.kt
deleted file mode 100644
index 7d1782a..0000000
--- a/mod/src/main/kotlin/moe/nea/ledger/database/DBUpgrade.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package moe.nea.ledger.database
-
-import java.sql.Connection
-
-interface DBUpgrade {
-	val toVersion: Long
-	val fromVersion get() = toVersion - 1
-	fun performUpgrade(connection: Connection)
-
-	companion object {
-
-		fun performUpgrades(
-			connection: Connection,
-			upgrades: Iterable<DBUpgrade>,
-		) {
-			for (upgrade in upgrades) {
-				upgrade.performUpgrade(connection)
-			}
-		}
-
-		fun performUpgradeChain(
-			connection: Connection,
-			from: Long, to: Long,
-			upgrades: Iterable<DBUpgrade>,
-			afterEach: (newVersion: Long) -> Unit,
-		) {
-			val table = buildLookup(upgrades)
-			for (version in (from + 1)..(to)) {
-				val currentUpgrades = table[version] ?: listOf()
-				println("Scheduled ${currentUpgrades.size} upgrades to reach DB version $version")
-				performUpgrades(connection, currentUpgrades)
-				afterEach(version)
-			}
-		}
-
-		fun buildLookup(upgrades: Iterable<DBUpgrade>): Map<Long, List<DBUpgrade>> {
-			return upgrades.groupBy { it.toVersion }
-		}
-
-		fun createTable(to: Long, table: Table, vararg columns: Column<*>): DBUpgrade {
-			require(columns.all { it in table.columns })
-			return of("Create table ${table}", to) {
-				table.createIfNotExists(it, columns.toList())
-			}
-		}
-
-		fun addColumns(to: Long, table: Table, vararg columns: Column<*>): DBUpgrade {
-			return of("Add columns to table $table", to) {
-				table.alterTableAddColumns(it, columns.toList())
-			}
-		}
-
-		fun of(name: String, to: Long, block: (Connection) -> Unit): DBUpgrade {
-			return object : DBUpgrade {
-				override val toVersion: Long
-					get() = to
-
-				override fun performUpgrade(connection: Connection) {
-					block(connection)
-				}
-
-				override fun toString(): String {
-					return name
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mod/src/main/kotlin/moe/nea/ledger/database/Database.kt b/mod/src/main/kotlin/moe/nea/ledger/database/Database.kt
deleted file mode 100644
index 025888c..0000000
--- a/mod/src/main/kotlin/moe/nea/ledger/database/Database.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package moe.nea.ledger.database
-
-import moe.nea.ledger.Ledger
-import moe.nea.ledger.database.columns.DBString
-import java.sql.Connection
-import java.sql.DriverManager
-
-class Database {
-	lateinit var connection: Connection
-
-	object MetaTable : Table("LedgerMeta") {
-		val key = column("key", DBString)
-		val value = column("value", DBString)
-
-		init {
-			unique(key)
-		}
-	}
-
-	data class MetaKey(val name: String) {
-		companion object {
-			val DATABASE_VERSION = MetaKey("databaseVersion")
-			val LAST_LAUNCH = MetaKey("lastLaunch")
-		}
-	}
-
-	fun setMetaKey(key: MetaKey, value: String) {
-		MetaTable.insert(connection, Table.OnConflict.REPLACE) {
-			it[MetaTable.key] = key.name
-			it[MetaTable.value] = value
-		}
-	}
-
-	val databaseVersion: Long = 1
-
-	fun loadAndUpgrade() {
-		connection = DriverManager.getConnection("jdbc:sqlite:${Ledger.dataFolder.resolve("database.db")}")
-		MetaTable.createIfNotExists(connection)
-		val meta = MetaTable.selectAll(connection).associate { MetaKey(it[MetaTable.key]) to it[MetaTable.value] }
-		val lastLaunch = meta[MetaKey.LAST_LAUNCH]?.toLong() ?: 0L
-		println("Last launch $lastLaunch")
-		setMetaKey(MetaKey.LAST_LAUNCH, System.currentTimeMillis().toString())
-
-		val oldVersion = meta[MetaKey.DATABASE_VERSION]?.toLong() ?: -1
-		println("Old Database Version: $oldVersion; Current version: $databaseVersion")
-		if (oldVersion > databaseVersion)
-			error("Outdated software. Database is newer than me!")
-		// TODO: create a backup if there is a db version upgrade happening
-		DBUpgrade.performUpgradeChain(
-			connection, oldVersion, databaseVersion,
-			Upgrades().upgrades
-		) { version ->
-			setMetaKey(MetaKey.DATABASE_VERSION, version.toString())
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mod/src/main/kotlin/moe/nea/ledger/database/Upgrades.kt b/mod/src/main/kotlin/moe/nea/ledger/database/Upgrades.kt
deleted file mode 100644
index e83abe7..0000000
--- a/mod/src/main/kotlin/moe/nea/ledger/database/Upgrades.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package moe.nea.ledger.database
-
-class Upgrades {
-	val upgrades = mutableListOf<DBUpgrade>()
-
-	fun add(upgrade: DBUpgrade) = upgrades.add(upgrade)
-
-	init {
-		add(DBUpgrade.createTable(
-			0, DBLogEntry,
-			DBLogEntry.type, DBLogEntry.playerId, DBLogEntry.profileId,
-			DBLogEntry.transactionId))
-		add(DBUpgrade.createTable(
-			0, DBItemEntry,
-			DBItemEntry.itemId, DBItemEntry.size, DBItemEntry.mode, DBItemEntry.transactionId
-		))
-	}
-
-
-}
\ No newline at end of file
diff --git a/mod/src/main/kotlin/moe/nea/ledger/database/schema.dot b/mod/src/main/kotlin/moe/nea/ledger/database/schema.dot
deleted file mode 100644
index d932f6a..0000000
--- a/mod/src/main/kotlin/moe/nea/ledger/database/schema.dot
+++ /dev/null
@@ -1,23 +0,0 @@
-digraph {
-    node [shape=plain];
-    rankdir=LR;
-    entry [label=<
-        <table border="0" cellborder="1" cellspacing="0">
-            <tr><td>Log Entry</td></tr>
-            <tr><td port="player">playerId</td></tr>
-            <tr><td port="profile">profileId</td></tr>
-            <tr><td port="date">timestamp</td></tr>
-            <tr><td port="type">Type</td></tr>
-        </table>
-    >];
-    item [label=<
-        <table border="0" cellborder="1" cellspacing="0">
-            <tr><td>Item Stack</td><tr>
-            <tr><td port="transaction">Transaction</td></tr>
-            <tr><td port="id">Item ID</td></tr>
-            <tr><td port="count">Count</td></tr>
-            <tr><td port="direction">Transfer Direction</td></tr>
-        </table>
-    >];
-//    item:transaction -> entry;
-}
\ No newline at end of file
diff --git a/mod/src/main/kotlin/moe/nea/ledger/modules/AccessorySwapperDetection.kt b/mod/src/main/kotlin/moe/nea/ledger/modules/AccessorySwapperDetection.kt
index 1c228ff..808ac5c 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/modules/AccessorySwapperDetection.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/modules/AccessorySwapperDetection.kt
@@ -22,9 +22,9 @@ class AccessorySwapperDetection {
         swapperUsed.useMatcher(event.message) {
             logger.logEntry(
                 LedgerEntry(
-                    TransactionType.ACCESSORIES_SWAPPING,
-                    event.timestamp,
-                    listOf(
+	                TransactionType.ACCESSORIES_SWAPPING,
+	                event.timestamp,
+	                listOf(
                         ItemChange.lose(ItemIds.TALISMAN_ENRICHMENT_SWAPPER, 1)
                     )
                 )
diff --git a/mod/src/main/kotlin/moe/nea/ledger/modules/BitsDetection.kt b/mod/src/main/kotlin/moe/nea/ledger/modules/BitsDetection.kt
index f0f5369..f6dad12 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/modules/BitsDetection.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/modules/BitsDetection.kt
@@ -50,8 +50,8 @@ class BitsDetection @Inject constructor(val ledger: LedgerLogger) {
             ledger.logEntry(
                 LedgerEntry(
 	                TransactionType.BOOSTER_COOKIE_ATE,
-                    Instant.now(),
-					listOf(
+	                Instant.now(),
+	                listOf(
 						ItemChange.lose(ItemIds.BOOSTER_COOKIE, 1)
 					)
                 )
diff --git a/mod/src/main/kotlin/moe/nea/ledger/modules/EyedropsDetection.kt b/mod/src/main/kotlin/moe/nea/ledger/modules/EyedropsDetection.kt
index 1c36ae4..c90f8d9 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/modules/EyedropsDetection.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/modules/EyedropsDetection.kt
@@ -22,9 +22,9 @@ class EyedropsDetection {
         capsaicinEyedropsUsed.useMatcher(event.message) {
             logger.logEntry(
                 LedgerEntry(
-                    TransactionType.CAPSAICIN_EYEDROPS_USED,
-                    event.timestamp,
-                    listOf(
+	                TransactionType.CAPSAICIN_EYEDROPS_USED,
+	                event.timestamp,
+	                listOf(
                         ItemChange.lose(ItemIds.CAPSAICIN_EYEDROPS_NO_CHARGES, 1)
                     )
                 )
diff --git a/mod/src/main/kotlin/moe/nea/ledger/modules/GodPotionDetection.kt b/mod/src/main/kotlin/moe/nea/ledger/modules/GodPotionDetection.kt
index e858a6b..56e2b69 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/modules/GodPotionDetection.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/modules/GodPotionDetection.kt
@@ -22,9 +22,9 @@ class GodPotionDetection {
         godPotionDrank.useMatcher(event.message) {
             logger.logEntry(
                 LedgerEntry(
-                    TransactionType.GOD_POTION_DRANK,
-                    event.timestamp,
-                    listOf(
+	                TransactionType.GOD_POTION_DRANK,
+	                event.timestamp,
+	                listOf(
                         ItemChange.lose(ItemIds.GOD_POTION_2, 1)
                     )
                 )
diff --git a/mod/src/main/kotlin/moe/nea/ledger/modules/GodPotionMixinDetection.kt b/mod/src/main/kotlin/moe/nea/ledger/modules/GodPotionMixinDetection.kt
index b96a24a..072503f 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/modules/GodPotionMixinDetection.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/modules/GodPotionMixinDetection.kt
@@ -26,9 +26,9 @@ class GodPotionMixinDetection {
         godPotionMixinDrank.useMatcher(event.message) {
             logger.logEntry(
                 LedgerEntry(
-                    TransactionType.GOD_POTION_MIXIN_DRANK,
-                    event.timestamp,
-                    listOf(
+	                TransactionType.GOD_POTION_MIXIN_DRANK,
+	                event.timestamp,
+	                listOf(
                         ItemChange.lose(itemIdProvider.findForName(group("what")) ?: ItemId.NIL, 1)
                     )
                 )