Removing hard coded user_id (#38)

Reviewed-on: #38
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

Cargo.lock

@@ -1255,7 +1255,7 @@ dependencies = [
 
 [[package]]
 name = "songparser"
-version = "0.2.1"
+version = "0.2.3"
 dependencies = [
  "futures",
  "icarus_envy",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "songparser"
-version = "0.2.1"
+version = "0.2.3"
 edition = "2024"
 rust-version = "1.88"
 

src/main.rs

@@ -21,17 +21,31 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                     println!("Queue is not empty");
                     println!("SongQueueItem: {song_queue_item:?}");
                     let song_queue_id = song_queue_item.data[0].id;
+                    let user_id = song_queue_item.data[0].user_id;
 
                     // TODO: Do something with the result later
-                    match some_work(&app_base_url, &song_queue_id).await {
+                    match some_work(&app_base_url, &song_queue_id, &user_id).await {
                         Ok((
-                            song,
-                            coverart,
+                            _song,
+                            _coverart,
                             (song_queue_id, song_queue_path),
                             (coverart_queue_id, coverart_queue_path),
                         )) => {
                             // TODO: Wipe data from song and coverart queues
-                            // TODO: Cleanup files in local filesystem
+                            match wipe_data_from_queues(
+                                &app_base_url,
+                                &song_queue_id,
+                                &coverart_queue_id,
+                            )
+                            .await
+                            {
+                                Ok(_) => {
+                                    // TODO: Cleanup files in local filesystem
+                                }
+                                Err(err) => {
+                                    eprintln!("Error: {err:?}");
+                                }
+                            }
                         }
                         Err(err) => {
                             eprintln!("Error: {err:?}");
@@ -51,6 +65,41 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     }
 }
 
+async fn wipe_data_from_queues(
+    app_base_url: &String,
+    song_queue_id: &uuid::Uuid,
+    coverart_queue_id: &uuid::Uuid,
+) -> Result<(), std::io::Error> {
+    match the_rest::wipe_data::song_queue::wipe_data(app_base_url, song_queue_id).await {
+        Ok(response) => match response
+            .json::<the_rest::wipe_data::song_queue::response::Response>()
+            .await
+        {
+            Ok(_resp) => match the_rest::wipe_data::coverart_queue::wipe_data(
+                app_base_url,
+                coverart_queue_id,
+            )
+            .await
+            {
+                Ok(inner_response) => match inner_response
+                    .json::<the_rest::wipe_data::coverart_queue::response::Response>()
+                    .await
+                {
+                    Ok(_inner_resp) => {
+                        println!("Wiped data from CoverArt queue");
+                        println!("Resp: {_inner_resp:?}");
+                        Ok(())
+                    }
+                    Err(err) => Err(std::io::Error::other(err.to_string())),
+                },
+                Err(err) => Err(std::io::Error::other(err.to_string())),
+            },
+            Err(err) => Err(std::io::Error::other(err.to_string())),
+        },
+        Err(err) => Err(std::io::Error::other(err.to_string())),
+    }
+}
+
 async fn is_queue_empty(
     api_url: &String,
 ) -> Result<(bool, responses::fetch_next_queue_item::SongQueueItem), reqwest::Error> {
@@ -77,6 +126,7 @@ async fn is_queue_empty(
 async fn some_work(
     app_base_url: &String,
     song_queue_id: &uuid::Uuid,
+    user_id: &uuid::Uuid,
 ) -> Result<
     (
         icarus_models::song::Song,
@@ -105,16 +155,13 @@ async fn some_work(
                                 Ok(_inner_response) => {
                                     println!("Response: {_inner_response:?}");
 
-                                    // TODO: Do not hard code this. Check if one of the existing
-                                    // endpoints already have the user_id
-                                    let user_id = uuid::Uuid::new_v4();
                                     // TODO: Place this somewhere else
                                     let song_type = String::from("flac");
-                                    // Err(std::io::Error::other(err.to_string()))
+
                                     match the_rest::create_song::create(
                                         app_base_url,
                                         &metadata,
-                                        &user_id,
+                                        user_id,
                                         &song_type,
                                     )
                                     .await

src/responses.rs

@@ -6,6 +6,7 @@ pub mod fetch_next_queue_item {
         pub id: uuid::Uuid,
         pub filename: String,
         pub status: String,
+        pub user_id: uuid::Uuid,
     }
 
     #[derive(Debug, Deserialize, Serialize)]

src/the_rest.rs

@@ -1,6 +1,5 @@
 // TODO: Refactor this file when this app is functional
 
-// TODO: Create song
 pub mod create_song {
     pub async fn create(
         base_url: &String,
@@ -44,7 +43,6 @@ pub mod create_song {
     }
 }
 
-// TODO: Create coverart
 pub mod create_coverart {
 
     pub async fn create(
@@ -76,5 +74,52 @@ pub mod create_coverart {
     }
 }
 
-// TODO: Wipe data from queued song
-// TODO: Wipe data from queued coverart
+pub mod wipe_data {
+    pub mod song_queue {
+        pub async fn wipe_data(
+            base_url: &String,
+            song_queue_id: &uuid::Uuid,
+        ) -> Result<reqwest::Response, reqwest::Error> {
+            let client = reqwest::Client::builder().build()?;
+            let url = format!("{base_url}/api/v2/song/queue/data/wipe");
+            let payload = serde_json::json!({
+                "song_queue_id": song_queue_id
+            });
+            let request = client.patch(url).json(&payload);
+
+            request.send().await
+        }
+
+        pub mod response {
+            #[derive(Debug, serde::Deserialize, serde::Serialize)]
+            pub struct Response {
+                pub message: String,
+                pub data: Vec<uuid::Uuid>,
+            }
+        }
+    }
+    // TODO: Wipe data from queued coverart
+    pub mod coverart_queue {
+        pub async fn wipe_data(
+            base_url: &String,
+            coverart_queue_id: &uuid::Uuid,
+        ) -> Result<reqwest::Response, reqwest::Error> {
+            let client = reqwest::Client::builder().build()?;
+            let url = format!("{base_url}/api/v2/coverart/queue/data/wipe");
+            let payload = serde_json::json!({
+                "coverart_queue_id": coverart_queue_id
+            });
+            let request = client.patch(url).json(&payload);
+
+            request.send().await
+        }
+
+        pub mod response {
+            #[derive(Debug, serde::Deserialize, serde::Serialize)]
+            pub struct Response {
+                pub message: String,
+                pub data: Vec<uuid::Uuid>,
+            }
+        }
+    }
+}