From aec4fdecc10be35cde5dc42308960f10bc452187 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Wed, 15 Feb 2023 00:01:44 -0500 Subject: make database calls 1 conn --- src/public/admin.rs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/public/admin.rs') diff --git a/src/public/admin.rs b/src/public/admin.rs index bf0a155..6e32152 100644 --- a/src/public/admin.rs +++ b/src/public/admin.rs @@ -5,6 +5,7 @@ use tokio::sync::Mutex; use crate::{ console::sanatize, + database::Database, types::{ comment::Comment, http::ResponseCode, like::Like, post::Post, session::Session, user::User, }, @@ -36,8 +37,8 @@ pub async fn regen_secret() -> String { secret.clone() } -pub fn generate_users() -> Response { - let users = match User::reterieve_all() { +pub fn generate_users(db: &Database) -> Response { + let users = match User::reterieve_all(db) { Ok(users) => users, Err(err) => return err, }; @@ -70,8 +71,8 @@ pub fn generate_users() -> Response { ResponseCode::Success.text(&html) } -pub fn generate_posts() -> Response { - let posts = match Post::reterieve_all() { +pub fn generate_posts(db: &Database) -> Response { + let posts = match Post::reterieve_all(db) { Ok(posts) => posts, Err(err) => return err, }; @@ -99,8 +100,8 @@ pub fn generate_posts() -> Response { ResponseCode::Success.text(&html) } -pub fn generate_sessions() -> Response { - let sessions = match Session::reterieve_all() { +pub fn generate_sessions(db: &Database) -> Response { + let sessions = match Session::reterieve_all(db) { Ok(sessions) => sessions, Err(err) => return err, }; @@ -123,8 +124,8 @@ pub fn generate_sessions() -> Response { ResponseCode::Success.text(&html) } -pub fn generate_comments() -> Response { - let comments = match Comment::reterieve_all() { +pub fn generate_comments(db: &Database) -> Response { + let comments = match Comment::reterieve_all(db) { Ok(comments) => comments, Err(err) => return err, }; @@ -154,8 +155,8 @@ pub fn generate_comments() -> Response { ResponseCode::Success.text(&html) } -pub fn generate_likes() -> Response { - let likes = match Like::reterieve_all() { +pub fn generate_likes(db: &Database) -> Response { + let likes = match Like::reterieve_all(db) { Ok(likes) => likes, Err(err) => return err, }; -- cgit v1.2.3-freya