From d242ec37a5210889e924245a991c34d9ad309b41 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Mon, 19 May 2025 20:46:36 -0400 Subject: [PATCH 1/7] Added initial code to link coverart id and song queue id --- src/callers/coverart.rs | 42 +++++++++++++++++++++++++++++++++++++++++ src/callers/mod.rs | 1 + src/main.rs | 6 +++++- 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs index 15de43a..478b749 100644 --- a/src/callers/coverart.rs +++ b/src/callers/coverart.rs @@ -1,9 +1,28 @@ +pub mod request { + + pub mod link { + #[derive(Debug, Default, serde::Deserialize, serde::Serialize)] + pub struct Request { + pub coverart_id: uuid::Uuid, + pub song_queue_id: uuid::Uuid, + } + } +} + pub mod response { #[derive(Debug, Default, serde::Deserialize, serde::Serialize)] pub struct Response { pub message: String, pub data: Vec, } + + pub mod link { + #[derive(Debug, Default, serde::Deserialize, serde::Serialize)] + pub struct Response { + pub message: String, + pub data: Vec, + } + } } mod db { @@ -33,6 +52,10 @@ mod db { Err(_err) => Err(sqlx::Error::RowNotFound), } } + + pub async fn update(pool: &sqlx::PgPool, coverart_id: &uuid::Uuid, song_queue_id: &uuid::Uuid,) -> Result { + Ok(0) + } } pub mod endpoint { @@ -80,4 +103,23 @@ pub mod endpoint { } } } + + pub async fn link( + axum::Extension(pool): axum::Extension, + axum::Json(payload): axum::Json, + ) -> (axum::http::StatusCode, axum::Json,) { + let mut response = super::response::link::Response::default(); + let coverart_id = payload.coverart_id; + let song_queue_id = payload.song_queue_id; + + match super::db::update(&pool, &coverart_id, &song_queue_id).await { + Ok(o) => { + (axum::http::StatusCode::OK, axum::Json(response)) + } + Err(err) => { + response.message = err.to_string(); + (axum::http::StatusCode::BAD_REQUEST, axum::Json(response)) + } + } + } } diff --git a/src/callers/mod.rs b/src/callers/mod.rs index 55d2907..de9b756 100644 --- a/src/callers/mod.rs +++ b/src/callers/mod.rs @@ -8,4 +8,5 @@ pub mod endpoints { pub const NEXTQUEUESONG: &str = "/api/v2/song/queue/next"; pub const QUEUEMETADATA: &str = "/api/v2/song/metadata/queue"; pub const QUEUECOVERART: &str = "/api/v2/coverart/queue"; + pub const QUEUECOVERARTLINK: &str = "/api/v2/coverart/queue/link"; } diff --git a/src/main.rs b/src/main.rs index d7ff00c..74a9000 100644 --- a/src/main.rs +++ b/src/main.rs @@ -58,7 +58,7 @@ async fn main() { } pub mod init { - use axum::routing::{get, post}; + use axum::routing::{get, patch, post}; use std::time::Duration; use tower_http::timeout::TimeoutLayer; @@ -89,6 +89,10 @@ pub mod init { crate::callers::endpoints::QUEUECOVERART, post(crate::callers::coverart::endpoint::queue), ) + .route( + crate::callers::endpoints::QUEUECOVERARTLINK, + patch(crate::callers::coverart::endpoint::link), + ) } pub async fn app() -> axum::Router { -- 2.47.3 From 435e39b530e62ca25488235ce81214ead596ca77 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Mon, 19 May 2025 21:01:36 -0400 Subject: [PATCH 2/7] Added more functionality --- src/callers/coverart.rs | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs index 478b749..33cfd2b 100644 --- a/src/callers/coverart.rs +++ b/src/callers/coverart.rs @@ -17,10 +17,16 @@ pub mod response { } pub mod link { + #[derive(Debug, serde::Deserialize, serde::Serialize)] + pub struct Id { + pub coverart_id: uuid::Uuid, + pub song_queue_id: uuid::Uuid, + } + #[derive(Debug, Default, serde::Deserialize, serde::Serialize)] pub struct Response { pub message: String, - pub data: Vec, + pub data: Vec, } } } @@ -54,7 +60,24 @@ mod db { } pub async fn update(pool: &sqlx::PgPool, coverart_id: &uuid::Uuid, song_queue_id: &uuid::Uuid,) -> Result { - Ok(0) + let result = sqlx::query( + r#" + UPDATE "coverartQueue" SET song_queue_id = $1 WHERE id = $2; + "# + ) + .bind(song_queue_id) + .bind(coverart_id) + .execute(pool) + .await; + + match result { + Ok(_) => { + Ok(0) + } + Err(_err) => { + Err(sqlx::Error::RowNotFound) + } + } } } @@ -113,7 +136,12 @@ pub mod endpoint { let song_queue_id = payload.song_queue_id; match super::db::update(&pool, &coverart_id, &song_queue_id).await { - Ok(o) => { + Ok(_o) => { + response.data.push(super::response::link::Id { + song_queue_id: song_queue_id, + coverart_id: coverart_id, + }); + (axum::http::StatusCode::OK, axum::Json(response)) } Err(err) => { -- 2.47.3 From e07bec444b254c94da3694139f5e6abfd1fd0fee Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Mon, 19 May 2025 21:08:58 -0400 Subject: [PATCH 3/7] Preparing test --- src/main.rs | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/src/main.rs b/src/main.rs index 74a9000..15d2698 100644 --- a/src/main.rs +++ b/src/main.rs @@ -273,6 +273,33 @@ mod tests { app.clone().oneshot(req).await } + async fn upload_coverart_queue( + app: &axum::Router, + ) -> Result { + // let app = init::app(pool).await; + let mut form = MultipartForm::default(); + let _ = form.add_file("jpg", "tests/Machine_gun/160809_machinegun.jpg"); + + // 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::QUEUECOVERART) + .header(axum::http::header::CONTENT_TYPE, content_type) + .body(axum::body::Body::from_stream(body)) + .unwrap(); + + // Send request + app + .clone() + .oneshot( + req + ) + .await + } + pub async fn resp_to_bytes( response: axum::response::Response, ) -> Result { @@ -618,25 +645,9 @@ mod tests { db::migrations(&pool).await; let app = init::app(pool).await; - let mut form = MultipartForm::default(); - let _ = form.add_file("jpg", "tests/Machine_gun/160809_machinegun.jpg"); - - // Create request - let content_type = form.content_type(); - let body = MultipartBody::from(form); // Send request - match app - .clone() - .oneshot( - axum::http::Request::builder() - .method(axum::http::Method::POST) - .uri(crate::callers::endpoints::QUEUECOVERART) - .header(axum::http::header::CONTENT_TYPE, content_type) - .body(axum::body::Body::from_stream(body)) - .unwrap(), - ) - .await + match upload_coverart_queue(&app).await { Ok(response) => { let resp = @@ -652,4 +663,8 @@ mod tests { let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } + + #[tokio::test] + async fn test_song_coverart_queue_link() { + } } -- 2.47.3 From 467c147e851770c8a07f4a9f2e11ff4f4e2fd013 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Mon, 19 May 2025 21:32:27 -0400 Subject: [PATCH 4/7] Finished test --- src/main.rs | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index 15d2698..187dad0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -273,7 +273,7 @@ mod tests { app.clone().oneshot(req).await } - async fn upload_coverart_queue( + async fn upload_coverart_queue_req( app: &axum::Router, ) -> Result { // let app = init::app(pool).await; @@ -647,7 +647,7 @@ mod tests { let app = init::app(pool).await; // Send request - match upload_coverart_queue(&app).await + match upload_coverart_queue_req(&app).await { Ok(response) => { let resp = @@ -666,5 +666,81 @@ mod tests { #[tokio::test] async fn test_song_coverart_queue_link() { + 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 = init::app(pool).await; + + match song_queue_req(&app).await { + Ok(response) => { + let resp = + get_resp_data::(response).await; + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + let song_queue_id = resp.data[0]; + assert_eq!(false, song_queue_id.is_nil(), "Should not be empty"); + + // Send request + match upload_coverart_queue_req(&app).await + { + Ok(response) => { + let resp = + get_resp_data::(response).await; + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + let coverart_id = resp.data[0]; + assert_eq!(false, coverart_id.is_nil(), "Should not be empty"); + + let payload = serde_json::json!( + { + "song_queue_id": song_queue_id, + "coverart_id" : coverart_id, + }); + + match app.clone().oneshot( + axum::http::Request::builder() + .method(axum::http::Method::PATCH) + .uri(crate::callers::endpoints::QUEUECOVERARTLINK) + .header(axum::http::header::CONTENT_TYPE, "application/json") + .body(axum::body::Body::from(payload.to_string())) + .unwrap(), + ).await { + Ok(response) => { + let resp = + get_resp_data::(response).await; + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + let resp_coverart_id = resp.data[0].coverart_id; + let resp_song_queue_id = resp.data[0].song_queue_id; + + assert_eq!(false, resp_coverart_id.is_nil(), "Should not be empty"); + assert_eq!(false, resp_song_queue_id.is_nil(), "Should not be empty"); + } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + } + } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + } + } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + } + + + let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } } -- 2.47.3 From dda3124e226388afb7798c9db1ea180863ee3a25 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Mon, 19 May 2025 21:34:59 -0400 Subject: [PATCH 5/7] Cleanup --- src/main.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 187dad0..23116cf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -276,7 +276,6 @@ mod tests { async fn upload_coverart_queue_req( app: &axum::Router, ) -> Result { - // let app = init::app(pool).await; let mut form = MultipartForm::default(); let _ = form.add_file("jpg", "tests/Machine_gun/160809_machinegun.jpg"); -- 2.47.3 From b301aba1396c738da5c8c34fa78f5d2dd376bbaf Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Mon, 19 May 2025 21:35:13 -0400 Subject: [PATCH 6/7] Code formatting --- src/callers/coverart.rs | 31 +++++++++++--------- src/main.rs | 65 +++++++++++++++++++++-------------------- 2 files changed, 51 insertions(+), 45 deletions(-) diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs index 33cfd2b..bb6bbbb 100644 --- a/src/callers/coverart.rs +++ b/src/callers/coverart.rs @@ -59,24 +59,24 @@ mod db { } } - pub async fn update(pool: &sqlx::PgPool, coverart_id: &uuid::Uuid, song_queue_id: &uuid::Uuid,) -> Result { + pub async fn update( + pool: &sqlx::PgPool, + coverart_id: &uuid::Uuid, + song_queue_id: &uuid::Uuid, + ) -> Result { let result = sqlx::query( r#" UPDATE "coverartQueue" SET song_queue_id = $1 WHERE id = $2; - "# - ) - .bind(song_queue_id) - .bind(coverart_id) - .execute(pool) - .await; + "#, + ) + .bind(song_queue_id) + .bind(coverart_id) + .execute(pool) + .await; match result { - Ok(_) => { - Ok(0) - } - Err(_err) => { - Err(sqlx::Error::RowNotFound) - } + Ok(_) => Ok(0), + Err(_err) => Err(sqlx::Error::RowNotFound), } } } @@ -130,7 +130,10 @@ pub mod endpoint { pub async fn link( axum::Extension(pool): axum::Extension, axum::Json(payload): axum::Json, - ) -> (axum::http::StatusCode, axum::Json,) { + ) -> ( + axum::http::StatusCode, + axum::Json, + ) { let mut response = super::response::link::Response::default(); let coverart_id = payload.coverart_id; let song_queue_id = payload.song_queue_id; diff --git a/src/main.rs b/src/main.rs index 23116cf..f2a6e14 100644 --- a/src/main.rs +++ b/src/main.rs @@ -92,7 +92,7 @@ pub mod init { .route( crate::callers::endpoints::QUEUECOVERARTLINK, patch(crate::callers::coverart::endpoint::link), - ) + ) } pub async fn app() -> axum::Router { @@ -275,7 +275,7 @@ mod tests { async fn upload_coverart_queue_req( app: &axum::Router, - ) -> Result { + ) -> Result { let mut form = MultipartForm::default(); let _ = form.add_file("jpg", "tests/Machine_gun/160809_machinegun.jpg"); @@ -284,19 +284,14 @@ mod tests { let body = MultipartBody::from(form); let req = axum::http::Request::builder() - .method(axum::http::Method::POST) - .uri(crate::callers::endpoints::QUEUECOVERART) - .header(axum::http::header::CONTENT_TYPE, content_type) - .body(axum::body::Body::from_stream(body)) - .unwrap(); + .method(axum::http::Method::POST) + .uri(crate::callers::endpoints::QUEUECOVERART) + .header(axum::http::header::CONTENT_TYPE, content_type) + .body(axum::body::Body::from_stream(body)) + .unwrap(); // Send request - app - .clone() - .oneshot( - req - ) - .await + app.clone().oneshot(req).await } pub async fn resp_to_bytes( @@ -646,8 +641,7 @@ mod tests { let app = init::app(pool).await; // Send request - match upload_coverart_queue_req(&app).await - { + match upload_coverart_queue_req(&app).await { Ok(response) => { let resp = get_resp_data::(response).await; @@ -684,18 +678,18 @@ mod tests { match song_queue_req(&app).await { Ok(response) => { - let resp = + let resp = get_resp_data::(response).await; assert_eq!(false, resp.data.is_empty(), "Should not be empty"); let song_queue_id = resp.data[0]; assert_eq!(false, song_queue_id.is_nil(), "Should not be empty"); // Send request - match upload_coverart_queue_req(&app).await - { + match upload_coverart_queue_req(&app).await { Ok(response) => { let resp = - get_resp_data::(response).await; + get_resp_data::(response) + .await; assert_eq!(false, resp.data.is_empty(), "Should not be empty"); let coverart_id = resp.data[0]; assert_eq!(false, coverart_id.is_nil(), "Should not be empty"); @@ -706,23 +700,33 @@ mod tests { "coverart_id" : coverart_id, }); - match app.clone().oneshot( - axum::http::Request::builder() - .method(axum::http::Method::PATCH) - .uri(crate::callers::endpoints::QUEUECOVERARTLINK) - .header(axum::http::header::CONTENT_TYPE, "application/json") - .body(axum::body::Body::from(payload.to_string())) - .unwrap(), - ).await { + match app + .clone() + .oneshot( + axum::http::Request::builder() + .method(axum::http::Method::PATCH) + .uri(crate::callers::endpoints::QUEUECOVERARTLINK) + .header(axum::http::header::CONTENT_TYPE, "application/json") + .body(axum::body::Body::from(payload.to_string())) + .unwrap(), + ) + .await + { Ok(response) => { - let resp = - get_resp_data::(response).await; + let resp = get_resp_data::< + crate::callers::coverart::response::link::Response, + >(response) + .await; assert_eq!(false, resp.data.is_empty(), "Should not be empty"); let resp_coverart_id = resp.data[0].coverart_id; let resp_song_queue_id = resp.data[0].song_queue_id; assert_eq!(false, resp_coverart_id.is_nil(), "Should not be empty"); - assert_eq!(false, resp_song_queue_id.is_nil(), "Should not be empty"); + assert_eq!( + false, + resp_song_queue_id.is_nil(), + "Should not be empty" + ); } Err(err) => { assert!(false, "Error: {:?}", err); @@ -739,7 +743,6 @@ mod tests { } } - let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } } -- 2.47.3 From 7bf19c7784e9860b9b291e2f2768bb1fb833fe65 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Mon, 19 May 2025 21:42:38 -0400 Subject: [PATCH 7/7] Clippy warning fix --- src/callers/coverart.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs index bb6bbbb..b0d760d 100644 --- a/src/callers/coverart.rs +++ b/src/callers/coverart.rs @@ -135,14 +135,14 @@ pub mod endpoint { axum::Json, ) { let mut response = super::response::link::Response::default(); - let coverart_id = payload.coverart_id; - let song_queue_id = payload.song_queue_id; + let id = payload.coverart_id; + let song_id = payload.song_queue_id; - match super::db::update(&pool, &coverart_id, &song_queue_id).await { + match super::db::update(&pool, &id, &song_id).await { Ok(_o) => { response.data.push(super::response::link::Id { - song_queue_id: song_queue_id, - coverart_id: coverart_id, + song_queue_id: song_id, + coverart_id: id, }); (axum::http::StatusCode::OK, axum::Json(response)) -- 2.47.3