make database calls 1 conn

1 files changed, 36 insertions, 32 deletions

diff --git a/src/types/user.rs b/src/types/user.rs
index 245e9b7..3c4cd6a 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 use tracing::instrument;
 
 use crate::api::RegistrationRequet;
-use crate::database;
+use crate::database::Database;
 use crate::types::http::{ResponseCode, Result};
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -24,21 +24,21 @@ pub const FOLLOWING: u8 = 1;
 pub const FOLLOWED: u8 = 2;
 
 impl User {
-    #[instrument()]
-    pub fn from_user_id(user_id: u64, hide_password: bool) -> Result<Self> {
-        let Ok(Some(user)) = database::users::get_user_by_id(user_id, hide_password) else {
+    #[instrument(skip(db))]
+    pub fn from_user_id(db: &Database, user_id: u64, hide_password: bool) -> Result<Self> {
+        let Ok(Some(user)) = db.get_user_by_id(user_id, hide_password) else {
             return Err(ResponseCode::BadRequest.text("User does not exist"))
         };
 
         Ok(user)
     }
 
-    #[instrument()]
-    pub fn from_user_ids(user_ids: Vec<u64>) -> Vec<Self> {
+    #[instrument(skip(db))]
+    pub fn from_user_ids(db: &Database, user_ids: Vec<u64>) -> Vec<Self> {
         user_ids
             .iter()
             .filter_map(|user_id| {
-                let Ok(Some(user)) = database::users::get_user_by_id(*user_id, true) else {
+                let Ok(Some(user)) = db.get_user_by_id(*user_id, true) else {
                 return None;
             };
                 Some(user)
@@ -46,53 +46,53 @@ impl User {
             .collect()
     }
 
-    #[instrument()]
-    pub fn from_user_page(page: u64) -> Result<Vec<Self>> {
-        let Ok(users) = database::users::get_user_page(page, true) else {
+    #[instrument(skip(db))]
+    pub fn from_user_page(db: &Database, page: u64) -> Result<Vec<Self>> {
+        let Ok(users) = db.get_user_page(page, true) else {
             return Err(ResponseCode::BadRequest.text("Failed to fetch users"))
         };
         Ok(users)
     }
 
-    #[instrument()]
-    pub fn from_email(email: &str) -> Result<Self> {
-        let Ok(Some(user)) = database::users::get_user_by_email(email, false) else {
+    #[instrument(skip(db))]
+    pub fn from_email(db: &Database, email: &str) -> Result<Self> {
+        let Ok(Some(user)) = db.get_user_by_email(email, false) else {
             return Err(ResponseCode::BadRequest.text("User does not exist"))
         };
 
         Ok(user)
     }
 
-    #[instrument()]
-    pub fn from_password(password: &str) -> Result<Self> {
-        let Ok(Some(user)) = database::users::get_user_by_password(password, true) else {
+    #[instrument(skip(db))]
+    pub fn from_password(db: &Database, password: &str) -> Result<Self> {
+        let Ok(Some(user)) = db.get_user_by_password(password, true) else {
             return Err(ResponseCode::BadRequest.text("User does not exist"))
         };
 
         Ok(user)
     }
 
-    #[instrument()]
-    pub fn reterieve_all() -> Result<Vec<Self>> {
-        let Ok(users) = database::users::get_all_users() else {
+    #[instrument(skip(db))]
+    pub fn reterieve_all(db: &Database) -> Result<Vec<Self>> {
+        let Ok(users) = db.get_all_users() else {
             return Err(ResponseCode::InternalServerError.text("Failed to fetch users"))
         };
         Ok(users)
     }
 
-    #[instrument()]
-    pub fn new(request: RegistrationRequet) -> Result<Self> {
-        if Self::from_email(&request.email).is_ok() {
+    #[instrument(skip(db))]
+    pub fn new(db: &Database, request: RegistrationRequet) -> Result<Self> {
+        if Self::from_email(db, &request.email).is_ok() {
             return Err(ResponseCode::BadRequest
                 .text(&format!("Email is already in use by {}", &request.email)));
         }
 
-        if let Ok(user) = Self::from_password(&request.password) {
+        if let Ok(user) = Self::from_password(db, &request.password) {
             return Err(ResponseCode::BadRequest
                 .text(&format!("Password is already in use by {}", user.email)));
         }
 
-        let Ok(user) = database::users::add_user(request) else {
+        let Ok(user) = db.add_user(request) else {
             tracing::error!("Failed to create new user");
             return Err(ResponseCode::InternalServerError.text("Failed to create new uesr"))
         };
@@ -100,8 +100,9 @@ impl User {
         Ok(user)
     }
 
-    pub fn add_following(user_id_1: u64, user_id_2: u64) -> Result<()> {
-        let Ok(followed) = database::friends::set_following(user_id_1, user_id_2) else {
+    #[instrument(skip(db))]
+    pub fn add_following(db: &Database, user_id_1: u64, user_id_2: u64) -> Result<()> {
+        let Ok(followed) = db.set_following(user_id_1, user_id_2) else {
             return Err(ResponseCode::BadRequest.text("Failed to add follow status"))
         };
 
@@ -112,8 +113,9 @@ impl User {
         Ok(())
     }
 
-    pub fn remove_following(user_id_1: u64, user_id_2: u64) -> Result<()> {
-        let Ok(followed) = database::friends::remove_following(user_id_1, user_id_2) else {
+    #[instrument(skip(db))]
+    pub fn remove_following(db: &Database, user_id_1: u64, user_id_2: u64) -> Result<()> {
+        let Ok(followed) = db.remove_following(user_id_1, user_id_2) else {
             return Err(ResponseCode::BadRequest.text("Failed to remove follow status"))
         };
 
@@ -124,15 +126,17 @@ impl User {
         Ok(())
     }
 
-    pub fn get_following(user_id_1: u64, user_id_2: u64) -> Result<u8> {
-        let Ok(followed) = database::friends::get_friend_status(user_id_1, user_id_2) else {
+    #[instrument(skip(db))]
+    pub fn get_following(db: &Database, user_id_1: u64, user_id_2: u64) -> Result<u8> {
+        let Ok(followed) = db.get_friend_status(user_id_1, user_id_2) else {
             return Err(ResponseCode::InternalServerError.text("Failed to get follow status"))
         };
         Ok(followed)
     }
 
-    pub fn get_friends(user_id: u64) -> Result<Vec<Self>> {
-        let Ok(users) = database::friends::get_friends(user_id) else {
+    #[instrument(skip(db))]
+    pub fn get_friends(db: &Database, user_id: u64) -> Result<Vec<Self>> {
+        let Ok(users) = db.get_friends(user_id) else {
             return Err(ResponseCode::InternalServerError.text("Failed to fetch friends"))
         };
         Ok(users)