fix: persist db conn

beat-forge · Jul 29, 2023 · 8af6925 · 8af6925
1 parent b5cdf05
commit 8af6925
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/src/cdn.rs b/src/cdn.rs
@@ -6,20 +6,18 @@ use crate::Database;
 
 #[get("/cdn/{slug}@{version}")]
 async fn cdn_get(db: web::Data<Database>, path: web::Path<(String, String)>) -> impl Responder {
-    let db = db.pool.clone();
-
     let (slug, version) = path.into_inner();
     let db_mod = Mods::find()
         .filter(entity::mods::Column::Slug.eq(&slug))
-        .one(&db)
+        .one(&db.pool)
         .await
         .unwrap();
 
     if let Some(db_mod) = db_mod {
         let db_version = Versions::find()
             .filter(entity::versions::Column::ModId.eq(db_mod.id))
             .filter(entity::versions::Column::Version.eq(&version))
-            .one(&db)
+            .one(&db.pool)
             .await
             .unwrap();
 

diff --git a/src/main.rs b/src/main.rs
@@ -66,9 +66,8 @@ lazy_static::lazy_static! {
 
 #[get("/")]
 async fn index(data: web::Data<Database>) -> impl Responder {
-    let db = data.pool.clone();
-    let user_count = entity::users::Entity::find().count(&db).await.unwrap();
-    let mod_count = entity::mods::Entity::find().count(&db).await.unwrap();
+    let user_count = entity::users::Entity::find().count(&data.pool).await.unwrap();
+    let mod_count = entity::mods::Entity::find().count(&data.pool).await.unwrap();
 
     let mut res = String::new();
     res.push_str("<!DOCTYPE html><html><body style=\"background-color: #18181b; color: #ffffff\">");
@@ -103,6 +102,7 @@ async fn main() -> io::Result<()> {
     let mut db_conf = sea_orm::ConnectOptions::new(std::env::var("DATABASE_URL").unwrap());
 
     db_conf.max_connections(20);
+    db_conf.min_connections(5);
     db_conf.sqlx_logging(true);
     db_conf.sqlx_logging_level(log::LevelFilter::Debug);
 

diff --git a/src/mods.rs b/src/mods.rs
@@ -183,8 +183,6 @@ pub async fn create_mod(
     mut payload: web::Payload,
     req: HttpRequest,
 ) -> impl Responder {
-    let db = db.pool.clone();
-
     let auth = req
         .headers()
         .get("Authorization")
@@ -194,7 +192,7 @@ pub async fn create_mod(
     let auser_id;
     if auth.starts_with("Bearer") {
         let auth = Authorization::parse(Some(auth.split(" ").collect::<Vec<_>>()[1].to_string()));
-        let user = auth.get_user(&db).await.unwrap();
+        let user = auth.get_user(&db.pool).await.unwrap();
         if !validate_permissions(&user, Permission::CREATE_MOD).await {
             return HttpResponse::Unauthorized().body("Unauthorized");
         }
@@ -214,7 +212,7 @@ pub async fn create_mod(
 
     let db_cata = Categories::find()
         .filter(entity::categories::Column::Name.eq(forgemod.manifest.category.clone().to_string()))
-        .one(&db)
+        .one(&db.pool)
         .await
         .unwrap();
 
@@ -224,15 +222,15 @@ pub async fn create_mod(
     } else {
         Categories::find()
             .filter(entity::categories::Column::Name.eq("other"))
-            .one(&db)
+            .one(&db.pool)
             .await
             .unwrap()
             .unwrap()
     };
 
     let v_req = forgemod.manifest.game_version.clone();
     let vers = BeatSaberVersions::find()
-        .all(&db)
+        .all(&db.pool)
         .await
         .unwrap()
         .into_iter()
@@ -246,13 +244,13 @@ pub async fn create_mod(
     // see if mod exists; if it does add a new version; if it doesn't create a new mod
     let mby_mod = Mods::find()
         .filter(entity::mods::Column::Slug.eq(forgemod.manifest._id.clone()))
-        .one(&db)
+        .one(&db.pool)
         .await
         .unwrap();
 
     let v_id;
 
-    let trans = db.begin().await.unwrap();
+    let trans = db.pool.begin().await.unwrap();
 
     if let Some(db_mod) = mby_mod {
         let db_mod = db_mod.id;

diff --git a/src/users.rs b/src/users.rs
@@ -157,8 +157,6 @@ pub async fn user_auth(
     data: web::Data<Database>,
     info: web::Query<UserAuthReq>,
 ) -> impl Responder {
-    let db = data.pool.clone();
-
     let code = &info.code;
 
     let gat = minreq::post("https://github.com/login/oauth/access_token")
@@ -187,7 +185,7 @@ pub async fn user_auth(
 
     let mby_user = Users::find()
         .filter(entity::users::Column::GithubId.eq(github_user.id as i32))
-        .one(&db)
+        .one(&data.pool)
         .await
         .unwrap();
 
@@ -202,18 +200,16 @@ pub async fn user_auth(
             ..Default::default()
         };
 
-        Users::insert(usr).exec(&db).await.unwrap();
+        Users::insert(usr).exec(&data.pool).await.unwrap();
     }
 
     let user = Users::find()
         .filter(entity::users::Column::GithubId.eq(github_user.id as i32))
-        .one(&db)
+        .one(&data.pool)
         .await
         .unwrap()
         .unwrap();
 
-    db.close().await.unwrap();
-
     let jwt = JWTAuth::new(user).encode(*KEY.clone());
 
     HttpResponse::Ok().json(json!({ "jwt": jwt }))