From 08545221359ae718f2e1d4335dda1b7749324995 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Wed, 21 May 2025 19:15:33 -0400 Subject: [PATCH] Code formatting --- src/callers/coverart.rs | 116 +++++++++++++++++++++++----------------- src/main.rs | 61 ++++++++++++++------- 2 files changed, 108 insertions(+), 69 deletions(-) diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs index d31ecdc..e2c918c 100644 --- a/src/callers/coverart.rs +++ b/src/callers/coverart.rs @@ -56,7 +56,6 @@ pub mod response { pub mod db { use sqlx::Row; - pub async fn insert(pool: &sqlx::PgPool, data: &Vec) -> Result { let result = sqlx::query( r#" @@ -103,51 +102,65 @@ pub mod db { } } - pub async fn get_coverart_queue_with_id(pool: &sqlx::PgPool, id: &uuid::Uuid) -> Result { + pub async fn get_coverart_queue_with_id( + pool: &sqlx::PgPool, + id: &uuid::Uuid, + ) -> Result { let result = sqlx::query( r#" SELECT id, song_queue_id FROM "coverartQueue" WHERE id = $1; - "# - ) - .bind(id) - .fetch_one(pool) - .await - .map_err(|e| { - eprintln!("Error querying data: {:?}", e); - }); + "#, + ) + .bind(id) + .fetch_one(pool) + .await + .map_err(|e| { + eprintln!("Error querying data: {:?}", e); + }); match result { - Ok(row) => { - Ok(super::CoverArtQueue { - id: row.try_get("id").map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - song_queue_id: row.try_get("song_queue_id").map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - }) - } - Err(_) => Err(sqlx::Error::RowNotFound) + Ok(row) => Ok(super::CoverArtQueue { + id: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + song_queue_id: row + .try_get("song_queue_id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + }), + Err(_) => Err(sqlx::Error::RowNotFound), } } - pub async fn get_coverart_queue_with_song_queue_id(pool: &sqlx::PgPool, song_queue_id: &uuid::Uuid) -> Result { + pub async fn get_coverart_queue_with_song_queue_id( + pool: &sqlx::PgPool, + song_queue_id: &uuid::Uuid, + ) -> Result { let result = sqlx::query( r#" SELECT id, song_queue_id FROM "coverartQueue" WHERE song_queue_id = $1; - "# - ) - .bind(song_queue_id) - .fetch_one(pool) - .await - .map_err(|e| { - eprintln!("Error querying data: {:?}", e); - }); + "#, + ) + .bind(song_queue_id) + .fetch_one(pool) + .await + .map_err(|e| { + eprintln!("Error querying data: {:?}", e); + }); match result { - Ok(row) => { - Ok(super::CoverArtQueue { - id: row.try_get("id").map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - song_queue_id: row.try_get("song_queue_id").map_err(|_e| sqlx::Error::RowNotFound).unwrap(), - }) - } - Err(_) => Err(sqlx::Error::RowNotFound) + Ok(row) => Ok(super::CoverArtQueue { + id: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + song_queue_id: row + .try_get("song_queue_id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + }), + Err(_) => Err(sqlx::Error::RowNotFound), } } } @@ -227,27 +240,32 @@ pub mod endpoint { pub async fn fetch_coverart_no_data( axum::Extension(pool): axum::Extension, - axum::extract::Query(params): axum::extract::Query, - ) -> (axum::http::StatusCode, axum::Json) { + axum::extract::Query(params): axum::extract::Query< + super::request::fetch_coverart_no_data::Params, + >, + ) -> ( + axum::http::StatusCode, + axum::Json, + ) { let mut response = super::response::fetch_coverart_no_data::Response::default(); match params.id { - Some(id) => { - match super::db::get_coverart_queue_with_id(&pool, &id).await { - Ok(cover_art_queue) => { - response.message = String::from("Successful"); - response.data.push(cover_art_queue); - (axum::http::StatusCode::OK, axum::Json(response)) - } - Err(err) => { - response.message = err.to_string(); - (axum::http::StatusCode::BAD_REQUEST, axum::Json(response)) - } + Some(id) => match super::db::get_coverart_queue_with_id(&pool, &id).await { + Ok(cover_art_queue) => { + response.message = String::from("Successful"); + response.data.push(cover_art_queue); + (axum::http::StatusCode::OK, axum::Json(response)) } - } + Err(err) => { + response.message = err.to_string(); + (axum::http::StatusCode::BAD_REQUEST, axum::Json(response)) + } + }, _ => match params.song_queue_id { Some(song_queue_id) => { - match super::db::get_coverart_queue_with_song_queue_id(&pool, &song_queue_id).await { + match super::db::get_coverart_queue_with_song_queue_id(&pool, &song_queue_id) + .await + { Ok(cover_art_queue) => { response.message = String::from("Successful"); response.data.push(cover_art_queue); @@ -263,7 +281,7 @@ pub mod endpoint { response.message = String::from("No valid id provided"); (axum::http::StatusCode::BAD_REQUEST, axum::Json(response)) } - } + }, } } } diff --git a/src/main.rs b/src/main.rs index a510eb9..67feca9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -95,8 +95,8 @@ pub mod init { ) .route( crate::callers::endpoints::QUEUECOVERART, - get(crate::callers::coverart::endpoint::fetch_coverart_no_data) - ) + get(crate::callers::coverart::endpoint::fetch_coverart_no_data), + ) .route( crate::callers::endpoints::QUEUECOVERARTLINK, patch(crate::callers::coverart::endpoint::link), @@ -302,18 +302,22 @@ mod tests { app.clone().oneshot(req).await } - async fn coverart_queue_song_queue_link_req(app: &axum::Router, coverart_id: &uuid::Uuid, song_queue_id: &uuid::Uuid) -> Result { + async fn coverart_queue_song_queue_link_req( + app: &axum::Router, + coverart_id: &uuid::Uuid, + song_queue_id: &uuid::Uuid, + ) -> Result { let payload = serde_json::json!( { "song_queue_id": song_queue_id, "coverart_id" : coverart_id, }); let req = 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(); + .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(); app.clone().oneshot(req).await } @@ -718,7 +722,8 @@ mod tests { 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 + match coverart_queue_song_queue_link_req(&app, &coverart_id, &song_queue_id) + .await { Ok(response) => { let resp = get_resp_data::< @@ -880,7 +885,8 @@ mod tests { 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 + match coverart_queue_song_queue_link_req(&app, &coverart_id, &song_queue_id) + .await { Ok(response) => { let resp = get_resp_data::< @@ -898,22 +904,37 @@ mod tests { "Should not be empty" ); - let uri = format!("{}?id={}", crate::callers::endpoints::QUEUECOVERART, resp_coverart_id); + let uri = format!( + "{}?id={}", + crate::callers::endpoints::QUEUECOVERART, + resp_coverart_id + ); - match app.clone().oneshot( - axum::http::Request::builder() - .method(axum::http::Method::GET) - .uri(uri) - .header(axum::http::header::CONTENT_TYPE, "application/json") - .body(axum::body::Body::empty()) - .unwrap() - ).await { + match app + .clone() + .oneshot( + axum::http::Request::builder() + .method(axum::http::Method::GET) + .uri(uri) + .header( + axum::http::header::CONTENT_TYPE, + "application/json", + ) + .body(axum::body::Body::empty()) + .unwrap(), + ) + .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"); + assert_eq!( + false, + resp.data.is_empty(), + "Should not be empty" + ); } Err(err) => { assert!(false, "Error: {:?}", err);