Revert "Use a constant to determine the collection name"

This reverts commit f61306c.
HyacinthBots · Sep 5, 2023 · 472f1b2 · 472f1b2
1 parent f61306c
commit 472f1b2
Show file tree

Hide file tree

Showing 30 changed files with 37 additions and 128 deletions.
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/Cleanups.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/Cleanups.kt
@@ -12,7 +12,6 @@ import mu.KotlinLogging
 import org.hyacinthbots.lilybot.database.Cleanups.cleanupGuildData
 import org.hyacinthbots.lilybot.database.Cleanups.cleanupThreadData
 import org.hyacinthbots.lilybot.database.collections.GithubCollection
-import org.hyacinthbots.lilybot.database.collections.GuildLeaveTimeCollection
 import org.hyacinthbots.lilybot.database.collections.LoggingConfigCollection
 import org.hyacinthbots.lilybot.database.collections.ModerationConfigCollection
 import org.hyacinthbots.lilybot.database.collections.NewsChannelPublishingCollection
@@ -40,11 +39,10 @@ object Cleanups : KordExKoinComponent {
 	private val db: Database by inject()
 
 	@PublishedApi
-	internal val guildLeaveTimeCollection =
-		db.mainDatabase.getCollection<GuildLeaveTimeData>(GuildLeaveTimeCollection.name)
+	internal val guildLeaveTimeCollection = db.mainDatabase.getCollection<GuildLeaveTimeData>("guildLeaveTimeData")
 
 	@PublishedApi
-	internal val threadDataCollection = db.mainDatabase.getCollection<ThreadData>(ThreadsCollection.name)
+	internal val threadDataCollection = db.mainDatabase.getCollection<ThreadData>("threadData")
 
 	@PublishedApi
 	internal val cleanupsLogger = KotlinLogging.logger("Database Cleanups")

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/Collection.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/Collection.kt
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/AutoThreadingCollection.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/AutoThreadingCollection.kt
@@ -4,7 +4,6 @@ import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
 import com.mongodb.client.model.Filters.eq
 import dev.kord.common.entity.Snowflake
 import kotlinx.coroutines.flow.toList
-import org.hyacinthbots.lilybot.database.Collection
 import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.entities.AutoThreadingData
 import org.hyacinthbots.lilybot.database.findOne
@@ -25,7 +24,7 @@ class AutoThreadingCollection : KordExKoinComponent {
 	private val db: Database by inject()
 
 	@PublishedApi
-	internal val collection = db.mainDatabase.getCollection<AutoThreadingData>(name)
+	internal val collection = db.mainDatabase.getCollection<AutoThreadingData>("autoThreadingData")
 
 	/**
 	 * Gets all auto threads for a given [inputGuildId].
@@ -80,6 +79,4 @@ class AutoThreadingCollection : KordExKoinComponent {
 	 */
 	suspend inline fun deleteGuildAutoThreads(inputGuildId: Snowflake) =
 		collection.deleteMany(eq(AutoThreadingData::guildId.name, inputGuildId))
-
-	companion object : Collection("autoThreadingData")
 }
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/ConfigCollection.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/ConfigCollection.kt
@@ -3,7 +3,6 @@ package org.hyacinthbots.lilybot.database.collections
 import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
 import com.mongodb.client.model.Filters.eq
 import dev.kord.common.entity.Snowflake
-import org.hyacinthbots.lilybot.database.Collection
 import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.entities.LoggingConfigData
 import org.hyacinthbots.lilybot.database.entities.ModerationConfigData
@@ -24,7 +23,7 @@ class LoggingConfigCollection : KordExKoinComponent {
 	private val configDb: Database by inject()
 
 	@PublishedApi
-	internal val collection = configDb.configDatabase.getCollection<LoggingConfigData>(name)
+	internal val collection = configDb.configDatabase.getCollection<LoggingConfigData>("loggingConfigData")
 
 	/**
 	 * Gets the logging config for the given guild using the [guildId][inputGuildId].
@@ -58,8 +57,6 @@ class LoggingConfigCollection : KordExKoinComponent {
 	 */
 	suspend inline fun clearConfig(inputGuildId: Snowflake) =
 		collection.deleteOne(eq(LoggingConfigData::guildId.name, inputGuildId))
-
-	companion object : Collection("loggingConfigData")
 }
 
 /**
@@ -75,7 +72,7 @@ class ModerationConfigCollection : KordExKoinComponent {
 	private val configDb: Database by inject()
 
 	@PublishedApi
-	internal val collection = configDb.configDatabase.getCollection<ModerationConfigData>(name)
+	internal val collection = configDb.configDatabase.getCollection<ModerationConfigData>("moderationConfigData")
 
 	/**
 	 * Gets the Moderation config for the given guild using the [guildId][inputGuildId].
@@ -109,8 +106,6 @@ class ModerationConfigCollection : KordExKoinComponent {
 	 */
 	suspend inline fun clearConfig(inputGuildId: Snowflake) =
 		collection.deleteOne(eq(ModerationConfigData::guildId.name, inputGuildId))
-
-	companion object : Collection("moderationConfigData")
 }
 
 /**
@@ -126,7 +121,7 @@ class UtilityConfigCollection : KordExKoinComponent {
 	private val configDb: Database by inject()
 
 	@PublishedApi
-	internal val collection = configDb.configDatabase.getCollection<UtilityConfigData>(name)
+	internal val collection = configDb.configDatabase.getCollection<UtilityConfigData>("utilityConfigData")
 
 	/**
 	 * Gets the Utility config for the given guild using the [guildId][inputGuildId].
@@ -160,6 +155,4 @@ class UtilityConfigCollection : KordExKoinComponent {
 	 */
 	suspend inline fun clearConfig(inputGuildId: Snowflake) =
 		collection.deleteOne(eq(UtilityConfigData::guildId.name, inputGuildId))
