Song queue (#258)

Reviewed-on: #258

src/repo/queue/data.rs

@@ -0,0 +1,98 @@
+use sqlx::Row;
+
+pub async fn insert(
+    pool: &sqlx::PgPool,
+    file_key: &str,
+    bucket: &str,
+    region: &str,
+    song_queue_id: &uuid::Uuid,
+) -> Result<uuid::Uuid, sqlx::Error> {
+    match sqlx::query(
+        r#"
+        INSERT INTO "songQueueData" (file_key, bucket, region, song_queue_id) VALUES($1, $2, $3, $4) RETURNING id;
+        "#,
+    )
+    .bind(file_key)
+    .bind(bucket)
+    .bind(region)
+    .bind(song_queue_id)
+    .fetch_one(pool).await {
+        Ok(row) => {
+            let id: uuid::Uuid = row.try_get("id")?;
+            Ok(id)
+        }
+        Err(_err) => Err(sqlx::Error::RowNotFound),
+    }
+}
+
+pub async fn update_file_key(
+    pool: &sqlx::PgPool,
+    id: &uuid::Uuid,
+    file_key: &str,
+) -> Result<(), sqlx::Error> {
+    match sqlx::query(
+        r#"
+        UPDATE "songQueueData" SET file_key = $1 WHERE id = $2;
+        "#,
+    )
+    .bind(file_key)
+    .bind(id)
+    .execute(pool)
+    .await
+    {
+        Ok(_row) => Ok(()),
+        Err(_) => Err(sqlx::Error::RowNotFound),
+    }
+}
+
+pub async fn get(
+    pool: &sqlx::PgPool,
+    id: &uuid::Uuid,
+) -> Result<(uuid::Uuid, String, String, String, uuid::Uuid), sqlx::Error> {
+    match sqlx::query(
+        r#"
+        SELECT id, file_key, bucket, region, song_queue_id FROM "songQueueData"
+        WHERE id = $1
+        "#,
+    )
+    .bind(id)
+    .fetch_one(pool)
+    .await
+    {
+        Ok(row) => {
+            let file_key: String = row.try_get("file_key")?;
+            let bucket: String = row.try_get("bucket")?;
+            let region: String = row.try_get("region")?;
+            let song_queue_id: uuid::Uuid = row.try_get("song_queue_id")?;
+
+            Ok((*id, file_key, bucket, region, song_queue_id))
+        }
+        Err(err) => Err(err),
+    }
+}
+
+pub async fn get_with_song_queue_id(
+    pool: &sqlx::PgPool,
+    song_queue_id: &uuid::Uuid,
+) -> Result<(uuid::Uuid, String, String, String, uuid::Uuid), sqlx::Error> {
+    match sqlx::query(
+        r#"
+        SELECT id, file_key, bucket, region, song_queue_id FROM "songQueueData"
+        WHERE song_queue_id = $1
+        "#,
+    )
+    .bind(song_queue_id)
+    .fetch_one(pool)
+    .await
+    {
+        Ok(row) => {
+            let id: uuid::Uuid = row.try_get("id")?;
+            let file_key: String = row.try_get("file_key")?;
+            let bucket: String = row.try_get("bucket")?;
+            let region: String = row.try_get("region")?;
+
+            Ok((id, file_key, bucket, region, *song_queue_id))
+        }
+        Err(err) => Err(err),
+    }
+}

src/repo/queue/mod.rs

@@ -1,3 +1,4 @@
 pub mod coverart;
+pub mod data;
 pub mod metadata;
 pub mod song;

src/repo/queue/song.rs

@@ -24,16 +24,14 @@ pub mod dbtype {
 
 pub async fn insert(
     pool: &sqlx::PgPool,
-    data: &Vec<u8>,
     filename: &String,
     status: &String,
 ) -> Result<uuid::Uuid, sqlx::Error> {
     let result = sqlx::query(
         r#"
-        INSERT INTO "songQueue" (data, filename, status) VALUES($1, $2, $3) RETURNING id;
+        INSERT INTO "songQueue" (filename, status) VALUES($1, $2) RETURNING id;
         "#,
     )
-    .bind(data)
     .bind(filename)
     .bind(status)
     .fetch_one(pool)
@@ -253,51 +251,3 @@ pub async fn get_song_queue(
         Err(_err) => Err(sqlx::Error::RowNotFound),
     }
 }
-
-pub async fn wipe_data(pool: &sqlx::PgPool, id: &uuid::Uuid) -> Result<uuid::Uuid, sqlx::Error> {
-    let result = sqlx::query(
-        r#"
-        UPDATE "songQueue" SET data = NULL WHERE id = $1 RETURNING id;
-        "#,
-    )
-    .bind(id)
-    .fetch_one(pool)
-    .await
-    .map_err(|e| {
-        eprintln!("Error updating record: {e}");
-    });
-
-    match result {
-        Ok(row) => Ok(row
-            .try_get("id")
-            .map_err(|_e| sqlx::Error::RowNotFound)
-            .unwrap()),
-        Err(_) => Err(sqlx::Error::RowNotFound),
-    }
-}
-
-pub async fn get_data(pool: &sqlx::PgPool, id: &uuid::Uuid) -> Result<Vec<u8>, sqlx::Error> {
-    let result = sqlx::query(
-        r#"
-        SELECT data FROM "songQueue"
-        WHERE id = $1;
-        "#,
-    )
-    .bind(id)
-    .fetch_one(pool)
-    .await
-    .map_err(|e| {
-        eprintln!("Error inserting: {e}");
-    });
-
-    match result {
-        Ok(row) => {
-            let data = row
-                .try_get("data")
-                .map_err(|_e| sqlx::Error::RowNotFound)
-                .unwrap();
-            Ok(data)
-        }
-        Err(_err) => Err(sqlx::Error::RowNotFound),
-    }
-}