From a6d45edd418e42a2fbbeb11c692f983b1d29341d Mon Sep 17 00:00:00 2001
From: didier amyot <didier@nimblerx.com>
Date: Tue, 13 Dec 2022 09:52:49 -0500
Subject: [PATCH] Refactored code into better modules.

---
 src/{ => db}/account.rs    |  8 ++++----
 src/db/mod.rs              |  6 ++++++
 src/{ => db}/securities.rs |  0
 src/{ => db}/users.rs      |  0
 src/main.rs                | 11 +++++------
 5 files changed, 15 insertions(+), 10 deletions(-)
 rename src/{ => db}/account.rs (96%)
 create mode 100644 src/db/mod.rs
 rename src/{ => db}/securities.rs (100%)
 rename src/{ => db}/users.rs (100%)

diff --git a/src/account.rs b/src/db/account.rs
similarity index 96%
rename from src/account.rs
rename to src/db/account.rs
index 5fd92cd..4dbb2e2 100644
--- a/src/account.rs
+++ b/src/db/account.rs
@@ -1,7 +1,7 @@
 use rusqlite::{Connection, params, Result, Row, Transaction};
 
-use crate::securities::Security;
-use crate::users::User;
+use crate::db::securities::Security;
+use crate::db::users::User;
 
 pub struct Account {
     id: i64,
@@ -45,8 +45,8 @@ pub fn create_account(tx: &Transaction, sec: &Security, user: &User) -> Result<A
 #[cfg(test)]
 mod test {
     use rusqlite::{Connection};
-    use crate::users;
-    use crate::securities;
+    use crate::db::users;
+    use crate::db::securities;
     use crate::migration;
 
     use super::*;
diff --git a/src/db/mod.rs b/src/db/mod.rs
new file mode 100644
index 0000000..a9e3cf4
--- /dev/null
+++ b/src/db/mod.rs
@@ -0,0 +1,6 @@
+mod users;
+mod securities;
+mod account;
+
+pub use securities::{list_securities, Security};
+pub use users::{create_user, list_users, User};
\ No newline at end of file
diff --git a/src/securities.rs b/src/db/securities.rs
similarity index 100%
rename from src/securities.rs
rename to src/db/securities.rs
diff --git a/src/users.rs b/src/db/users.rs
similarity index 100%
rename from src/users.rs
rename to src/db/users.rs
diff --git a/src/main.rs b/src/main.rs
index 5d16958..3a330f2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,12 +7,11 @@ use serde::Serialize;
 use simple_logger::SimpleLogger;
 
 use crate::migration::apply_migrations;
-use crate::securities::list_securities;
+use db::list_securities;
+use crate::db::{create_user, list_users};
 
 mod migration;
-mod users;
-mod securities;
-mod account;
+mod db;
 
 #[derive(Debug, Serialize)]
 struct Output<T> {
@@ -269,12 +268,12 @@ impl ProCommandLineLogic {
 impl CommandLineUserLogic for ProCommandLineLogic {
     fn create_user(&mut self, conn: &mut Connection, name: &String, public_key: &String) {
         let tx = conn.transaction().unwrap();
-        users::create_user(& tx, name, public_key);
+        create_user(& tx, name, public_key);
         tx.commit().unwrap();
     }
 
     fn list_user(&mut self, conn: &Connection) {
-        let users = users::list_users(conn);
+        let users = list_users(conn);
         match users {
             Ok(u) => {
                 let out = Output::success(u);