-
-	companion object : Collection("utilityConfigData")
 }
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/GalleryChannelCollection.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/GalleryChannelCollection.kt
@@ -5,7 +5,6 @@ import com.mongodb.client.model.Filters.and
 import com.mongodb.client.model.Filters.eq
 import dev.kord.common.entity.Snowflake
 import kotlinx.coroutines.flow.toList
-import org.hyacinthbots.lilybot.database.Collection
 import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.entities.GalleryChannelData
 import org.koin.core.component.inject
@@ -24,7 +23,7 @@ class GalleryChannelCollection : KordExKoinComponent {
 	private val db: Database by inject()
 
 	@PublishedApi
-	internal val collection = db.mainDatabase.getCollection<GalleryChannelData>(name)
+	internal val collection = db.mainDatabase.getCollection<GalleryChannelData>("galleryChannelData")
 
 	/**
 	 * Collects every gallery channel in the database into a [List].
@@ -73,6 +72,4 @@ class GalleryChannelCollection : KordExKoinComponent {
 	 */
 	suspend inline fun removeAll(inputGuildId: Snowflake) =
 		collection.deleteMany(eq(GalleryChannelData::guildId.name, inputGuildId))
-
-	companion object : Collection("galleryChannelData")
 }
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/GithubCollection.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/GithubCollection.kt
@@ -3,7 +3,6 @@ package org.hyacinthbots.lilybot.database.collections
 import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
 import com.mongodb.client.model.Filters.eq
 import dev.kord.common.entity.Snowflake
-import org.hyacinthbots.lilybot.database.Collection
 import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.entities.GithubData
 import org.hyacinthbots.lilybot.database.findOne
@@ -22,7 +21,7 @@ class GithubCollection : KordExKoinComponent {
 	private val db: Database by inject()
 
 	@PublishedApi
-	internal val collection = db.mainDatabase.getCollection<GithubData>(name)
+	internal val collection = db.mainDatabase.getCollection<GithubData>("githubData")
 
 	/**
 	 * Gets the default repo for GitHub commands.
@@ -57,6 +56,4 @@ class GithubCollection : KordExKoinComponent {
 	 */
 	suspend inline fun removeDefaultRepo(inputGuildId: Snowflake) =
 		collection.deleteOne(eq(GithubData::guildId.name, inputGuildId))
-
-	companion object : Collection("githubData")
 }
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/GuildLeaveTimeCollection.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/GuildLeaveTimeCollection.kt
@@ -4,7 +4,6 @@ import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
 import com.mongodb.client.model.Filters.eq
 import dev.kord.common.entity.Snowflake
 import kotlinx.datetime.Instant
-import org.hyacinthbots.lilybot.database.Collection
 import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.entities.GuildLeaveTimeData
 import org.koin.core.component.inject
