make database calls 1 conn

1 files changed, 24 insertions, 19 deletions

diff --git a/src/types/post.rs b/src/types/post.rs
index 09f2f50..bff68c7 100644
--- a/src/types/post.rs
+++ b/src/types/post.rs
@@ -2,7 +2,7 @@ use core::fmt;
 use serde::Serialize;
 use tracing::instrument;
 
-use crate::database;
+use crate::database::Database;
 use crate::types::http::{ResponseCode, Result};
 
 use super::comment::Comment;
@@ -27,57 +27,62 @@ impl fmt::Debug for Post {
 }
 
 impl Post {
-    #[instrument()]
-    pub fn from_post_id(self_id: u64, post_id: u64) -> Result<Self> {
-        let Ok(Some(mut post)) = database::posts::get_post(post_id) else {
+    #[instrument(skip(db))]
+    pub fn from_post_id(db: &Database, self_id: u64, post_id: u64) -> Result<Self> {
+        let Ok(Some(mut post)) = db.get_post(post_id) else {
             return Err(ResponseCode::BadRequest.text("Post does not exist"))
         };
 
-        let liked = database::likes::get_liked(self_id, post.post_id).unwrap_or(false);
+        let liked = db.get_liked(self_id, post.post_id).unwrap_or(false);
         post.liked = liked;
 
         Ok(post)
     }
 
-    #[instrument()]
-    pub fn from_post_page(self_id: u64, page: u64) -> Result<Vec<Self>> {
-        let Ok(mut posts) = database::posts::get_post_page(page) else {
+    #[instrument(skip(db))]
+    pub fn from_post_page(db: &Database, self_id: u64, page: u64) -> Result<Vec<Self>> {
+        let Ok(mut posts) = db.get_post_page(page) else {
             return Err(ResponseCode::BadRequest.text("Failed to fetch posts"))
         };
 
         for post in &mut posts {
-            let liked = database::likes::get_liked(self_id, post.post_id).unwrap_or(false);
+            let liked = db.get_liked(self_id, post.post_id).unwrap_or(false);
             post.liked = liked;
         }
 
         Ok(posts)
     }
 
-    #[instrument()]
-    pub fn from_user_post_page(self_id: u64, user_id: u64, page: u64) -> Result<Vec<Self>> {
-        let Ok(mut posts) = database::posts::get_users_post_page(user_id, page) else {
+    #[instrument(skip(db))]
+    pub fn from_user_post_page(
+        db: &Database,
+        self_id: u64,
+        user_id: u64,
+        page: u64,
+    ) -> Result<Vec<Self>> {
+        let Ok(mut posts) = db.get_users_post_page(user_id, page) else {
             return Err(ResponseCode::BadRequest.text("Failed to fetch posts"))
         };
 
         for post in &mut posts {
-            let liked = database::likes::get_liked(self_id, post.post_id).unwrap_or(false);
+            let liked = db.get_liked(self_id, post.post_id).unwrap_or(false);
             post.liked = liked;
         }
 
         Ok(posts)
     }
 
-    #[instrument()]
-    pub fn reterieve_all() -> Result<Vec<Self>> {
-        let Ok(posts) = database::posts::get_all_posts() else {
+    #[instrument(skip(db))]
+    pub fn reterieve_all(db: &Database) -> Result<Vec<Self>> {
+        let Ok(posts) = db.get_all_posts() else {
             return Err(ResponseCode::InternalServerError.text("Failed to fetch posts"))
         };
         Ok(posts)
     }
 
-    #[instrument()]
-    pub fn new(user_id: u64, content: String) -> Result<Self> {
-        let Ok(post) = database::posts::add_post(user_id, &content) else {
+    #[instrument(skip(db))]
+    pub fn new(db: &Database, user_id: u64, content: String) -> Result<Self> {
+        let Ok(post) = db.add_post(user_id, &content) else {
             tracing::error!("Failed to create post");
             return Err(ResponseCode::InternalServerError.text("Failed to create post"))
         };