update

Author: hhstore

crates/rs-tauri-vue/src-tauri/src/service/app.rs

@@ -1,12 +1,44 @@
-use crate::ctx::AppContext;
+use crate::storage::AppStorage;
 
 pub struct AppService {
-    pub ctx: &'static AppContext,
+    pub storage: AppStorage,
 }
 
 impl AppService {
     pub async fn new() -> Self {
-        let ctx = AppContext::global().await;
-        Self { ctx }
+        let storage = AppStorage::new().await;
+        Self { storage }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::proto::TodoEntity;
+
+    use super::*;
+
+    #[tokio::test]
+    async fn test_new_service() {
+        let service = AppService::new().await;
+
+        let ret = service
+            .storage
+            .sql
+            .todo
+            .add_todo(&TodoEntity {
+                id: 0,
+                title: "add todo, by service".to_string(),
+                description: "test desc".to_string(),
+                done: false,
+                completed: false,
+            })
+            .await
+            .unwrap();
+
+        println!("service add todo: {}", ret);
+
+        let todo = service.storage.sql.todo.get_todo(ret).await.unwrap();
+
+        println!("service get todo: {:?}", todo);
     }
 }

crates/rs-tauri-vue/src-tauri/src/storage/mod.rs

@@ -1,5 +1,20 @@
+pub use kv::*;
+pub use sql::*;
+
+use crate::storage::db::AppSqlStorage;
+
 pub mod kv;
 pub mod sql;
 
-pub use kv::*;
-pub use sql::*;
+pub struct AppStorage {
+    pub kv: AppKvStorage,
+    pub sql: AppSqlStorage,
+}
+
+impl AppStorage {
+    pub async fn new() -> Self {
+        let kv = AppKvStorage::default();
+        let sql = AppSqlStorage::new().await;
+        Self { kv, sql }
+    }
+}

crates/rs-tauri-vue/src-tauri/src/storage/sql/db.rs

@@ -11,19 +11,18 @@ use crate::{storage::todo::TodoSqlScope, util};
 
 // sql storage biz
 pub struct AppSqlStorage {
-    pub g: SqlConn,
+    g: SqlConn,
 
     // biz units:
     pub todo: TodoSqlScope,
 }
 
 impl AppSqlStorage {
-    pub async fn new() -> anyhow::Result<Self> {
+    pub async fn new() -> Self {
         let g = SqlConn::default().await;
 
         let todo = TodoSqlScope::new(g.clone());
-
-        Ok(Self { g, todo })
+        Self { g, todo }
     }
 }