@@ -21,7 +20,7 @@ class GuildLeaveTimeCollection : KordExKoinComponent {
 	private val db: Database by inject()
 
 	@PublishedApi
-	internal val collection = db.mainDatabase.getCollection<GuildLeaveTimeData>(name)
+	internal val collection = db.mainDatabase.getCollection<GuildLeaveTimeData>("guildLeaveTimeData")
 
 	/**
 	 * Adds the time Lily bot left a guild with a config.
@@ -45,6 +44,4 @@ class GuildLeaveTimeCollection : KordExKoinComponent {
 	 */
 	suspend inline fun removeLeaveTime(inputGuildId: Snowflake) =
 		collection.deleteOne(eq(GuildLeaveTimeData::guildId.name, inputGuildId))
-
-	companion object : Collection("guildLeaveTimeData")
 }
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/MetaCollection.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/MetaCollection.kt
@@ -2,7 +2,6 @@ package org.hyacinthbots.lilybot.database.collections
 
 import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
 import com.mongodb.client.model.Filters.eq
-import org.hyacinthbots.lilybot.database.Collection
 import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.entities.ConfigMetaData
 import org.hyacinthbots.lilybot.database.entities.MainMetaData
@@ -22,7 +21,7 @@ class MainMetaCollection : KordExKoinComponent {
 	private val db: Database by inject()
 
 	@PublishedApi
-	internal val collection = db.mainDatabase.getCollection<MainMetaData>(name)
+	internal val collection = db.mainDatabase.getCollection<MainMetaData>("mainMetaData")
 
 	/**
 	 * Gets the main metadata from the database.
@@ -54,8 +53,6 @@ class MainMetaCollection : KordExKoinComponent {
 			eq(MainMetaData::id.name, "mainMeta"),
 			meta
 		)
-
-	companion object : Collection("mainMetaData")
 }
 
 /**
@@ -71,7 +68,7 @@ class ConfigMetaCollection : KordExKoinComponent {
 	private val db: Database by inject()
 
 	@PublishedApi
-	internal val collection = db.configDatabase.getCollection<ConfigMetaData>(name)
+	internal val collection = db.configDatabase.getCollection<ConfigMetaData>("configMetaData")
 
 	/**
 	 * Gets the config metadata from the database.
@@ -103,6 +100,4 @@ class ConfigMetaCollection : KordExKoinComponent {
 			eq(ConfigMetaData::id.name, "configMeta"),
 			meta
 		)
-
-	companion object : Collection("configMetaData")
 }
diff --git a/...n/kotlin/org/hyacinthbots/lilybot/database/collections/NewsChannelPublishingCollection.kt b/...n/kotlin/org/hyacinthbots/lilybot/database/collections/NewsChannelPublishingCollection.kt
@@ -5,7 +5,6 @@ import com.mongodb.client.model.Filters.and
 import com.mongodb.client.model.Filters.eq
 import dev.kord.common.entity.Snowflake
 import kotlinx.coroutines.flow.toList
-import org.hyacinthbots.lilybot.database.Collection
 import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.entities.NewsChannelPublishingData
 import org.hyacinthbots.lilybot.database.findOne
@@ -26,7 +25,7 @@ class NewsChannelPublishingCollection : KordExKoinComponent {
 	private val db: Database by inject()
 
 	@PublishedApi
-	internal val collection = db.mainDatabase.getCollection<NewsChannelPublishingData>(name)
+	internal val collection = db.mainDatabase.getCollection<NewsChannelPublishingData>("newsChannelPublishingData")
 
 	/**
 	 * Adds a channel for auto-publishing.
@@ -99,6 +98,4 @@ class NewsChannelPublishingCollection : KordExKoinComponent {
 	suspend inline fun clearAutoPublishingForGuild(inputGuildId: Snowflake) {
 		collection.deleteMany(eq(NewsChannelPublishingData::guildId.name, inputGuildId))
 	}
-
-	companion object : Collection("newsChannelPublishingData")
 }
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/ReminderCollection.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/ReminderCollection.kt
@@ -8,7 +8,6 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.datetime.DateTimePeriod
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.plus
-import org.hyacinthbots.lilybot.database.Collection
 import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.entities.ReminderData
 import org.koin.core.component.inject
@@ -31,7 +30,7 @@ class ReminderCollection : KordExKoinComponent {
 	private val db: Database by inject()
 
 	@PublishedApi
-	internal val collection = db.mainDatabase.getCollection<ReminderData>(name)
+	internal val collection = db.mainDatabase.getCollection<ReminderData>("reminderData")
 
 	/**
 	 * Gets all the reminders currently in the database.
@@ -121,6 +120,4 @@ class ReminderCollection : KordExKoinComponent {
 			)
 		)
 	}
-
-	companion object : Collection("reminderData")
 }
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/RoleMenuCollection.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/RoleMenuCollection.kt
@@ -3,7 +3,6 @@ package org.hyacinthbots.lilybot.database.collections
 import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
 import com.mongodb.client.model.Filters.eq
 import dev.kord.common.entity.Snowflake
-import org.hyacinthbots.lilybot.database.Collection
 import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.entities.RoleMenuData
 import org.hyacinthbots.lilybot.database.findOne
@@ -23,7 +22,7 @@ class RoleMenuCollection : KordExKoinComponent {
 	private val db: Database by inject()
 
 	@PublishedApi
-	internal val collection = db.mainDatabase.getCollection<RoleMenuData>(name)
+	internal val collection = db.mainDatabase.getCollection<RoleMenuData>("roleMenuData")
 
 	/**
 	 * Using the provided [inputMessageId] the associated [RoleMenuData] will be returned from the database.
@@ -84,6 +83,4 @@ class RoleMenuCollection : KordExKoinComponent {
 	 */
 	suspend inline fun removeAllRoleMenus(inputGuildId: Snowflake) =
 		collection.deleteMany(eq(RoleMenuData::guildId.name, inputGuildId))
-
-	companion object : Collection("roleMenuData")
 }
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/RoleSubscriptionCollection.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/RoleSubscriptionCollection.kt
@@ -4,7 +4,6 @@ import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
 import com.mongodb.client.model.Filters.eq
 import com.mongodb.client.model.Updates
 import dev.kord.common.entity.Snowflake
