From a009de0f9b1fb5dd09b8042334ef29191c439571 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 4 Jun 2025 20:00:37 -0400 Subject: [PATCH 1/9] Saving changes --- src/main.rs | 470 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 281 insertions(+), 189 deletions(-) diff --git a/src/main.rs b/src/main.rs index b83afc6..51e9df5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -428,6 +428,205 @@ mod tests { app.clone().oneshot(req).await } + mod sequence_flow { + use tower::ServiceExt; + + // Flow for queueing song + pub async fn queue_song_flow(app: &axum::Router) -> Result { + match super::song_queue_req(&app).await { + Ok(response) => { + let resp = + super::get_resp_data::(response).await; + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); + let song_queue_id = resp.data[0]; + assert_eq!(false, song_queue_id.is_nil(), "Should not be empty"); + + match super::queue_metadata_req(&app, &resp.data[0]).await { + Ok(response) => { + let resp = + super::get_resp_data::(response) + .await; + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + + let id = resp.data[0]; + + match super::fetch_metadata_queue_req(&app, &id).await { + Ok(response) => { + Ok(response) + } + Err(err) => { + Err(err) + } + } + } + } + } + Err(err) => { + Err(err) + } + } + } + + pub async fn queue_coverart_flow(app: &axum::Router, song_queue_id: &uuid::Uuid) -> Result { + + match super::upload_coverart_queue_req(&app).await { + Ok(response) => { + let resp = super::get_resp_data::< + crate::callers::coverart::response::Response, + >( + 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" + ); + + match super::coverart_queue_song_queue_link_req( + &app, + &coverart_id, + &song_queue_id, + ) + .await + { + Ok(response) => { + let resp = super::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" + ); + + match super::get_queued_coverart( + &app, + &resp_coverart_id, + ) + .await + { + Ok(response) => { + Ok(response) + } + Err(err) => { + Err(err) + } + } + } + } + } + } + } + + pub async fn create_coverart_flow(app: &axum::Router -> Result { + + match queue_song_flow(&app).await { + Ok(response) => { + let resp = super::get_resp_data::< + crate::callers::metadata::response::fetch_metadata::Response, + >(response) + .await; + assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); + let song_queue_id = resp.data[0].song_queue_id; + + match super::create_song_req(&app, &song_queue_id).await { + Ok(response) => { + let resp = super::get_resp_data::(response).await; + assert_eq!( + false, + resp.data.is_empty(), + "No songs found, Response {:?}", + resp + ); + let song = &resp.data[0]; + let song_id = song.id; + assert_eq!( + false, + song_id.is_nil(), + "Song id should not be nil {:?}", + song + ); + + eprintln!("Song: {:?}", song); + + match queue_coverart_flow(&app, &song_queue_id).await { + Ok(response) => { + let resp = super::get_resp_data::< + crate::callers::coverart::response::fetch_coverart_no_data::Response, + >(response) + .await; + assert_eq!( + false, + resp.data.is_empty(), + "Should not be empty" + ); + + match super::create_coverart_req( + &app, + &song_id, + &resp_coverart_id, + ) + .await + { + Ok(response) => { + Ok(response) + } + Err(err) => { + /* + assert!( + false, + "Error: {:?}", + err + ); + */ + Err(err) + } + } + } + Err(err) => { + // assert!(false, "Error: {:?}", err); + Err(err) + } + } + } + Err(err) => { + // assert!(false, "Error: {:?}", err); + Err(err) + } + } + } + Err(err) => { + // assert!(false, "Error: {:?}", err); + Err(err) + } + } + } + } + pub async fn resp_to_bytes( response: axum::response::Response, ) -> Result { @@ -1663,214 +1862,107 @@ mod tests { let app = init::app(pool).await; - // Send request - match song_queue_req(&app).await { + match sequence_flow::queue_song_flow(&app).await { Ok(response) => { - let resp = - get_resp_data::(response).await; - assert_eq!(false, resp.data.is_empty(), "Should not be empty"); - assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); - let song_queue_id = resp.data[0]; - assert_eq!(false, song_queue_id.is_nil(), "Should not be empty"); + let resp = super::get_resp_data::< + crate::callers::metadata::response::fetch_metadata::Response, + >(response) + .await; + assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); + let song_queue_id = resp.data[0].song_queue_id; - match queue_metadata_req(&app, &resp.data[0]).await { + + match super::create_song_req(&app, &song_queue_id).await { Ok(response) => { - let resp = - get_resp_data::(response) - .await; - assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + let resp = super::get_resp_data::(response).await; + assert_eq!( + false, + resp.data.is_empty(), + "No songs found, Response {:?}", + resp + ); + let song = &resp.data[0]; + let song_id = song.id; + assert_eq!( + false, + song_id.is_nil(), + "Song id should not be nil {:?}", + song + ); - let id = resp.data[0]; + eprintln!("Song: {:?}", song); + } + Err(err) => { + } + } + } + Err(err) => { + } + }; - match fetch_metadata_queue_req(&app, &id).await { - Ok(response) => { - let resp = get_resp_data::< - crate::callers::metadata::response::fetch_metadata::Response, - >(response) - .await; - assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); - let song_q_id = resp.data[0].song_queue_id; + // Send request + match sequence_flow::create_coverart_flow(&app).await { + Ok(response) => { + let resp = get_resp_data::< + crate::callers::coverart::response::create_coverart::Response, + >(response) + .await; - match create_song_req(&app, &song_q_id).await { - Ok(response) => { - let resp = get_resp_data::(response).await; - assert_eq!( - false, - resp.data.is_empty(), - "No songs found, Response {:?}", - resp - ); - let song = &resp.data[0]; - let song_id = song.id; - assert_eq!( - false, - song_id.is_nil(), - "Song id should not be nil {:?}", - song - ); + assert_eq!( + false, + resp.data.is_empty(), + "Should not be empty" + ); + // ??? + // let resp_coverart_id = resp.data[0]; - eprintln!("Song: {:?}", song); + let payload = serde_json::json!({ + "coverart_queue_id": resp_coverart_id + }); - match upload_coverart_queue_req(&app).await { - Ok(response) => { - let resp = get_resp_data::< - crate::callers::coverart::response::Response, - >( - 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" - ); - - match coverart_queue_song_queue_link_req( - &app, - &coverart_id, - &song_queue_id, - ) - .await - { - Ok(response) => { - 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" - ); - - match get_queued_coverart( - &app, - &resp_coverart_id, - ) - .await - { - Ok(response) => { - let resp = get_resp_data::< - crate::callers::coverart::response::fetch_coverart_no_data::Response, - >(response) - .await; - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); - - match create_coverart_req( - &app, - &song_id, - &resp_coverart_id, - ) - .await - { - Ok(response) => { - let resp = get_resp_data::< - crate::callers::coverart::response::create_coverart::Response, - >(response) - .await; - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); - - let payload = serde_json::json!({ - "coverart_queue_id": resp_coverart_id - }); - - match app.clone().oneshot( - axum::http::Request::builder() - .method(axum::http::Method::PATCH) - .uri(crate::callers::endpoints::QUEUECOVERARTDATAWIPE) - .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::< - crate::callers::coverart::response::wipe_data_from_coverart_queue::Response, - >(response) - .await; - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } - } - Err(err) => { - assert!( - false, - "Error: {:?}", - err - ); - } - } - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } + match app.clone().oneshot( + axum::http::Request::builder() + .method(axum::http::Method::PATCH) + .uri(crate::callers::endpoints::QUEUECOVERARTDATAWIPE) + .header(axum::http::header::CONTENT_TYPE, "application/json") + .body(axum::body::Body::from(payload.to_string())) + .unwrap() + ).await { + Ok(response) => { + // Ok(response) + let resp = get_resp_data::< + crate::callers::coverart::response::wipe_data_from_coverart_queue::Response, + >(response) + .await; + assert_eq!( + false, + resp.data.is_empty(), + "Should not be empty" + ); } Err(err) => { assert!(false, "Error: {:?}", err); } } + + /* + let resp = get_resp_data::< + crate::callers::coverart::response::wipe_data_from_coverart_queue::Response, + >(response) + .await; + assert_eq!( + false, + resp.data.is_empty(), + "Should not be empty" + ); + */ } Err(err) => { assert!(false, "Error: {:?}", err); } }; + let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } } -- 2.47.3 From 50407128b28028606cf2f1484a2ab75ba0ba819b Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 4 Jun 2025 20:09:52 -0400 Subject: [PATCH 2/9] Got test working --- src/main.rs | 146 ++++++++++++++++++++-------------------------------- 1 file changed, 56 insertions(+), 90 deletions(-) diff --git a/src/main.rs b/src/main.rs index 51e9df5..b8b7732 100644 --- a/src/main.rs +++ b/src/main.rs @@ -429,7 +429,7 @@ mod tests { } mod sequence_flow { - use tower::ServiceExt; + // use tower::ServiceExt; // Flow for queueing song pub async fn queue_song_flow(app: &axum::Router) -> Result { @@ -541,90 +541,6 @@ mod tests { } } } - - pub async fn create_coverart_flow(app: &axum::Router -> Result { - - match queue_song_flow(&app).await { - Ok(response) => { - let resp = super::get_resp_data::< - crate::callers::metadata::response::fetch_metadata::Response, - >(response) - .await; - assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); - let song_queue_id = resp.data[0].song_queue_id; - - match super::create_song_req(&app, &song_queue_id).await { - Ok(response) => { - let resp = super::get_resp_data::(response).await; - assert_eq!( - false, - resp.data.is_empty(), - "No songs found, Response {:?}", - resp - ); - let song = &resp.data[0]; - let song_id = song.id; - assert_eq!( - false, - song_id.is_nil(), - "Song id should not be nil {:?}", - song - ); - - eprintln!("Song: {:?}", song); - - match queue_coverart_flow(&app, &song_queue_id).await { - Ok(response) => { - let resp = super::get_resp_data::< - crate::callers::coverart::response::fetch_coverart_no_data::Response, - >(response) - .await; - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); - - match super::create_coverart_req( - &app, - &song_id, - &resp_coverart_id, - ) - .await - { - Ok(response) => { - Ok(response) - } - Err(err) => { - /* - assert!( - false, - "Error: {:?}", - err - ); - */ - Err(err) - } - } - } - Err(err) => { - // assert!(false, "Error: {:?}", err); - Err(err) - } - } - } - Err(err) => { - // assert!(false, "Error: {:?}", err); - Err(err) - } - } - } - Err(err) => { - // assert!(false, "Error: {:?}", err); - Err(err) - } - } - } } pub async fn resp_to_bytes( @@ -1864,7 +1780,7 @@ mod tests { match sequence_flow::queue_song_flow(&app).await { Ok(response) => { - let resp = super::get_resp_data::< + let resp = get_resp_data::< crate::callers::metadata::response::fetch_metadata::Response, >(response) .await; @@ -1872,9 +1788,9 @@ mod tests { let song_queue_id = resp.data[0].song_queue_id; - match super::create_song_req(&app, &song_queue_id).await { + match create_song_req(&app, &song_queue_id).await { Ok(response) => { - let resp = super::get_resp_data::(response).await; + let resp = get_resp_data::(response).await; assert_eq!( false, resp.data.is_empty(), @@ -1891,16 +1807,67 @@ mod tests { ); eprintln!("Song: {:?}", song); + + match sequence_flow::queue_coverart_flow(&app, &song_queue_id).await { + Ok(response) => { + let resp = get_resp_data::< + crate::callers::coverart::response::fetch_coverart_no_data::Response, + >(response) + .await; + assert_eq!( + false, + resp.data.is_empty(), + "Should not be empty" + ); + + let resp_coverart_queue_id = resp.data[0].id; + + let payload = serde_json::json!({ + "coverart_queue_id": resp_coverart_queue_id + }); + + match app.clone().oneshot( + axum::http::Request::builder() + .method(axum::http::Method::PATCH) + .uri(crate::callers::endpoints::QUEUECOVERARTDATAWIPE) + .header(axum::http::header::CONTENT_TYPE, "application/json") + .body(axum::body::Body::from(payload.to_string())) + .unwrap() + ).await { + Ok(response) => { + // Ok(response) + let resp = get_resp_data::< + crate::callers::coverart::response::wipe_data_from_coverart_queue::Response, + >(response) + .await; + assert_eq!( + false, + resp.data.is_empty(), + "Should not be empty" + ); + } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + } + } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + } } Err(err) => { + assert!(false, "Error: {:?}", err); } } } Err(err) => { + assert!(false, "Error: {:?}", err); } }; // Send request + /* match sequence_flow::create_coverart_flow(&app).await { Ok(response) => { let resp = get_resp_data::< @@ -1945,7 +1912,6 @@ mod tests { } } - /* let resp = get_resp_data::< crate::callers::coverart::response::wipe_data_from_coverart_queue::Response, >(response) @@ -1955,12 +1921,12 @@ mod tests { resp.data.is_empty(), "Should not be empty" ); - */ } Err(err) => { assert!(false, "Error: {:?}", err); } }; + */ let _ = db_mgr::drop_database(&tm_pool, &db_name).await; -- 2.47.3 From 41cb65b16270eeffdbda20262fd48cf2a781ec1f Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 4 Jun 2025 20:11:03 -0400 Subject: [PATCH 3/9] Removing commented code --- src/main.rs | 64 ----------------------------------------------------- 1 file changed, 64 deletions(-) diff --git a/src/main.rs b/src/main.rs index b8b7732..44cb0bf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -469,7 +469,6 @@ mod tests { } pub async fn queue_coverart_flow(app: &axum::Router, song_queue_id: &uuid::Uuid) -> Result { - match super::upload_coverart_queue_req(&app).await { Ok(response) => { let resp = super::get_resp_data::< @@ -1835,7 +1834,6 @@ mod tests { .unwrap() ).await { Ok(response) => { - // Ok(response) let resp = get_resp_data::< crate::callers::coverart::response::wipe_data_from_coverart_queue::Response, >(response) @@ -1866,68 +1864,6 @@ mod tests { } }; - // Send request - /* - match sequence_flow::create_coverart_flow(&app).await { - Ok(response) => { - let resp = get_resp_data::< - crate::callers::coverart::response::create_coverart::Response, - >(response) - .await; - - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); - // ??? - // let resp_coverart_id = resp.data[0]; - - let payload = serde_json::json!({ - "coverart_queue_id": resp_coverart_id - }); - - match app.clone().oneshot( - axum::http::Request::builder() - .method(axum::http::Method::PATCH) - .uri(crate::callers::endpoints::QUEUECOVERARTDATAWIPE) - .header(axum::http::header::CONTENT_TYPE, "application/json") - .body(axum::body::Body::from(payload.to_string())) - .unwrap() - ).await { - Ok(response) => { - // Ok(response) - let resp = get_resp_data::< - crate::callers::coverart::response::wipe_data_from_coverart_queue::Response, - >(response) - .await; - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } - - let resp = get_resp_data::< - crate::callers::coverart::response::wipe_data_from_coverart_queue::Response, - >(response) - .await; - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - }; - */ - let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } -- 2.47.3 From 5c82ff39198ab13f17644d36071f6ce03bfade52 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 4 Jun 2025 20:11:39 -0400 Subject: [PATCH 4/9] Code formatting --- src/main.rs | 129 +++++++++++++++++++++------------------------------- 1 file changed, 51 insertions(+), 78 deletions(-) diff --git a/src/main.rs b/src/main.rs index 44cb0bf..682bc0e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -432,11 +432,14 @@ mod tests { // use tower::ServiceExt; // Flow for queueing song - pub async fn queue_song_flow(app: &axum::Router) -> Result { + pub async fn queue_song_flow( + app: &axum::Router, + ) -> Result { match super::song_queue_req(&app).await { Ok(response) => { let resp = - super::get_resp_data::(response).await; + super::get_resp_data::(response) + .await; assert_eq!(false, resp.data.is_empty(), "Should not be empty"); assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); let song_queue_id = resp.data[0]; @@ -444,50 +447,39 @@ mod tests { match super::queue_metadata_req(&app, &resp.data[0]).await { Ok(response) => { - let resp = - super::get_resp_data::(response) - .await; + let resp = super::get_resp_data::< + crate::callers::song::response::Response, + >(response) + .await; assert_eq!(false, resp.data.is_empty(), "Should not be empty"); let id = resp.data[0]; match super::fetch_metadata_queue_req(&app, &id).await { - Ok(response) => { - Ok(response) - } - Err(err) => { - Err(err) - } + Ok(response) => Ok(response), + Err(err) => Err(err), } } } } - Err(err) => { - Err(err) - } + Err(err) => Err(err), } } - pub async fn queue_coverart_flow(app: &axum::Router, song_queue_id: &uuid::Uuid) -> Result { + pub async fn queue_coverart_flow( + app: &axum::Router, + song_queue_id: &uuid::Uuid, + ) -> Result { match super::upload_coverart_queue_req(&app).await { Ok(response) => { - let resp = super::get_resp_data::< - crate::callers::coverart::response::Response, - >( - response - ) - .await; - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); + let resp = + super::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" - ); + assert_eq!(false, coverart_id.is_nil(), "Should not be empty"); match super::coverart_queue_song_queue_link_req( &app, @@ -501,39 +493,16 @@ mod tests { 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.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_coverart_id.is_nil(), "Should not be empty"); + assert_eq!(false, resp_song_queue_id.is_nil(), "Should not be empty"); - match super::get_queued_coverart( - &app, - &resp_coverart_id, - ) - .await - { - Ok(response) => { - Ok(response) - } - Err(err) => { - Err(err) - } + match super::get_queued_coverart(&app, &resp_coverart_id).await { + Ok(response) => Ok(response), + Err(err) => Err(err), } } } @@ -1786,10 +1755,12 @@ mod tests { assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); let song_queue_id = resp.data[0].song_queue_id; - match create_song_req(&app, &song_queue_id).await { Ok(response) => { - let resp = get_resp_data::(response).await; + let resp = get_resp_data::< + crate::callers::song::response::create_metadata::Response, + >(response) + .await; assert_eq!( false, resp.data.is_empty(), @@ -1813,11 +1784,7 @@ mod tests { crate::callers::coverart::response::fetch_coverart_no_data::Response, >(response) .await; - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); let resp_coverart_queue_id = resp.data[0].id; @@ -1825,14 +1792,21 @@ mod tests { "coverart_queue_id": resp_coverart_queue_id }); - match app.clone().oneshot( - axum::http::Request::builder() - .method(axum::http::Method::PATCH) - .uri(crate::callers::endpoints::QUEUECOVERARTDATAWIPE) - .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::QUEUECOVERARTDATAWIPE) + .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::< crate::callers::coverart::response::wipe_data_from_coverart_queue::Response, @@ -1864,7 +1838,6 @@ mod tests { } }; - let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } } -- 2.47.3 From d9799df2e1f798f7eb734694ec083e5f9942f6e4 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 4 Jun 2025 20:17:12 -0400 Subject: [PATCH 5/9] Refactoring test --- src/main.rs | 115 ++++++++++++++++++++-------------------------------- 1 file changed, 45 insertions(+), 70 deletions(-) diff --git a/src/main.rs b/src/main.rs index 682bc0e..8999ad7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1631,83 +1631,57 @@ mod tests { let app = init::app(pool).await; // Send request - match song_queue_req(&app).await { + match sequence_flow::queue_song_flow(&app).await { Ok(response) => { - let resp = - get_resp_data::(response).await; - assert_eq!(false, resp.data.is_empty(), "Should not be empty"); - assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); + let resp = get_resp_data::< + crate::callers::metadata::response::fetch_metadata::Response, + >(response) + .await; + assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); + let song_q_id = resp.data[0].song_queue_id; - match queue_metadata_req(&app, &resp.data[0]).await { + match create_song_req(&app, &song_q_id).await { Ok(response) => { - let resp = - get_resp_data::(response) - .await; - assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + let resp = get_resp_data::(response).await; + assert_eq!( + false, + resp.data.is_empty(), + "No songs found, Response {:?}", + resp + ); + let song = &resp.data[0]; + let song_id = song.id; + assert_eq!( + false, + song_id.is_nil(), + "Song id should not be nil {:?}", + song + ); - let id = resp.data[0]; + let payload = serde_json::json!({ + "song_queue_id": song_q_id + }); - match fetch_metadata_queue_req(&app, &id).await { + match app.clone().oneshot( + axum::http::Request::builder() + .method(axum::http::Method::PATCH) + .uri(crate::callers::endpoints::QUEUESONGDATAWIPE) + .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::< - crate::callers::metadata::response::fetch_metadata::Response, - >(response) - .await; - assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); - let song_q_id = resp.data[0].song_queue_id; + let resp = get_resp_data::(response).await; + assert_eq!( + false, + resp.data.is_empty(), + "Failure in wiping data from song queue {:?}", + resp + ); - match create_song_req(&app, &song_q_id).await { - Ok(response) => { - let resp = get_resp_data::(response).await; - assert_eq!( - false, - resp.data.is_empty(), - "No songs found, Response {:?}", - resp - ); - let song = &resp.data[0]; - let song_id = song.id; - assert_eq!( - false, - song_id.is_nil(), - "Song id should not be nil {:?}", - song - ); - - let payload = serde_json::json!({ - "song_queue_id": song_q_id - }); - - match app.clone().oneshot( - axum::http::Request::builder() - .method(axum::http::Method::PATCH) - .uri(crate::callers::endpoints::QUEUESONGDATAWIPE) - .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(), - "Failure in wiping data from song queue {:?}", - resp - ); - - let returned_id = &resp.data[0]; - assert_eq!(false, returned_id.is_nil(), "Returned id should not be nil {:?}", returned_id); - assert_eq!(*returned_id, song_q_id, "Returned id does not match sent id {:?} {:?}", returned_id, song_q_id); - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } + let returned_id = &resp.data[0]; + assert_eq!(false, returned_id.is_nil(), "Returned id should not be nil {:?}", returned_id); + assert_eq!(*returned_id, song_q_id, "Returned id does not match sent id {:?} {:?}", returned_id, song_q_id); } Err(err) => { assert!(false, "Error: {:?}", err); @@ -1724,6 +1698,7 @@ mod tests { } }; + let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } -- 2.47.3 From 392c4cb8a8e28a7d57795910c9c9cdca20eb3ac4 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 4 Jun 2025 20:17:23 -0400 Subject: [PATCH 6/9] Code refactoring --- src/main.rs | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/src/main.rs b/src/main.rs index 8999ad7..716ccab 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1642,7 +1642,10 @@ mod tests { match create_song_req(&app, &song_q_id).await { Ok(response) => { - let resp = get_resp_data::(response).await; + let resp = get_resp_data::< + crate::callers::song::response::create_metadata::Response, + >(response) + .await; assert_eq!( false, resp.data.is_empty(), @@ -1662,14 +1665,18 @@ mod tests { "song_queue_id": song_q_id }); - match app.clone().oneshot( + match app + .clone() + .oneshot( axum::http::Request::builder() - .method(axum::http::Method::PATCH) - .uri(crate::callers::endpoints::QUEUESONGDATAWIPE) - .header(axum::http::header::CONTENT_TYPE, "application/json") - .body(axum::body::Body::from(payload.to_string())) - .unwrap() - ).await { + .method(axum::http::Method::PATCH) + .uri(crate::callers::endpoints::QUEUESONGDATAWIPE) + .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!( @@ -1680,8 +1687,17 @@ mod tests { ); let returned_id = &resp.data[0]; - assert_eq!(false, returned_id.is_nil(), "Returned id should not be nil {:?}", returned_id); - assert_eq!(*returned_id, song_q_id, "Returned id does not match sent id {:?} {:?}", returned_id, song_q_id); + assert_eq!( + false, + returned_id.is_nil(), + "Returned id should not be nil {:?}", + returned_id + ); + assert_eq!( + *returned_id, song_q_id, + "Returned id does not match sent id {:?} {:?}", + returned_id, song_q_id + ); } Err(err) => { assert!(false, "Error: {:?}", err); @@ -1698,7 +1714,6 @@ mod tests { } }; - let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } -- 2.47.3 From 83dd055c5eb6aba279809a0105c7f6826f9b2c61 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 4 Jun 2025 20:34:28 -0400 Subject: [PATCH 7/9] More refactoring --- src/main.rs | 243 +++++++--------------------------------------------- 1 file changed, 30 insertions(+), 213 deletions(-) diff --git a/src/main.rs b/src/main.rs index 716ccab..c42c4b1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -760,23 +760,7 @@ mod tests { let app = init::app(pool).await; // Send request - 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"); - assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); - - match queue_metadata_req(&app, &resp.data[0]).await { - Ok(response) => { - let resp = - get_resp_data::(response) - .await; - assert_eq!(false, resp.data.is_empty(), "Should not be empty"); - - let id = resp.data[0]; - - match fetch_metadata_queue_req(&app, &id).await { + match sequence_flow::queue_song_flow(&app).await { Ok(response) => { let resp = get_resp_data::< crate::callers::metadata::response::fetch_metadata::Response, @@ -787,17 +771,7 @@ mod tests { 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; } @@ -1028,36 +1002,7 @@ mod tests { 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"); - - match coverart_queue_song_queue_link_req(&app, &coverart_id, &song_queue_id) - .await - { - Ok(response) => { - 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" - ); - - match get_queued_coverart(&app, &resp_coverart_id).await { + match sequence_flow::queue_coverart_flow(&app, &song_queue_id).await { Ok(response) => { let resp = get_resp_data::< crate::callers::coverart::response::fetch_coverart_no_data::Response, @@ -1077,16 +1022,6 @@ mod tests { 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; @@ -1343,23 +1278,7 @@ mod tests { let app = init::app(pool).await; // Send request - 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"); - assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); - - match queue_metadata_req(&app, &resp.data[0]).await { - Ok(response) => { - let resp = - get_resp_data::(response) - .await; - assert_eq!(false, resp.data.is_empty(), "Should not be empty"); - - let id = resp.data[0]; - - match fetch_metadata_queue_req(&app, &id).await { + match sequence_flow::queue_song_flow(&app).await { Ok(response) => { let resp = get_resp_data::< crate::callers::metadata::response::fetch_metadata::Response, @@ -1394,17 +1313,7 @@ mod tests { 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; } @@ -1429,34 +1338,16 @@ mod tests { let app = init::app(pool).await; // Send request - 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"); - assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); - let song_queue_id = resp.data[0]; - assert_eq!(false, song_queue_id.is_nil(), "Should not be empty"); - - match queue_metadata_req(&app, &resp.data[0]).await { - Ok(response) => { - let resp = - get_resp_data::(response) - .await; - assert_eq!(false, resp.data.is_empty(), "Should not be empty"); - - let id = resp.data[0]; - - match fetch_metadata_queue_req(&app, &id).await { + match sequence_flow::queue_song_flow(&app).await { Ok(response) => { let resp = get_resp_data::< crate::callers::metadata::response::fetch_metadata::Response, >(response) .await; assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); - let song_q_id = resp.data[0].song_queue_id; + let song_queue_id = resp.data[0].song_queue_id; - match create_song_req(&app, &song_q_id).await { + match create_song_req(&app, &song_queue_id).await { Ok(response) => { let resp = get_resp_data::(response).await; assert_eq!( @@ -1476,36 +1367,35 @@ mod tests { eprintln!("Song: {:?}", song); - match upload_coverart_queue_req(&app).await { + + match sequence_flow::queue_coverart_flow( + &app, + &song_queue_id + ) + .await + { Ok(response) => { let resp = get_resp_data::< - crate::callers::coverart::response::Response, - >( - response - ) + crate::callers::coverart::response::fetch_coverart_no_data::Response, + >(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 resp_queue_coverart_id = resp.data[0].id; - match coverart_queue_song_queue_link_req( + match create_coverart_req( &app, - &coverart_id, - &song_queue_id, + &song_id, + &resp_queue_coverart_id, ) .await { Ok(response) => { let resp = get_resp_data::< - crate::callers::coverart::response::link::Response, + crate::callers::coverart::response::create_coverart::Response, >(response) .await; assert_eq!( @@ -1513,73 +1403,13 @@ mod tests { 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" - ); - - match get_queued_coverart( - &app, - &resp_coverart_id, - ) - .await - { - Ok(response) => { - let resp = get_resp_data::< - crate::callers::coverart::response::fetch_coverart_no_data::Response, - >(response) - .await; - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); - - match create_coverart_req( - &app, - &song_id, - &resp_coverart_id, - ) - .await - { - Ok(response) => { - let resp = get_resp_data::< - crate::callers::coverart::response::create_coverart::Response, - >(response) - .await; - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); - } - Err(err) => { - assert!( - false, - "Error: {:?}", - err - ); - } - } - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } } Err(err) => { - assert!(false, "Error: {:?}", err); + assert!( + false, + "Error: {:?}", + err + ); } } } @@ -1587,26 +1417,13 @@ mod tests { assert!(false, "Error: {:?}", err); } } - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } + } + } } 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 aade49507afeb397331a8bad38a79564f356f1fd Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 4 Jun 2025 20:34:45 -0400 Subject: [PATCH 8/9] Code refactoring --- src/main.rs | 264 ++++++++++++++++++++++++---------------------------- 1 file changed, 124 insertions(+), 140 deletions(-) diff --git a/src/main.rs b/src/main.rs index c42c4b1..6d99dfc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -760,18 +760,18 @@ mod tests { let app = init::app(pool).await; // Send request - match sequence_flow::queue_song_flow(&app).await { - Ok(response) => { - let resp = get_resp_data::< - crate::callers::metadata::response::fetch_metadata::Response, - >(response) - .await; - assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - }; + match sequence_flow::queue_song_flow(&app).await { + Ok(response) => { + let resp = get_resp_data::< + crate::callers::metadata::response::fetch_metadata::Response, + >(response) + .await; + assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); + } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + }; let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } @@ -1002,26 +1002,22 @@ mod tests { let song_queue_id = resp.data[0]; assert_eq!(false, song_queue_id.is_nil(), "Should not be empty"); - match sequence_flow::queue_coverart_flow(&app, &song_queue_id).await { - Ok(response) => { - let resp = get_resp_data::< - crate::callers::coverart::response::fetch_coverart_no_data::Response, - >(response) - .await; - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } + match sequence_flow::queue_coverart_flow(&app, &song_queue_id).await { + Ok(response) => { + let resp = get_resp_data::< + crate::callers::coverart::response::fetch_coverart_no_data::Response, + >(response) + .await; + 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; @@ -1278,42 +1274,45 @@ mod tests { let app = init::app(pool).await; // Send request - match sequence_flow::queue_song_flow(&app).await { - Ok(response) => { - let resp = get_resp_data::< - crate::callers::metadata::response::fetch_metadata::Response, - >(response) - .await; - assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); - let song_q_id = resp.data[0].song_queue_id; + match sequence_flow::queue_song_flow(&app).await { + Ok(response) => { + let resp = get_resp_data::< + crate::callers::metadata::response::fetch_metadata::Response, + >(response) + .await; + assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); + let song_q_id = resp.data[0].song_queue_id; - match create_song_req(&app, &song_q_id).await { - Ok(response) => { - let resp = get_resp_data::(response).await; - assert_eq!( - false, - resp.data.is_empty(), - "No songs found, Response {:?}", - resp - ); - let song = &resp.data[0]; - let song_id = song.id; - assert_eq!( - false, - song_id.is_nil(), - "Song id should not be nil {:?}", - song - ); - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - }; + match create_song_req(&app, &song_q_id).await { + Ok(response) => { + let resp = get_resp_data::< + crate::callers::song::response::create_metadata::Response, + >(response) + .await; + assert_eq!( + false, + resp.data.is_empty(), + "No songs found, Response {:?}", + resp + ); + let song = &resp.data[0]; + let song_id = song.id; + assert_eq!( + false, + song_id.is_nil(), + "Song id should not be nil {:?}", + song + ); + } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + } + } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + }; let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } @@ -1338,92 +1337,77 @@ mod tests { let app = init::app(pool).await; // Send request - match sequence_flow::queue_song_flow(&app).await { + match sequence_flow::queue_song_flow(&app).await { + Ok(response) => { + let resp = get_resp_data::< + crate::callers::metadata::response::fetch_metadata::Response, + >(response) + .await; + assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); + let song_queue_id = resp.data[0].song_queue_id; + + match create_song_req(&app, &song_queue_id).await { + Ok(response) => { + let resp = get_resp_data::< + crate::callers::song::response::create_metadata::Response, + >(response) + .await; + assert_eq!( + false, + resp.data.is_empty(), + "No songs found, Response {:?}", + resp + ); + let song = &resp.data[0]; + let song_id = song.id; + assert_eq!( + false, + song_id.is_nil(), + "Song id should not be nil {:?}", + song + ); + + eprintln!("Song: {:?}", song); + + match sequence_flow::queue_coverart_flow(&app, &song_queue_id).await { Ok(response) => { let resp = get_resp_data::< - crate::callers::metadata::response::fetch_metadata::Response, - >(response) - .await; - assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); - let song_queue_id = resp.data[0].song_queue_id; - - match create_song_req(&app, &song_queue_id).await { - Ok(response) => { - let resp = get_resp_data::(response).await; - assert_eq!( - false, - resp.data.is_empty(), - "No songs found, Response {:?}", - resp - ); - let song = &resp.data[0]; - let song_id = song.id; - assert_eq!( - false, - song_id.is_nil(), - "Song id should not be nil {:?}", - song - ); - - eprintln!("Song: {:?}", song); - - - match sequence_flow::queue_coverart_flow( - &app, - &song_queue_id - ) - .await - { - Ok(response) => { - let resp = get_resp_data::< crate::callers::coverart::response::fetch_coverart_no_data::Response, >(response) .await; - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); - let resp_queue_coverart_id = resp.data[0].id; + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + let resp_queue_coverart_id = resp.data[0].id; - match create_coverart_req( - &app, - &song_id, - &resp_queue_coverart_id, - ) - .await - { - Ok(response) => { - let resp = get_resp_data::< + match create_coverart_req(&app, &song_id, &resp_queue_coverart_id) + .await + { + Ok(response) => { + let resp = get_resp_data::< crate::callers::coverart::response::create_coverart::Response, >(response) .await; - assert_eq!( - false, - resp.data.is_empty(), - "Should not be empty" - ); - } - Err(err) => { - assert!( - false, - "Error: {:?}", - err - ); - } - } - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } - } - } - } + assert_eq!( + false, + resp.data.is_empty(), + "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 a21fbbfd9895a986410e98f66940f1030da75e39 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 4 Jun 2025 20:36:21 -0400 Subject: [PATCH 9/9] Last bit of tidying up --- src/main.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index 6d99dfc..9d68922 100644 --- a/src/main.rs +++ b/src/main.rs @@ -429,8 +429,6 @@ mod tests { } mod sequence_flow { - // use tower::ServiceExt; - // Flow for queueing song pub async fn queue_song_flow( app: &axum::Router, @@ -466,6 +464,7 @@ mod tests { } } + // Flow for queueing coverart pub async fn queue_coverart_flow( app: &axum::Router, song_queue_id: &uuid::Uuid, -- 2.47.3