update

Author: hhstore

.env.local

@@ -30,8 +30,11 @@ DISCORD_TOKEN="your_discord_token"
 # cms db:
 DATABASE_URL=postgres://username:password@localhost/diesel_demo
 
+HOST=127.0.0.1
+PORT=5000
+
 ################################################################################
 
 # BINANCE API:
 BINANCE_API_KEY="your_binance_api_key"
-BINANCE_SECRET_KEY="your_binance_secret_key"
+BINANCE_SECRET_KEY="your_binance_secret_key"

Taskfile.yml

@@ -153,7 +153,7 @@ tasks:
     cmds:
       - task: commit
       - task: commit
-      - task: push
+      - git status
     ignore_error: true
 
   commit:

crates/rs-cms-migration/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
-name = "migration"
+name = "rs-cms-migration"
 version = "0.1.0"
 edition = "2021"
 publish = false
 
 [lib]
-name = "migration"
+name = "rs_cms_migration"
 path = "src/lib.rs"
 
 [dependencies]

crates/rs-cms/Cargo.toml

@@ -26,8 +26,8 @@ serde_json = "1.0"
 diesel = { version = "1.4", features = ["mysql"] }  # orm
 dotenvy = "0.15" # env vars
 
-log = "0.4"               # log
-pretty_env_logger = "0.4" # colorful log
+#log = "0.4"               # log
+#pretty_env_logger = "0.4" # colorful log
 
 # sqlx-postgres
 sea-orm = { version = "^0.8", features = ["sqlx-mysql", "runtime-tokio-native-tls", "macros", "debug-print", "mock"] }
@@ -36,3 +36,4 @@ anyhow = "1.0"
 
 # local crates:
 rs-cms-entity = { path = "../rs-cms-entity" }
+#rs-cms-migration = { path = "../rs-cms-migration" }

crates/rs-cms/Taskfile.yml

@@ -16,7 +16,12 @@ tasks:
 
   # auto compile and run:
   watch:
-    - cargo watch -x run
+    cmds:
+      - cargo watch -x run
+
+  clean:
+    cmds:
+      - cargo clean
 
   open:
     cmds:

crates/rs-cms/src/config/config.rs

@@ -0,0 +1,26 @@
+struct AppConfig {
+    name: String,
+    version: String,
+
+    http: ServerConfig,
+    db: DbConfig,
+    cache: CacheConfig,
+    mq: MQConfig,
+}
+
+struct ServerConfig {
+    host: String,
+    port: String,
+}
+
+struct DbConfig {
+    url: String,
+}
+
+struct CacheConfig {
+    url: String,
+}
+
+struct MQConfig {
+    url: String,
+}

crates/rs-cms/src/config/mod.rs

@@ -0,0 +1 @@
+pub mod config;

crates/rs-cms/src/dao/cache/cache.rs

@@ -0,0 +1 @@
+pub struct CacheDao {}

crates/rs-cms/src/dao/cache/mod.rs

@@ -0,0 +1 @@
+pub mod cache;

crates/rs-cms/src/dao/db/mod.rs

@@ -0,0 +1 @@
+pub mod user;

crates/rs-cms/src/dao/db/user.rs

@@ -0,0 +1,100 @@
+use rs_cms_entity::user;
+use sea_orm::{DatabaseConnection, DbErr};
+
+struct UserDao {
+    conn: DatabaseConnection,
+}
+
+impl UserDao {
+    fn init(&mut self, mut conn: DatabaseConnection) {
+        self.conn = conn
+    }
+
+    fn get_user(&self) -> Result<user::Model, DbErr> {
+        todo!()
+    }
+
+    fn add_user(&mut self) {}
+}
+
+#[cfg(test)]
+mod tests {
+    use sea_orm::{
+        entity::{prelude::*, *},
+        tests_cfg::*,
+        DatabaseBackend, MockDatabase, Transaction,
+    };
+
+    #[async_std::test]
+    async fn test_find_cake() -> Result<(), DbErr> {
+        // Create MockDatabase with mock query results
+        let db = MockDatabase::new(DatabaseBackend::Postgres)
+            .append_query_results(vec![
+                // First query result
+                vec![cake::Model { id: 1, name: "New York Cheese".to_owned() }],
+                // Second query result
+                vec![
+                    cake::Model { id: 1, name: "New York Cheese".to_owned() },
+                    cake::Model { id: 2, name: "Chocolate Forest".to_owned() },
+                ],
+            ])
+            .append_query_results(vec![
+                // Third query result
+                vec![(
+                    cake::Model { id: 1, name: "Apple Cake".to_owned() },
+                    fruit::Model { id: 2, name: "Apple".to_owned(), cake_id: Some(1) },
+                )],
+            ])
+            .into_connection();
+
+        // Find a cake from MockDatabase
+        // Return the first query result
+        assert_eq!(
+            cake::Entity::find().one(&db).await?,
+            Some(cake::Model { id: 1, name: "New York Cheese".to_owned() })
+        );
+
+        // Find all cakes from MockDatabase
+        // Return the second query result
+        assert_eq!(
+            cake::Entity::find().all(&db).await?,
+            vec![
+                cake::Model { id: 1, name: "New York Cheese".to_owned() },
+                cake::Model { id: 2, name: "Chocolate Forest".to_owned() },
+            ]
+        );
+
+        // Find all cakes with its related fruits
+        assert_eq!(
+            cake::Entity::find().find_also_related(fruit::Entity).all(&db).await?,
+            vec![(
+                cake::Model { id: 1, name: "Apple Cake".to_owned() },
+                Some(fruit::Model { id: 2, name: "Apple".to_owned(), cake_id: Some(1) })
+            )]
+        );
+
+        // Checking transaction log
+        assert_eq!(
+            db.into_transaction_log(),
+            vec![
+                Transaction::from_sql_and_values(
+                    DatabaseBackend::Postgres,
+                    r#"SELECT "cake"."id", "cake"."name" FROM "cake" LIMIT $1"#,
+                    vec![1u64.into()]
+                ),
+                Transaction::from_sql_and_values(
+                    DatabaseBackend::Postgres,
+                    r#"SELECT "cake"."id", "cake"."name" FROM "cake""#,
+                    vec![]
+                ),
+                Transaction::from_sql_and_values(
+                    DatabaseBackend::Postgres,
+                    r#"SELECT "cake"."id" AS "A_id", "cake"."name" AS "A_name", "fruit"."id" AS "B_id", "fruit"."name" AS "B_name", "fruit"."cake_id" AS "B_cake_id" FROM "cake" LEFT JOIN "fruit" ON "cake"."id" = "fruit"."cake_id""#,
+                    vec![]
+                ),
+            ]
+        );
+
+        Ok(())
+    }
+}