-import org.hyacinthbots.lilybot.database.Collection
 import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.entities.RoleSubscriptionData
 import org.hyacinthbots.lilybot.database.findOne
@@ -25,7 +24,7 @@ class RoleSubscriptionCollection : KordExKoinComponent {
 	private val db: Database by inject()
 
 	@PublishedApi
-	internal val collection = db.mainDatabase.getCollection<RoleSubscriptionData>(name)
+	internal val collection = db.mainDatabase.getCollection<RoleSubscriptionData>("roleSubscriptionData")
 
 	/**
 	 * Gets the roles that are subscribable for a given guild.
@@ -107,6 +106,4 @@ class RoleSubscriptionCollection : KordExKoinComponent {
 	 */
 	suspend inline fun removeAllSubscribableRoles(inputGuildId: Snowflake) =
 		collection.deleteOne(eq(RoleSubscriptionData::guildId.name, inputGuildId))
-
-	companion object : Collection("roleSubscriptionData")
 }
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/StatusCollection.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/StatusCollection.kt
@@ -1,7 +1,6 @@
 package org.hyacinthbots.lilybot.database.collections
 
 import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
-import org.hyacinthbots.lilybot.database.Collection
 import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.deleteOne
 import org.hyacinthbots.lilybot.database.entities.StatusData
@@ -20,7 +19,7 @@ class StatusCollection : KordExKoinComponent {
 	private val db: Database by inject()
 
 	@PublishedApi
-	internal val collection = db.mainDatabase.getCollection<StatusData>(name)
+	internal val collection = db.mainDatabase.getCollection<StatusData>("statusData")
 
 	/**
 	 * Gets Lily's status from the database.
@@ -43,6 +42,4 @@ class StatusCollection : KordExKoinComponent {
 		collection.deleteOne()
 		collection.insertOne(StatusData(newStatus))
 	}
-
-	companion object : Collection("statusData")
 }
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/TagsCollection.kt b/src/main/kotlin/org/hyacinthbots/lilybot/database/collections/TagsCollection.kt
@@ -5,7 +5,6 @@ import com.mongodb.client.model.Filters.and
 import com.mongodb.client.model.Filters.eq
 import dev.kord.common.entity.Snowflake
 import kotlinx.coroutines.flow.toList
-import org.hyacinthbots.lilybot.database.Collection
 import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.entities.TagsData
 import org.hyacinthbots.lilybot.database.findOne
@@ -26,7 +25,7 @@ class TagsCollection : KordExKoinComponent {
 	private val db: Database by inject()
 
 	@PublishedApi
-	internal val collection = db.mainDatabase.getCollection<TagsData>(name)
+	internal val collection = db.mainDatabase.getCollection<TagsData>("tagsData")
 
 	/**
 	 * Gets the given tag using it's [name] and returns its [TagsData]. If the tag does not exist.
@@ -91,6 +90,4 @@ class TagsCollection : KordExKoinComponent {
 	 */
 	suspend inline fun clearTags(inputGuildId: Snowflake) =
 		collection.deleteMany(eq(TagsData::guildId.name, inputGuildId))
-
-	companion object : Collection("tagsData")
 }