Fix meta breaking the whole thing

HyacinthBots · Aug 22, 2023 · c90065c · c90065c
1 parent 43feb32
commit c90065c
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 33 deletions.
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/_DatabaseUtils.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/_DatabaseUtils.kt
@@ -11,8 +11,7 @@ private fun <T : Any> MongoCollection<T>.find(vararg filters: Bson?): FindFlow<T
 
 suspend fun <T : Any> MongoCollection<T>.findOne(filter: Bson): T? = find(filter).firstOrNull()
 
-suspend fun <T : Any> MongoCollection<T>.findOne(vararg filters: Bson?): T? =
-	find(*filters).firstOrNull()
+suspend fun <T : Any> MongoCollection<T>.findOne(vararg filters: Bson?): T? = find(*filters).firstOrNull()
 
 suspend fun <T : Any> MongoCollection<T>.deleteOne() = deleteOne(Filters.empty())
 

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/MetaCollection.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/MetaCollection.kt
@@ -31,7 +31,7 @@ class MainMetaCollection : KordExKoinComponent {
 	 * @since 4.0.0
 	 */
 	suspend fun get(): MainMetaData? =
-		collection.findOne()
+		collection.findOne(eq(MainMetaData::id.name, "mainMeta"))
 
 	/**
 	 * Sets the metadata when the table is first created.
@@ -78,7 +78,7 @@ class ConfigMetaCollection : KordExKoinComponent {
 	 * @since 4.0.0
 	 */
 	suspend fun get(): ConfigMetaData? =
-		collection.findOne()
+		collection.findOne(eq(ConfigMetaData::id.name, "configMeta"))
 
 	/**
 	 * Sets the metadata when the table is first created.

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/Migrator.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/Migrator.kt
@@ -124,7 +124,7 @@ object Migrator : KordExKoinComponent {
 					6 -> ::configV6
 					7 -> ::configV7
 					else -> break
-				}(db.configDatabase, db.tempKordExDatabase)
+				}(db.configDatabase)
 
 				logger.info { "Migrated config database to version $nextVersion" }
 			} catch (t: Throwable) {

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV1.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV1.kt
@@ -5,8 +5,7 @@ import com.mongodb.client.model.Updates
 import com.mongodb.kotlin.client.coroutine.MongoDatabase
 import org.hyacinthbots.lilybot.database.entities.LoggingConfigData
 
-@Suppress("UnusedPrivateMember", "UNUSED_PARAMETER")
-suspend fun configV1(configDb: MongoDatabase, tempKeDb: MongoDatabase) {
+suspend fun configV1(configDb: MongoDatabase) {
 	with(configDb.getCollection<LoggingConfigData>("loggingConfigData")) {
 		updateMany(
 			Filters.exists(LoggingConfigData::enableMessageEditLogs.name, false),

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV2.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV2.kt
@@ -5,8 +5,7 @@ import com.mongodb.client.model.Updates
 import com.mongodb.kotlin.client.coroutine.MongoDatabase
 import org.hyacinthbots.lilybot.database.entities.ModerationConfigData
 
-@Suppress("UnusedPrivateMember", "UNUSED_PARAMETER")
-suspend fun configV2(db: MongoDatabase, tempKeDb: MongoDatabase) {
+suspend fun configV2(db: MongoDatabase) {
 	with(db.getCollection<ModerationConfigData>("moderationConfigData")) {
 		updateMany(
 			Filters.exists(ModerationConfigData::quickTimeoutLength.name, false),

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV3.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV3.kt
@@ -5,8 +5,7 @@ import com.mongodb.client.model.Updates
 import com.mongodb.kotlin.client.coroutine.MongoDatabase
 import org.hyacinthbots.lilybot.database.entities.LoggingConfigData
 
-@Suppress("UnusedPrivateMember", "UNUSED_PARAMETER")
-suspend fun configV3(db: MongoDatabase, tempKeDb: MongoDatabase) {
+suspend fun configV3(db: MongoDatabase) {
 	with(db.getCollection<LoggingConfigData>("loggingConfigData")) {
 		updateMany(
 			Filters.exists(LoggingConfigData::enablePublicMemberLogs.name, false),

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV4.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV4.kt
@@ -3,7 +3,7 @@ package org.hyacinthbots.lilybot.database.migrations.config
 import com.mongodb.kotlin.client.coroutine.MongoDatabase
 
 @Suppress("UnusedPrivateMember", "UNUSED_PARAMETER", "RedundantSuspendModifier")
-suspend fun configV4(db: MongoDatabase, tempKeDb: MongoDatabase) {
+suspend fun configV4(db: MongoDatabase) {
 	// Support config has been removed.
 // 	if (db.getCollection<SupportConfigData>().find().toList().isEmpty()) {
 // 		db.dropCollection("supportConfigData")

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV5.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV5.kt
@@ -4,7 +4,7 @@ package org.hyacinthbots.lilybot.database.migrations.config
 
 import com.mongodb.kotlin.client.coroutine.MongoDatabase
 
-suspend fun configV5(db: MongoDatabase, tempKeDb: MongoDatabase) {
+suspend fun configV5(db: MongoDatabase) {
 // 	val collection = db.getCollection<UtilityConfigDataOld>("utilityConfigData")
 // 	val oldConfigs = collection.find().toList()
 // 	val newConfigs = mutableListOf<UtilityConfigData>()

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV6.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV6.kt
@@ -5,8 +5,7 @@ import com.mongodb.client.model.Updates
 import com.mongodb.kotlin.client.coroutine.MongoDatabase
 import org.hyacinthbots.lilybot.database.entities.ModerationConfigData
 
-@Suppress("UnusedPrivateMember", "UNUSED_PARAMETER")
-suspend fun configV6(db: MongoDatabase, tempKeDb: MongoDatabase) {
+suspend fun configV6(db: MongoDatabase) {
 	with(db.getCollection<ModerationConfigData>("moderationConfigData")) {
 		updateMany(
 			Filters.exists(ModerationConfigData::banDmMessage.name, false),

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV7.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/config/configV7.kt
@@ -1,24 +1,9 @@
 package org.hyacinthbots.lilybot.database.migrations.config
 
 import com.mongodb.kotlin.client.coroutine.MongoDatabase
-import kotlinx.coroutines.flow.toList
 import org.hyacinthbots.lilybot.database.entities.AdaptedData
 
-suspend fun configV7(db: MongoDatabase, tempKeDb: MongoDatabase) {
-	// Done twice due to updates in the data-adapter
-	with(db.getCollection<AdaptedData>("ext-pluralkit")) {
-		val data = find().toList()
-
-		tempKeDb.createCollection("data-ext-pluralkit") // create new with correct name
-		tempKeDb.getCollection<AdaptedData>("data-ext-pluralkit").insertMany(data) // add the data
-		drop() // drop old
-	}
-
-	with(db.getCollection<AdaptedData>("data-ext-pluralkit")) {
-		val data = find().toList()
-
-		tempKeDb.createCollection("data-ext-pluralkit") // create new
-		tempKeDb.getCollection<AdaptedData>("data-ext-pluralkit").insertMany(data) // add the data
-		drop() // drop old
-	}
+suspend fun configV7(db: MongoDatabase) {
+	db.getCollection<AdaptedData>("ext-pluralkit").drop()
+	db.getCollection<AdaptedData>("data-ext-pluralkit").drop()
 }