From d72ed532c159c7b8d0024301f774e894044a506f Mon Sep 17 00:00:00 2001
From: Ethan Girouard <ethan@girouard.com>
Date: Tue, 4 Feb 2025 22:54:06 -0500
Subject: [PATCH] Move database to util

---
 src/api/album.rs           | 2 +-
 src/api/albums.rs          | 2 +-
 src/api/artists.rs         | 2 +-
 src/api/history.rs         | 2 +-
 src/api/profile.rs         | 2 +-
 src/api/songs.rs           | 2 +-
 src/lib.rs                 | 1 -
 src/main.rs                | 2 +-
 src/models.rs              | 2 +-
 src/search.rs              | 2 +-
 src/upload.rs              | 2 +-
 src/users.rs               | 2 +-
 src/{ => util}/database.rs | 7 -------
 src/util/mod.rs            | 1 +
 14 files changed, 12 insertions(+), 19 deletions(-)
 rename src/{ => util}/database.rs (98%)

diff --git a/src/api/album.rs b/src/api/album.rs
index 8b5b4be..88ffc36 100644
--- a/src/api/album.rs
+++ b/src/api/album.rs
@@ -7,7 +7,7 @@ use cfg_if::cfg_if;
 cfg_if! {
 	if #[cfg(feature = "ssr")] {
 		use leptos::server_fn::error::NoCustomError;
-		use crate::database::get_db_conn;
+		use crate::util::database::get_db_conn;
 	}
 }
 
diff --git a/src/api/albums.rs b/src/api/albums.rs
index 1522a3b..a399575 100644
--- a/src/api/albums.rs
+++ b/src/api/albums.rs
@@ -4,7 +4,7 @@ use cfg_if::cfg_if;
 
 cfg_if! {
     if #[cfg(feature = "ssr")] {
-        use crate::database::get_db_conn;
+        use crate::util::database::get_db_conn;
         use diesel::prelude::*;
         use chrono::NaiveDate;
     }
diff --git a/src/api/artists.rs b/src/api/artists.rs
index c085084..2cea05f 100644
--- a/src/api/artists.rs
+++ b/src/api/artists.rs
@@ -8,7 +8,7 @@ use crate::songdata::SongData;
 
 cfg_if! {
     if #[cfg(feature = "ssr")] {
-        use crate::database::get_db_conn;
+        use crate::util::database::get_db_conn;
         use diesel::prelude::*;
         use std::collections::HashMap;
         use server_fn::error::NoCustomError;
diff --git a/src/api/history.rs b/src/api/history.rs
index cfa543e..5a66cd5 100644
--- a/src/api/history.rs
+++ b/src/api/history.rs
@@ -8,7 +8,7 @@ use cfg_if::cfg_if;
 cfg_if! {
 	if #[cfg(feature = "ssr")] {
 		use leptos::server_fn::error::NoCustomError;
-		use crate::database::get_db_conn;
+		use crate::util::database::get_db_conn;
 		use crate::auth::get_user;
 	}
 }
diff --git a/src/api/profile.rs b/src/api/profile.rs
index 24fd34d..2f83350 100644
--- a/src/api/profile.rs
+++ b/src/api/profile.rs
@@ -13,7 +13,7 @@ cfg_if! {
 		use crate::auth::get_user;
 		use server_fn::error::NoCustomError;
 
-		use crate::database::get_db_conn;
+		use crate::util::database::get_db_conn;
 		use diesel::prelude::*;
 		use diesel::dsl::count;
 		use crate::models::*;
diff --git a/src/api/songs.rs b/src/api/songs.rs
index cb491b4..9c3faf7 100644
--- a/src/api/songs.rs
+++ b/src/api/songs.rs
@@ -8,7 +8,7 @@ use crate::songdata::SongData;
 cfg_if! {
 	if #[cfg(feature = "ssr")] {
 		use leptos::server_fn::error::NoCustomError;
-		use crate::database::get_db_conn;
+		use crate::util::database::get_db_conn;
 		use crate::auth::get_user;
 		use crate::models::{Song, Album, Artist};
 		use diesel::prelude::*;
diff --git a/src/lib.rs b/src/lib.rs
index 04ae090..50308cf 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,6 @@ pub mod albumdata;
 pub mod artistdata;
 pub mod playstatus;
 pub mod playbar;
-pub mod database;
 pub mod queue;
 pub mod song;
 pub mod models;
diff --git a/src/main.rs b/src/main.rs
index 171be81..3da726a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -37,7 +37,7 @@ async fn main() {
     debug!("Running database migrations...");
 
     // Bring the database up to date
-    libretunes::database::migrate();
+    libretunes::util::database::migrate();
 
     debug!("Connecting to Redis...");
 
diff --git a/src/models.rs b/src/models.rs
index 11c5408..f02847d 100644
--- a/src/models.rs
+++ b/src/models.rs
@@ -6,7 +6,7 @@ use cfg_if::cfg_if;
 cfg_if! {
 	if #[cfg(feature = "ssr")] {
 		use diesel::prelude::*;
-		use crate::database::*;
+		use crate::util::database::*;
 		use std::error::Error;
 		use crate::songdata::SongData;
 		use crate::albumdata::AlbumData;
diff --git a/src/search.rs b/src/search.rs
index 13e7a33..4f99c01 100644
--- a/src/search.rs
+++ b/src/search.rs
@@ -10,7 +10,7 @@ if #[cfg(feature = "ssr")] {
 	use diesel::pg::Pg;
 	use diesel::expression::AsExpression;
 
-	use crate::database::get_db_conn;
+	use crate::util::database::get_db_conn;
 
 	// Define pg_trgm operators
 	// Functions do not use indices for queries, so we need to use operators
diff --git a/src/upload.rs b/src/upload.rs
index bcafb0e..71bdb98 100644
--- a/src/upload.rs
+++ b/src/upload.rs
@@ -6,7 +6,7 @@ use cfg_if::cfg_if;
 cfg_if! {
 	if #[cfg(feature = "ssr")] {
 		use multer::Field;
-		use crate::database::get_db_conn;
+		use crate::util::database::get_db_conn;
 		use diesel::prelude::*;
 		use log::*;
 		use server_fn::error::NoCustomError;
diff --git a/src/users.rs b/src/users.rs
index c32ab3f..8f769c1 100644
--- a/src/users.rs
+++ b/src/users.rs
@@ -1,7 +1,7 @@
 cfg_if::cfg_if! {
 	if #[cfg(feature = "ssr")] {
 		use diesel::prelude::*;
-		use crate::database::get_db_conn;
+		use crate::util::database::get_db_conn;
 
 		use pbkdf2::{
 			password_hash::{
diff --git a/src/database.rs b/src/util/database.rs
similarity index 98%
rename from src/database.rs
rename to src/util/database.rs
index 6ec58cc..ab94abd 100644
--- a/src/database.rs
+++ b/src/util/database.rs
@@ -1,7 +1,3 @@
-use cfg_if::cfg_if;
-
-cfg_if! {
-if #[cfg(feature = "ssr")] {
 use leptos::logging::log;
 
 use lazy_static::lazy_static;
@@ -110,6 +106,3 @@ pub fn migrate() {
     let db_con = &mut get_db_conn();
     db_con.run_pending_migrations(DB_MIGRATIONS).expect("Could not run database migrations");
 }
-
-}
-}
diff --git a/src/util/mod.rs b/src/util/mod.rs
index cf32fb4..321385f 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -5,6 +5,7 @@ cfg_if! {
 		pub mod audio;
 		pub mod require_auth;
 		pub mod fileserv;
+		pub mod database;
 	}
 }