cargo sqlx prepare improvement

src/queue/payouts.rs

@@ -10,6 +10,7 @@ use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use sha2::Sha256;
+use sqlx::postgres::PgQueryResult;
 use sqlx::PgPool;
 use std::collections::HashMap;
 
@@ -550,3 +551,25 @@ pub async fn process_payout(
 
     Ok(())
 }
+
+// Used for testing, should be the same as the above function
+pub async fn insert_payouts(
+    insert_user_ids: Vec<i64>,
+    insert_project_ids: Vec<i64>,
+    insert_payouts: Vec<Decimal>,
+    insert_starts: Vec<DateTime<Utc>>,
+    transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
+) -> sqlx::Result<PgQueryResult> {
+    sqlx::query!(
+        "
+        INSERT INTO payouts_values (user_id, mod_id, amount, created)
+        SELECT * FROM UNNEST ($1::bigint[], $2::bigint[], $3::numeric[], $4::timestamptz[])
+        ",
+        &insert_user_ids[..],
+        &insert_project_ids[..],
+        &insert_payouts[..],
+        &insert_starts[..]
+    )
+    .execute(&mut **transaction)
+    .await
+}

tests/analytics.rs

@@ -10,6 +10,7 @@ use common::{
 use itertools::Itertools;
 use labrinth::models::ids::base62_impl::parse_base62;
 use labrinth::models::teams::ProjectPermissions;
+use labrinth::queue::payouts;
 use rust_decimal::{prelude::ToPrimitive, Decimal};
 
 mod common;
@@ -55,19 +56,17 @@ pub async fn analytics_revenue() {
             insert_starts.push(*time);
         }
 
-        sqlx::query!(
-            "
-            INSERT INTO payouts_values (user_id, mod_id, amount, created)
-            SELECT * FROM UNNEST ($1::bigint[], $2::bigint[], $3::numeric[], $4::timestamptz[])
-            ",
-            &insert_user_ids[..],
-            &insert_project_ids[..],
-            &insert_payouts[..],
-            &insert_starts[..]
+        let mut transaction = pool.begin().await.unwrap();
+        payouts::insert_payouts(
+            insert_user_ids,
+            insert_project_ids,
+            insert_payouts,
+            insert_starts,
+            &mut transaction,
         )
-        .execute(&pool)
         .await
         .unwrap();
+        transaction.commit().await.unwrap();
 
         let day = 86400;