Start extracting DBContext

crates/yaak-models/src/query_manager.rs

@@ -1,11 +1,11 @@
-use crate::connection_or_tx::ConnectionOrTx;
-use crate::db_context::DbContext;
+use crate::client_db::ClientDb;
 use crate::error::Error::GenericError;
 use crate::util::ModelPayload;
 use r2d2::Pool;
 use r2d2_sqlite::SqliteConnectionManager;
 use rusqlite::TransactionBehavior;
 use std::sync::{Arc, Mutex, mpsc};
+use yaak_database::{ConnectionOrTx, DbContext};
 
 #[derive(Debug, Clone)]
 pub struct QueryManager {
@@ -18,19 +18,20 @@ impl QueryManager {
         QueryManager { pool: Arc::new(Mutex::new(pool)), events_tx }
     }
 
-    pub fn connect(&self) -> DbContext<'_> {
+    pub fn connect(&self) -> ClientDb<'_> {
         let conn = self
             .pool
             .lock()
             .expect("Failed to gain lock on DB")
             .get()
             .expect("Failed to get a new DB connection from the pool");
-        DbContext { _events_tx: self.events_tx.clone(), conn: ConnectionOrTx::Connection(conn) }
+        let ctx = DbContext::new(ConnectionOrTx::Connection(conn));
+        ClientDb::new(ctx, self.events_tx.clone())
     }
 
     pub fn with_conn<F, T>(&self, func: F) -> T
     where
-        F: FnOnce(&DbContext) -> T,
+        F: FnOnce(&ClientDb) -> T,
     {
         let conn = self
             .pool
@@ -39,17 +40,15 @@ impl QueryManager {
             .get()
             .expect("Failed to get new DB connection from the pool");
 
-        let db_context = DbContext {
-            _events_tx: self.events_tx.clone(),
-            conn: ConnectionOrTx::Connection(conn),
-        };
+        let ctx = DbContext::new(ConnectionOrTx::Connection(conn));
+        let db = ClientDb::new(ctx, self.events_tx.clone());
 
-        func(&db_context)
+        func(&db)
     }
 
     pub fn with_tx<T, E>(
         &self,
-        func: impl FnOnce(&DbContext) -> std::result::Result<T, E>,
+        func: impl FnOnce(&ClientDb) -> std::result::Result<T, E>,
     ) -> std::result::Result<T, E>
     where
         E: From<crate::error::Error>,
@@ -64,12 +63,10 @@ impl QueryManager {
             .transaction_with_behavior(TransactionBehavior::Immediate)
             .expect("Failed to start DB transaction");
 
-        let db_context = DbContext {
-            _events_tx: self.events_tx.clone(),
-            conn: ConnectionOrTx::Transaction(&tx),
-        };
+        let ctx = DbContext::new(ConnectionOrTx::Transaction(&tx));
+        let db = ClientDb::new(ctx, self.events_tx.clone());
 
-        match func(&db_context) {
+        match func(&db) {
             Ok(val) => {
                 tx.commit()
                     .map_err(|e| GenericError(format!("Failed to commit transaction {e:?}")))?;