update

Author: hhstore

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

@@ -5,7 +5,7 @@ use parking_lot::Mutex;
 
 use crate::{
     config::AppConfig,
-    storage::{db::AppSqlStorage, AppEncryptedKVStorage, AppKvStorage},
+    storage::{db::SqlConn, AppEncryptedKVStorage, AppKvStorage},
 };
 
 #[derive(Clone)]
@@ -25,15 +25,15 @@ pub struct AppContext {
     pub kv_enc: Arc<Mutex<AppEncryptedKVStorage>>,
 
     // sqlite3
-    pub sql: Arc<Mutex<AppSqlStorage>>,
+    pub sql: Arc<Mutex<SqlConn>>,
 }
 
 impl AppContext {
     // 单例模式:
     pub async fn global() -> &'static AppContext {
         static DATA: OnceCell<AppContext> = OnceCell::new();
 
-        let sql = AppSqlStorage::default().await;
+        let sql = SqlConn::default().await;
 
         DATA.get_or_init(|| AppContext {
             config: Arc::new(Mutex::new(AppConfig::default())),

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

@@ -3,18 +3,37 @@ use std::{env, str::FromStr};
 use sqlx::{
     migrate::Migrator,
     sqlite::{SqliteConnectOptions, SqlitePool, SqlitePoolOptions},
-    Acquire, ConnectOptions, Error, Executor, Pool, Sqlite,
+    Acquire, ConnectOptions, Executor,
 };
 use tracing::info;
 
-use crate::util;
+use crate::{storage::todo::TodoSqlScope, util};
 
-// kv存储方案:
-pub struct AppSqlStorage {
+// sql storage biz
+
+pub struct AppSqlStorageBiz {
+    pub g: SqlConn,
+
+    // biz units:
+    pub todo: TodoSqlScope,
+}
+
+impl AppSqlStorageBiz {
+    pub async fn new() -> anyhow::Result<Self> {
+        let g = SqlConn::default().await?;
+
+        let todo = TodoSqlScope::new(g.clone());
+
+        Ok(Self { g, todo })
+    }
+}
+
+// kv存储方案: SqlConn
+pub struct SqlConn {
     pub conn: SqlitePool,
 }
 
-impl AppSqlStorage {
+impl SqlConn {
     pub async fn default() -> Self {
         let mut _root_dir = tauri::api::path::document_dir();
 
@@ -142,7 +161,7 @@ mod test {
 
     #[tokio::test]
     async fn test_sqlite() {
-        let mut db = AppSqlStorage::default().await;
+        let mut db = SqlConn::default().await;
         db.init_migrations().await;
 
         // let mut conn = db.db.acquire().await.unwrap();

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

@@ -1,18 +1,18 @@
 use sqlx::{Acquire, Executor, Statement};
 
-use crate::{proto::TodoEntity, storage::db::AppSqlStorage};
+use crate::{proto::TodoEntity, storage::db::SqlConn};
 
-pub struct TodoStorage {
-    pub db: AppSqlStorage,
+pub struct TodoSqlScope {
+    pub g: SqlConn,
 }
 
-impl TodoStorage {
-    pub fn new(db: AppSqlStorage) -> Self {
-        Self { db }
+impl TodoSqlScope {
+    pub fn new(g: SqlConn) -> Self {
+        Self { g }
     }
 
     pub async fn add_todo(&self, todo: &TodoEntity) -> anyhow::Result<i64> {
-        let mut conn = self.db.conn.acquire().await?;
+        let mut conn = self.g.conn.acquire().await?;
 
         // Insert the task, then obtain the ID of this row
         let id = sqlx::query!(
@@ -31,7 +31,7 @@ impl TodoStorage {
     }
 
     pub async fn list_todo(&self) -> anyhow::Result<Vec<TodoEntity>> {
-        let mut conn = self.db.conn.acquire().await?;
+        let mut conn = self.g.conn.acquire().await?;
 
         let rows = sqlx::query!(
             r#"
@@ -59,7 +59,7 @@ ORDER BY id
     }
 
     pub async fn get_todo(&self, id: i64) -> anyhow::Result<TodoEntity> {
-        let mut conn = self.db.conn.acquire().await?;
+        let mut conn = self.g.conn.acquire().await?;
 
         let row =
             sqlx::query!(r#"SELECT id, title, description, completed FROM todos WHERE id = ?"#, id)
@@ -84,11 +84,11 @@ mod test {
 
     use super::*;
 
-    async fn setup() -> TodoStorage {
-        let mut db = AppSqlStorage::new("test.db").await;
+    async fn setup() -> TodoSqlScope {
+        let mut db = SqlConn::new("test.db").await;
         db.init_migrations().await;
 
-        TodoStorage::new(db)
+        TodoSqlScope::new(db)
     }
 
     #[tokio::test]