Refactored db directory

service/src/auth/model.rs

@@ -6,7 +6,7 @@ use redis::Commands;
 use serde::{Serialize, Deserialize};
 use siren::ServiceError;
 
-use crate::db::schema::users;
+use crate::storage::{schema::users, connection};
 
 use super::{hash_password, verify_token};
 
@@ -27,6 +27,8 @@ impl RegisterUser {
       role: "user".to_string(),
       first_name: self.first_name,
       last_name: self.last_name,
+      updated_at: chrono::Utc::now().naive_utc(),
+      created_at: chrono::Utc::now().naive_utc(),
       verified: false,
     })
   }
@@ -46,12 +48,14 @@ pub struct QueryUser {
   pub role: String,
   pub first_name: String,
   pub last_name: String,
+  pub updated_at: chrono::NaiveDateTime,
+  pub created_at: chrono::NaiveDateTime,
   pub verified: bool,
 }
 
 impl QueryUser {
   pub fn get_by_email(email: &str) -> Result<QueryUser, ServiceError> {
-    let mut conn = crate::db::connection()?;
+    let mut conn = connection()?;
     // Check if the user exists by email, case insensitive
 
     let user = users::table
@@ -69,12 +73,14 @@ pub struct InsertUser {
   pub role: String,
   pub first_name: String,
   pub last_name: String,
+  pub updated_at: chrono::NaiveDateTime,
+  pub created_at: chrono::NaiveDateTime,
   pub verified: bool,
 }
 
 impl InsertUser {
   pub fn insert(user: Self) -> Result<QueryUser, ServiceError> {
-    let mut conn = crate::db::connection()?;
+    let mut conn = connection()?;
     let user = diesel::insert_into(users::table)
       .values(user)
       .get_result(&mut conn)?;
@@ -141,7 +147,7 @@ impl FromRequest for JwtAuth {
 
     let access_token_uuid = uuid::Uuid::parse_str(&access_token_details.token_uuid.to_string()).unwrap();
     
-    let mut conn = match crate::db::redis_connection() {
+    let mut conn = match crate::storage::redis_connection() {
       Ok(conn) => conn,
       Err(err) => {
         error!("Failed to get redis connection: {}", err);