refactor: DB schema

Author: lekoOwO

Cargo.lock

@@ -21,4 +21,4 @@ rust-embed = "8.0"
 tempfile = "3.9"
 tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
 uuid = { version = "1.0", features = ["v4"] }
-tower = { version = "0.4", features = ["util"] }
+tower = { version = "0.5.2", features = ["util"] }

Cargo.toml

@@ -3,7 +3,7 @@ bot:
   default_invite_max_age: 300  # Default 5 minutes
 
 database:
-  path: "data/bot.db"
+  path: "sqlite:data/bot.db"
 
 server:
   external_url: "https://your-domain.com:8080"  # External access URL

config.example.yaml

@@ -180,9 +180,7 @@ mod tests {
                 token: "test_token".to_string(),
                 default_invite_max_age: 300,
             },
-            database: DatabaseConfig {
-                path: "test.db".to_string(),
-            },
+            database: DatabaseConfig { uri: db_url },
             server: ServerConfig {
                 external_url: "http://localhost:8080".to_string(),
                 bind: "127.0.0.1:8080".to_string(),

src/http_server.rs

@@ -66,7 +66,7 @@ async fn main() -> Result<(), Error> {
     let config = Config::load(std::env::var("CONFIG_PATH").unwrap().as_str())?;
 
     // Initialize database connection pool
-    let db = utils::db::create_pool(&config.database.path).await?;
+    let db = utils::db::create_pool(&config.database.uri).await?;
 
     // Start HTTP server
     let server_config = config.clone();

src/main.rs

@@ -25,7 +25,7 @@ pub struct BotConfig {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct DatabaseConfig {
-    pub path: String,
+    pub uri: String,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -91,16 +91,17 @@ mod tests {
     use super::*;
     use std::io::Write;
     use tempfile::NamedTempFile;
+    use uuid::Uuid;
 
     fn create_test_config() -> (NamedTempFile, Config) {
+        let db_url = format!("sqlite:file:{}?mode=memory", Uuid::new_v4());
+
         let config = Config {
             bot: BotConfig {
                 token: "test_token".to_string(),
                 default_invite_max_age: 300,
             },
-            database: DatabaseConfig {
-                path: "test.db".to_string(),
-            },
+            database: DatabaseConfig { uri: db_url },
             server: ServerConfig {
                 external_url: "http://localhost:8080".to_string(),
                 bind: "127.0.0.1:8080".to_string(),

src/utils/config.rs

@@ -1,7 +1,7 @@
 use sqlx::types::time::OffsetDateTime;
-use sqlx::SqlitePool;
+type Pool = sqlx::Pool<sqlx::Sqlite>;
 
-pub async fn setup_database(pool: &SqlitePool) -> Result<(), sqlx::Error> {
+pub async fn setup_database(pool: &Pool) -> Result<(), sqlx::Error> {
     sqlx::query!(
         "CREATE TABLE IF NOT EXISTS invites (
             id TEXT PRIMARY KEY,
@@ -19,14 +19,14 @@ pub async fn setup_database(pool: &SqlitePool) -> Result<(), sqlx::Error> {
     Ok(())
 }
 
-pub async fn create_pool(database_path: &str) -> Result<SqlitePool, sqlx::Error> {
-    let pool = SqlitePool::connect(&format!("sqlite:{}", database_path)).await?;
+pub async fn create_pool(database_path: &str) -> Result<Pool, sqlx::Error> {
+    let pool = Pool::connect(database_path).await?;
     setup_database(&pool).await?;
     Ok(pool)
 }
 
 pub async fn create_invite(
-    pool: &SqlitePool,
+    pool: &Pool,
     invite_id: &str,
     guild_id: &str,
     creator_id: &str,
@@ -45,7 +45,7 @@ pub async fn create_invite(
 }
 
 pub async fn get_unused_invite(
-    pool: &SqlitePool,
+    pool: &Pool,
     invite_id: &str,
 ) -> Result<Option<InviteRecord>, sqlx::Error> {
     sqlx::query_as!(
@@ -58,7 +58,7 @@ pub async fn get_unused_invite(
 }
 
 pub async fn update_invite_code(
-    pool: &SqlitePool,
+    pool: &Pool,
     invite_id: &str,
     discord_code: &str,
 ) -> Result<(), sqlx::Error> {
@@ -73,7 +73,7 @@ pub async fn update_invite_code(
 }
 
 pub async fn count_used_invites(
-    pool: &SqlitePool,
+    pool: &Pool,
     creator_id: &str,
     guild_id: &str,
     days: i32,
@@ -112,7 +112,7 @@ pub struct InviteInfo {
 }
 
 pub async fn get_user_invite_info(
-    pool: &SqlitePool,
+    pool: &Pool,
     user_id: &str,
 ) -> Result<Option<InviteInfo>, sqlx::Error> {
     sqlx::query_as!(
@@ -131,7 +131,7 @@ pub async fn get_user_invite_info(
 
 // 新增：記錄使用邀請的用戶
 pub async fn record_invite_use(
-    pool: &SqlitePool,
+    pool: &Pool,
     invite_id: &str,
     user_id: &str,
 ) -> Result<(), sqlx::Error> {
@@ -152,7 +152,7 @@ pub async fn record_invite_use(
 }
 
 pub async fn find_invite_by_code(
-    pool: &SqlitePool,
+    pool: &Pool,
     discord_code: &str,
 ) -> Result<Option<String>, sqlx::Error> {
     sqlx::query_scalar!(
@@ -171,7 +171,7 @@ pub struct InviteLeaderboardEntry {
 }
 
 pub async fn get_invite_leaderboard(
-    pool: &SqlitePool,
+    pool: &Pool,
     guild_id: &str,
     days: i32,
 ) -> Result<Vec<InviteLeaderboardEntry>, sqlx::Error> {
@@ -203,10 +203,9 @@ pub async fn get_invite_leaderboard(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use sqlx::SqlitePool;
     use uuid::Uuid;
 
-    async fn setup_test_db() -> SqlitePool {
+    async fn setup_test_db() -> Pool {
         let db_url = format!("sqlite:file:{}?mode=memory", Uuid::new_v4());
         let pool = create_pool(&db_url).await.unwrap();
         sqlx::migrate!().run(&pool).await.unwrap();

src/utils/db.rs

@@ -17,9 +17,7 @@ impl TestContext {
                 token: "test_token".to_string(),
                 default_invite_max_age: 300,
             },
-            database: crate::utils::config::DatabaseConfig {
-                path: "test.db".to_string(),
-            },
+            database: crate::utils::config::DatabaseConfig { uri: db_url },
             server: crate::utils::config::ServerConfig {
                 external_url: "http://localhost:8080".to_string(),
                 bind: "127.0.0.1:8080".to_string(),