From aec4fdecc10be35cde5dc42308960f10bc452187 Mon Sep 17 00:00:00 2001
From: Tyler Murphy <tylermurphy534@gmail.com>
Date: Wed, 15 Feb 2023 00:01:44 -0500
Subject: make database calls 1 conn

---
 src/types/session.rs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/types/session.rs')

diff --git a/src/types/session.rs b/src/types/session.rs
index a9073aa..27c5c66 100644
--- a/src/types/session.rs
+++ b/src/types/session.rs
@@ -2,7 +2,7 @@ use rand::{distributions::Alphanumeric, Rng};
 use serde::Serialize;
 use tracing::instrument;
 
-use crate::database;
+use crate::database::Database;
 use crate::types::http::{ResponseCode, Result};
 
 #[derive(Serialize)]
@@ -12,39 +12,39 @@ pub struct Session {
 }
 
 impl Session {
-    #[instrument()]
-    pub fn from_token(token: &str) -> Result<Self> {
-        let Ok(Some(session)) = database::sessions::get_session(token) else {
+    #[instrument(skip(db))]
+    pub fn from_token(db: &Database, token: &str) -> Result<Self> {
+        let Ok(Some(session)) = db.get_session(token) else {
             return Err(ResponseCode::BadRequest.text("Invalid auth token"));
         };
 
         Ok(session)
     }
 
-    #[instrument()]
-    pub fn reterieve_all() -> Result<Vec<Self>> {
-        let Ok(sessions) = database::sessions::get_all_sessions() else {
+    #[instrument(skip(db))]
+    pub fn reterieve_all(db: &Database) -> Result<Vec<Self>> {
+        let Ok(sessions) = db.get_all_sessions() else {
             return Err(ResponseCode::InternalServerError.text("Failed to fetch sessions"))
         };
         Ok(sessions)
     }
 
-    #[instrument()]
-    pub fn new(user_id: u64) -> Result<Self> {
+    #[instrument(skip(db))]
+    pub fn new(db: &Database, user_id: u64) -> Result<Self> {
         let token: String = rand::thread_rng()
             .sample_iter(&Alphanumeric)
             .take(32)
             .map(char::from)
             .collect();
-        match database::sessions::set_session(user_id, &token) {
+        match db.set_session(user_id, &token) {
             Err(_) => Err(ResponseCode::BadRequest.text("Failed to create session")),
             Ok(_) => Ok(Self { user_id, token }),
         }
     }
 
-    #[instrument()]
-    pub fn delete(user_id: u64) -> Result<()> {
-        if database::sessions::delete_session(user_id).is_err() {
+    #[instrument(skip(db))]
+    pub fn delete(db: &Database, user_id: u64) -> Result<()> {
+        if db.delete_session(user_id).is_err() {
             tracing::error!("Failed to logout user");
             return Err(ResponseCode::InternalServerError.text("Failed to logout"));
         };
-- 
cgit v1.2.3-freya