crates/rs-cms/src/dao/mod.rs

@@ -0,0 +1,2 @@
+pub mod cache;
+pub mod db;

crates/rs-cms/src/lib.rs

@@ -0,0 +1,3 @@
+pub mod dao;
+pub mod service;
+pub mod utils;

crates/rs-cms/src/main.rs

@@ -25,12 +25,13 @@ use axum::{
 use dotenvy::dotenv;
 // use log::{debug, info, warn};
 use crate::service::hello;
-use pretty_env_logger;
+// use pretty_env_logger;
 use serde::{Deserialize, Serialize};
 use std::{
     collections::HashMap,
     env,
     net::SocketAddr,
+    str::FromStr,
     sync::{Arc, RwLock},
     time::Duration,
 };
@@ -40,6 +41,8 @@ use uuid::Uuid;
 mod service;
 mod utils;
 use crate::utils::{route, shutdown};
+// use rs_cms_migration::{Migrator, MigratorTrait};
+use sea_orm::{prelude::*, Database, QueryOrder, Set};
 use tracing::{debug, error, info, warn, Level};
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
@@ -54,9 +57,21 @@ async fn main() {
         .init();
 
     dotenv().ok();
-    for (key, value) in env::vars() {
-        println!("{key}: {value}");
-    }
+    // for (key, value) in env::vars() {
+    //     println!("{key}: {value}");
+    // }
+
+    let db_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file");
+    let host = env::var("HOST").unwrap_or("127.0.0.1".into());
+    let port = env::var("PORT").unwrap_or("4000".into());
+    let server_url = format!("{}:{}", host, port);
+    debug!("db url: {}", db_url);
+
+    // todo x: db conn:
+    let conn = Database::connect(db_url).await.expect("Database connection failed");
+
+    // todo x: migration
+    // Migrator::up(&conn, None).await.unwrap();
 
     debug!("debug print");
     info!("info print");
@@ -98,10 +113,9 @@ async fn main() {
 
     // app.fallback(handler_404());
 
-    let addr = SocketAddr::from(([127, 0, 0, 1], 4000));
-    println!("Listening on http://{}", addr);
+    let addr = SocketAddr::from_str(&server_url).unwrap();
 
-    tracing::debug!("listening on {}", addr);
+    debug!("listening on http://{}", addr);
     axum::Server::bind(&addr)
         .serve(app.into_make_service())
         .with_graceful_shutdown(shutdown::shutdown_signal()) // graceful shutdown

crates/rs-cms/src/service/hello.rs

@@ -123,7 +123,7 @@ pub async fn todos_delete(Path(id): Path<Uuid>, Extension(db): Extension<Db>) ->
     }
 }
 
-pub(crate) type Db = Arc<RwLock<HashMap<Uuid, Todo>>>;
+pub type Db = Arc<RwLock<HashMap<Uuid, Todo>>>;
 
 #[derive(Debug, Serialize, Clone)]
 pub struct Todo {

crates/rs-cms/src/service/mod.rs

@@ -1 +1,2 @@
 pub mod hello;
+pub mod user;

crates/rs-cms/src/service/user.rs

@@ -0,0 +1,9 @@
+pub struct UserService {}
+
+impl UserService {
+    fn new() {}
+
+    pub async fn get_user(&self) {}
+
+    pub async fn add_user(&self) {}
+}