From f17e38c53184b098ca7758ba6cc62b86d20f0557 Mon Sep 17 00:00:00 2001
From: Aravinth Manivannan <realaravinth@batsense.net>
Date: Fri, 20 Oct 2023 02:38:14 +0530
Subject: [PATCH] fix: dont use mod db while migrating with tests-migrate

---
 src/api/v1/mcaptcha/hooks.rs | 11 ++++++-----
 src/tests-migrate.rs         |  5 +----
 src/tests.rs                 | 11 ++++++-----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/api/v1/mcaptcha/hooks.rs b/src/api/v1/mcaptcha/hooks.rs
index 6c40d5a..42a3aa4 100644
--- a/src/api/v1/mcaptcha/hooks.rs
+++ b/src/api/v1/mcaptcha/hooks.rs
@@ -127,9 +127,9 @@ async fn download(
 
 #[cfg(test)]
 mod tests {
+    use super::Secret;
     use crate::api::v1::get_random;
     use crate::mcaptcha::PerformanceAnalytics;
-    use super::Secret;
     use crate::tests::*;
     use crate::*;
 
@@ -228,11 +228,12 @@ mod tests {
         assert_eq!(resp.status(), StatusCode::CREATED);
         let job: super::UploadJobCreated = test::read_body_json(resp).await;
         loop {
-            if data.get_job(&job.id).await.unwrap().unwrap().state
-                == *crate::db::JOB_STATE_FINISH
-            {
-                break;
+            if let Some(job) = data.get_job(&job.id).await.unwrap() {
+                if job.state == *crate::db::JOB_STATE_FINISH {
+                    break;
+                }
             }
+
             tokio::time::sleep(std::time::Duration::new(1, 0)).await;
         }
 
diff --git a/src/tests-migrate.rs b/src/tests-migrate.rs
index 338f6e9..b21b85c 100644
--- a/src/tests-migrate.rs
+++ b/src/tests-migrate.rs
@@ -18,7 +18,6 @@ use std::env;
 
 use sqlx::postgres::PgPoolOptions;
 
-mod db;
 mod settings;
 
 pub use settings::Settings;
@@ -41,9 +40,7 @@ async fn main() {
         }
     }
 
-    db::migrate_db(&db).await.unwrap();
-
-    //    sqlx::migrate!("./migrations/").run(&db).await.unwrap();
+    sqlx::migrate!("./migrations/").run(&db).await.unwrap();
 }
 
 fn build() {
diff --git a/src/tests.rs b/src/tests.rs
index 286b8d0..9c168b0 100644
--- a/src/tests.rs
+++ b/src/tests.rs
@@ -48,10 +48,9 @@ pub async fn get_test_data_with_mcaptcha_client(
     settings.publish.dir = tmp_dir.join("base_path").to_str().unwrap().into();
     settings.allow_registration = true;
     let test_mcaptcha = crate::mcaptcha::tests::TestClient::default();
-    (
-        Data::new(settings, Box::new(test_mcaptcha.clone())).await,
-        test_mcaptcha,
-    )
+    let data = Data::new(settings, Box::new(test_mcaptcha.clone())).await;
+    db::migrate_db(&data.db).await.unwrap();
+    (data, test_mcaptcha)
 }
 
 pub async fn get_test_data() -> Arc<Data> {
@@ -60,7 +59,9 @@ pub async fn get_test_data() -> Arc<Data> {
     settings.publish.dir = tmp_dir.join("base_path").to_str().unwrap().into();
     settings.allow_registration = true;
     let test_mcaptcha = Box::new(crate::mcaptcha::tests::TestClient::default());
-    Data::new(settings, test_mcaptcha).await
+    let data = Data::new(settings, test_mcaptcha).await;
+    db::migrate_db(&data.db).await.unwrap();
+    data
 }
 
 #[macro_export]