From 5f0bb32e9b689d9bf1c15d07235fa5f9c284efdc Mon Sep 17 00:00:00 2001
From: Siwoo Jeon <me@migan.co.kr>
Date: Sat, 17 May 2025 21:12:14 +0900
Subject: [PATCH] fix!: remove deprecated value in MuffinConfig

---
 configs/config.go     | 10 ----------
 databases/database.go |  6 +++---
 scripts/dbMigrate.go  |  4 ++--
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/configs/config.go b/configs/config.go
index 0e51efe..bca47ac 100644
--- a/configs/config.go
+++ b/configs/config.go
@@ -34,12 +34,6 @@ type MuffinConfig struct {
 	Bot      botConfig
 	Train    trainConfig
 	Database databaseConfig
-
-	// Deprecated: Use Database.URL
-	DatabaseURL string
-
-	// Deprecated: Use Database.Name
-	DatabaseName string
 }
 
 var Config *MuffinConfig
@@ -90,8 +84,4 @@ func setConfig(config *MuffinConfig) {
 	if config.Database.URL == "" {
 		config.Database.URL = fmt.Sprintf("mongodb://%s:%s@%s:%d/?authSource=%s", config.Database.Username, config.Database.Password, config.Database.HostName, config.Database.Port, config.Database.AuthSource)
 	}
-
-	// Deprecated된 Value
-	config.DatabaseURL = config.Database.URL
-	config.DatabaseName = config.Database.Name
 }
diff --git a/databases/database.go b/databases/database.go
index 26a6607..273a671 100644
--- a/databases/database.go
+++ b/databases/database.go
@@ -26,13 +26,13 @@ func init() {
 }
 
 func Connect() (*MuffinDatabase, error) {
-	client, err := mongo.Connect(options.Client().ApplyURI(configs.Config.DatabaseURL))
+	client, err := mongo.Connect(options.Client().ApplyURI(configs.Config.Database.URL))
 	if err != nil {
 		return nil, err
 	}
 	return &MuffinDatabase{
 		Client: client,
-		Learns: client.Database(configs.Config.DatabaseName).Collection("learn"),
-		Texts:  client.Database(configs.Config.DatabaseName).Collection("text"),
+		Learns: client.Database(configs.Config.Database.Name).Collection("learn"),
+		Texts:  client.Database(configs.Config.Database.Name).Collection("text"),
 	}, nil
 }
diff --git a/scripts/dbMigrate.go b/scripts/dbMigrate.go
index f06569c..53385f6 100644
--- a/scripts/dbMigrate.go
+++ b/scripts/dbMigrate.go
@@ -22,8 +22,8 @@ var wg sync.WaitGroup
 // 이 스크립트는 MariaDB -> MongoDB로의 전환을 위해 만들었음.
 func DBMigrate(n *commando.Node) error {
 	mariaURL := os.Getenv("PREVIOUS_DATABASE_URL")
-	mongoURL := configs.Config.DatabaseURL
-	dbName := configs.Config.DatabaseName
+	mongoURL := configs.Config.Database.URL
+	dbName := configs.Config.Database.Name
 
 	dbConnectionQuery := "?parseTime=true"