From 49a4579c7c1af662205b90fbf56b0f9192a7d95f Mon Sep 17 00:00:00 2001 From: KD Date: Fri, 25 Apr 2025 20:40:57 -0400 Subject: [PATCH 1/9] Added code to fetch next queue item --- src/callers/mod.rs | 1 + src/callers/song.rs | 75 ++++++++++++++++++++++++++++++++++++++++++++- src/main.rs | 3 ++ 3 files changed, 78 insertions(+), 1 deletion(-) diff --git a/src/callers/mod.rs b/src/callers/mod.rs index 5abbb9f..e6ff83a 100644 --- a/src/callers/mod.rs +++ b/src/callers/mod.rs @@ -3,5 +3,6 @@ pub mod song; pub mod endpoints { pub const QUEUESONG: &str = "/api/v2/song/queue"; + pub const NEXTQUEUESONG: &str = "/api/v2/song/queue/next"; pub const QUEUEMETADATA: &str = "/api/v2/song/metadata/queue"; } diff --git a/src/callers/song.rs b/src/callers/song.rs index 0f89887..f436340 100644 --- a/src/callers/song.rs +++ b/src/callers/song.rs @@ -15,6 +15,16 @@ pub mod response { pub message: String, pub data: Vec, } + + pub mod fetch_queue_song { + use serde::{Deserialize, Serialize}; + + #[derive(Default, Deserialize, Serialize)] + pub struct Response { + pub message: String, + pub data: Vec, + } + } } mod song_queue { @@ -23,7 +33,7 @@ mod song_queue { pub mod status { pub const PENDING: &str = "pending"; // Will be used later on - pub const _PROCESSING: &str = "processing"; + pub const PROCESSING: &str = "processing"; pub const _DONE: &str = "done"; } @@ -32,6 +42,14 @@ mod song_queue { pub id: uuid::Uuid, } + #[derive(Debug, serde::Deserialize, serde::Serialize, sqlx::FromRow)] + pub struct SongQueue { + pub id: uuid::Uuid, + pub filename: String, + pub status: String, + pub data: Vec, + } + pub async fn insert( pool: &sqlx::PgPool, data: &Vec, @@ -63,6 +81,46 @@ mod song_queue { Err(_err) => Err(sqlx::Error::RowNotFound), } } + + pub async fn get_most_recent_and_update( + pool: &sqlx::PgPool, + ) -> Result { + let result = sqlx::query( + r#" + UPDATE "songQueue" + SET status = $1 + WHERE id = ( + SELECT id FROM "songQueue" + WHERE status = $2 + ORDER BY id + FOR UPDATE SKIP LOCKED + LIMIT 1 + ) + RETURNING *; + "#, + ) + .bind(status::PROCESSING) + .bind(status::PENDING) + .fetch_one(pool) + .await + .map_err(|e| { + eprintln!("Error inserting: {}", e); + }); + + match result { + Ok(row) => { + Ok(SongQueue{ + id: row.try_get("id").map_err(|_e| sqlx::Error::RowNotFound).unwrap(), + filename: row.try_get("filename").map_err(|_e| sqlx::Error::RowNotFound).unwrap(), + status: row.try_get("status").map_err(|_e| sqlx::Error::RowNotFound).unwrap(), + data: row.try_get("data").map_err(|_e| sqlx::Error::RowNotFound).unwrap(), + }) + } + Err(err) => { + Err(sqlx::Error::RowNotFound) + } + } + } } pub mod endpoint { @@ -117,4 +175,19 @@ pub mod endpoint { (StatusCode::OK, Json(response)) } + + pub async fn fetch_queue_song(axum::Extension(pool): axum::Extension, + ) -> (StatusCode, Json) { + let mut response = super::response::fetch_queue_song::Response::default(); + + match song_queue::get_most_recent_and_update(&pool).await { + Ok(_q) => { + (StatusCode::OK, Json(response)) + } + Err(err) => { + response.message = err.to_string(); + (StatusCode::BAD_REQUEST, Json(response)) + } + } + } } diff --git a/src/main.rs b/src/main.rs index aafcc52..c064ad9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -69,6 +69,9 @@ pub mod init { crate::callers::endpoints::QUEUESONG, post(crate::callers::song::endpoint::queue_song), ) + .route(crate::callers::endpoints::NEXTQUEUESONG, + get(crate::callers::song::endpoint::fetch_queue_song), + ) .route( crate::callers::endpoints::QUEUEMETADATA, post(crate::callers::metadata::endpoint::queue_metadata), -- 2.47.3 From cd7e8896a997336b4e1fac9e7fbf440bbad7160a Mon Sep 17 00:00:00 2001 From: KD Date: Fri, 25 Apr 2025 20:44:23 -0400 Subject: [PATCH 2/9] Updated README --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 64ee5d9..ca22c83 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,6 @@ docker compose build --ssh default api auth_api ``` Bring it up -docker compose up -d --force-recreate api auth_api \ No newline at end of file +``` +docker compose up -d --force-recreate api auth_api +``` -- 2.47.3 From c883bfbe1c1528bde155cda3de244cc398c21674 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 25 Apr 2025 21:23:18 -0400 Subject: [PATCH 3/9] Give it a go --- src/callers/song.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/callers/song.rs b/src/callers/song.rs index f436340..850f10e 100644 --- a/src/callers/song.rs +++ b/src/callers/song.rs @@ -181,7 +181,8 @@ pub mod endpoint { let mut response = super::response::fetch_queue_song::Response::default(); match song_queue::get_most_recent_and_update(&pool).await { - Ok(_q) => { + Ok(item) => { + response.data.push(item); (StatusCode::OK, Json(response)) } Err(err) => { -- 2.47.3 From f3db0917d61730f55691a7e92fb9d31c2b7f5658 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 25 Apr 2025 21:23:52 -0400 Subject: [PATCH 4/9] Minor docker compose change --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 2a77885..3cbca0c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -106,4 +106,4 @@ networks: main-api-network: driver: bridge auth-api-network: - driver: bridge \ No newline at end of file + driver: bridge -- 2.47.3 From 6bd3a8210e378f5e0b020474721cd7850ddd8567 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 25 Apr 2025 22:30:08 -0400 Subject: [PATCH 5/9] Added docker-compose defaults --- docker-compose.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 3cbca0c..e840a51 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,9 @@ version: '3.8' # Use a recent version services: # --- Web API --- api: - build: . # Tells docker-compose to build the Dockerfile in the current directory + build: # Tells docker-compose to build the Dockerfile in the current directory + context: . + ssh: ["default"] # Uses host's SSH agent container_name: icarus # Optional: Give the container a specific name ports: # Map host port 8000 to container port 3000 (adjust as needed) @@ -22,6 +24,7 @@ services: auth_api: build: context: ../icarus_auth # IMPORTANT: Relative path to the local checkout of your web API repo (containing the Dockerfile) + ssh: ["default"] # Uses host's SSH agent dockerfile: Dockerfile # Optional: Specify if your Dockerfile has a non-standard name container_name: auth_api restart: unless-stopped -- 2.47.3 From 38c1b3baebc7b3934043a589712629fe7054de7a Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 25 Apr 2025 22:54:30 -0400 Subject: [PATCH 6/9] Code refactor --- src/callers/song.rs | 58 ++++++++++++++++++++++++++------------------- src/main.rs | 3 ++- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/src/callers/song.rs b/src/callers/song.rs index 850f10e..91eb811 100644 --- a/src/callers/song.rs +++ b/src/callers/song.rs @@ -82,9 +82,7 @@ mod song_queue { } } - pub async fn get_most_recent_and_update( - pool: &sqlx::PgPool, - ) -> Result { + pub async fn get_most_recent_and_update(pool: &sqlx::PgPool) -> Result { let result = sqlx::query( r#" UPDATE "songQueue" @@ -98,27 +96,35 @@ mod song_queue { ) RETURNING *; "#, - ) - .bind(status::PROCESSING) - .bind(status::PENDING) - .fetch_one(pool) - .await - .map_err(|e| { - eprintln!("Error inserting: {}", e); - }); + ) + .bind(status::PROCESSING) + .bind(status::PENDING) + .fetch_one(pool) + .await + .map_err(|e| { + eprintln!("Error inserting: {}", e); + }); match result { - Ok(row) => { - Ok(SongQueue{ - id: row.try_get("id").map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - filename: row.try_get("filename").map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - status: row.try_get("status").map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - data: row.try_get("data").map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - }) - } - Err(err) => { - Err(sqlx::Error::RowNotFound) - } + Ok(row) => Ok(SongQueue { + id: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + filename: row + .try_get("filename") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + status: row + .try_get("status") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + data: row + .try_get("data") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + }), + Err(err) => Err(sqlx::Error::RowNotFound), } } } @@ -176,8 +182,12 @@ pub mod endpoint { (StatusCode::OK, Json(response)) } - pub async fn fetch_queue_song(axum::Extension(pool): axum::Extension, - ) -> (StatusCode, Json) { + pub async fn fetch_queue_song( + axum::Extension(pool): axum::Extension, + ) -> ( + StatusCode, + Json, + ) { let mut response = super::response::fetch_queue_song::Response::default(); match song_queue::get_most_recent_and_update(&pool).await { diff --git a/src/main.rs b/src/main.rs index c064ad9..2d6c889 100644 --- a/src/main.rs +++ b/src/main.rs @@ -69,7 +69,8 @@ pub mod init { crate::callers::endpoints::QUEUESONG, post(crate::callers::song::endpoint::queue_song), ) - .route(crate::callers::endpoints::NEXTQUEUESONG, + .route( + crate::callers::endpoints::NEXTQUEUESONG, get(crate::callers::song::endpoint::fetch_queue_song), ) .route( -- 2.47.3 From 3b88ff02d831b84cafed10f78fdf412fdd118347 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 26 Apr 2025 15:40:28 -0400 Subject: [PATCH 7/9] Removed data from being fetched --- src/callers/song.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/callers/song.rs b/src/callers/song.rs index 91eb811..7adc619 100644 --- a/src/callers/song.rs +++ b/src/callers/song.rs @@ -47,7 +47,7 @@ mod song_queue { pub id: uuid::Uuid, pub filename: String, pub status: String, - pub data: Vec, + // pub data: Vec, } pub async fn insert( @@ -94,7 +94,7 @@ mod song_queue { FOR UPDATE SKIP LOCKED LIMIT 1 ) - RETURNING *; + RETURNING id, filename, status; "#, ) .bind(status::PROCESSING) @@ -119,12 +119,8 @@ mod song_queue { .try_get("status") .map_err(|_e| sqlx::Error::RowNotFound) .unwrap(), - data: row - .try_get("data") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), }), - Err(err) => Err(sqlx::Error::RowNotFound), + Err(_err) => Err(sqlx::Error::RowNotFound), } } } @@ -192,6 +188,7 @@ pub mod endpoint { match song_queue::get_most_recent_and_update(&pool).await { Ok(item) => { + response.message = String::from("Successful"); response.data.push(item); (StatusCode::OK, Json(response)) } -- 2.47.3 From 603852203e77b21c9c86dd20413d2124797190e1 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 26 Apr 2025 16:05:37 -0400 Subject: [PATCH 8/9] Added test --- src/main.rs | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/src/main.rs b/src/main.rs index 2d6c889..ab33229 100644 --- a/src/main.rs +++ b/src/main.rs @@ -254,6 +254,83 @@ mod tests { let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } + #[tokio::test] + async fn test_song_fetch_queue_item() { + let tm_pool = db_mgr::get_pool().await.unwrap(); + let db_name = db_mgr::generate_db_name().await; + + match db_mgr::create_database(&tm_pool, &db_name).await { + Ok(_) => { + println!("Success"); + } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + } + + let pool = db_mgr::connect_to_db(&db_name).await.unwrap(); + db::migrations(&pool).await; + + let app = crate::init::routes() + .await + .layer(axum::Extension(pool)) + .layer(axum::extract::DefaultBodyLimit::max(1024 * 1024 * 1024)) + .layer(TimeoutLayer::new(Duration::from_secs(300))); + + // Create multipart form + let mut form = MultipartForm::default(); + let _ = form.add_file("flac", "tests/Machine_gun/track01.flac"); + + // Create request + let content_type = form.content_type(); + let body = MultipartBody::from(form); + let req = axum::http::Request::builder() + .method(axum::http::Method::POST) + .uri(crate::callers::endpoints::QUEUESONG) + .header(axum::http::header::CONTENT_TYPE, content_type) + .body(axum::body::Body::from_stream(body)) + .unwrap(); + + // Send request + match app.clone().oneshot(req).await { + Ok(response) => { + let body = axum::body::to_bytes(response.into_body(), usize::MAX) + .await + .unwrap(); + println!("Body: {:?}", body); + let resp: crate::callers::song::response::Response = + serde_json::from_slice(&body).unwrap(); + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); + + let fetch_req = axum::http::Request::builder() + .method(axum::http::Method::GET) + .uri(crate::callers::endpoints::NEXTQUEUESONG) + .header(axum::http::header::CONTENT_TYPE, "application/json") + .body(axum::body::Body::empty()).unwrap(); + + match app.clone().oneshot(fetch_req).await { + Ok(response) => { + let body = axum::body::to_bytes(response.into_body(), usize::MAX) + .await + .unwrap(); + let resp: crate::callers::song::response::fetch_queue_song::Response = + serde_json::from_slice(&body).unwrap(); + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + } + } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + }; + + let _ = db_mgr::drop_database(&tm_pool, &db_name).await; + } + #[tokio::test] async fn test_song_metadata_queue() { let tm_pool = db_mgr::get_pool().await.unwrap(); -- 2.47.3 From 781d541fbe03789406dfb91e79edda0f2d5f06a9 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 26 Apr 2025 16:07:22 -0400 Subject: [PATCH 9/9] Formatting --- src/callers/song.rs | 1 - src/main.rs | 15 ++++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/callers/song.rs b/src/callers/song.rs index 7adc619..d914a55 100644 --- a/src/callers/song.rs +++ b/src/callers/song.rs @@ -47,7 +47,6 @@ mod song_queue { pub id: uuid::Uuid, pub filename: String, pub status: String, - // pub data: Vec, } pub async fn insert( diff --git a/src/main.rs b/src/main.rs index ab33229..f2d73dc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -307,16 +307,17 @@ mod tests { .method(axum::http::Method::GET) .uri(crate::callers::endpoints::NEXTQUEUESONG) .header(axum::http::header::CONTENT_TYPE, "application/json") - .body(axum::body::Body::empty()).unwrap(); + .body(axum::body::Body::empty()) + .unwrap(); match app.clone().oneshot(fetch_req).await { Ok(response) => { - let body = axum::body::to_bytes(response.into_body(), usize::MAX) - .await - .unwrap(); - let resp: crate::callers::song::response::fetch_queue_song::Response = - serde_json::from_slice(&body).unwrap(); - assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + let body = axum::body::to_bytes(response.into_body(), usize::MAX) + .await + .unwrap(); + let resp: crate::callers::song::response::fetch_queue_song::Response = + serde_json::from_slice(&body).unwrap(); + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); } Err(err) => { assert!(false, "Error: {:?}", err); -- 2.47.3