From f48c7ee99ce110eeb09a1133d796ba98f5efff54 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 20 Nov 2026 16:38:54 -0500 Subject: [PATCH] tsk-271: One down --- src/main.rs | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main.rs b/src/main.rs index abf9622..60cfd7a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -117,13 +117,15 @@ mod tests { } mod util { + use axum::response; + pub async fn resp_to_bytes( - response: axum::response::Response, + response: response::Response, ) -> Result { axum::body::to_bytes(response.into_body(), usize::MAX).await } - pub async fn get_resp_data(response: axum::response::Response) -> Data + pub async fn get_resp_data(response: response::Response) -> Data where Data: for<'a> serde::Deserialize<'a>, { @@ -809,8 +811,11 @@ mod tests { } pub mod payload_data { - pub async fn queue_metadata(song_queue_id: &uuid::Uuid) -> serde_json::Value { - serde_json::json!( + use serde_json::Value as JsonValue; + use serde_json::json; + + pub async fn queue_metadata(song_queue_id: &uuid::Uuid) -> JsonValue { + json!( { "song_queue_id": song_queue_id, "album" : "I", @@ -827,11 +832,8 @@ mod tests { }) } - pub async fn create_song( - song_queue_id: &uuid::Uuid, - user_id: &uuid::Uuid, - ) -> serde_json::Value { - serde_json::json!({ + pub async fn create_song(song_queue_id: &uuid::Uuid, user_id: &uuid::Uuid) -> JsonValue { + json!({ "title" : "Hypocrite Like The Rest", "artist" : "Kuoth", "album_artist": "Kuoth", @@ -853,8 +855,8 @@ mod tests { name: &str, device_type: &str, user_id: &uuid::Uuid, - ) -> serde_json::Value { - serde_json::json!({ + ) -> JsonValue { + json!({ "name": name, "device_type": device_type, "user_id": user_id @@ -864,8 +866,8 @@ mod tests { pub async fn link_user_to_queued_song( song_queue_id: &uuid::Uuid, user_id: &uuid::Uuid, - ) -> serde_json::Value { - serde_json::json!({ + ) -> JsonValue { + json!({ "song_queue_id": song_queue_id, "user_id": user_id }) @@ -874,8 +876,8 @@ mod tests { pub async fn link_queued_coverart_to_queued_song( song_queue_id: &uuid::Uuid, coverart_queue_id: &uuid::Uuid, - ) -> serde_json::Value { - serde_json::json!({ + ) -> JsonValue { + json!({ "song_queue_id": song_queue_id, "coverart_id": coverart_queue_id }) @@ -884,17 +886,15 @@ mod tests { pub async fn create_coverart( song_id: &uuid::Uuid, coverart_queue_id: &uuid::Uuid, - ) -> serde_json::Value { - serde_json::json!({ + ) -> JsonValue { + json!({ "song_id": song_id, "coverart_queue_id": coverart_queue_id }) } - pub async fn update_song_queue_status_to_ready( - song_queue_id: &uuid::Uuid, - ) -> serde_json::Value { - serde_json::json!({ + pub async fn update_song_queue_status_to_ready(song_queue_id: &uuid::Uuid) -> JsonValue { + json!({ "id": song_queue_id, "status": soaricarus_api::repo::queue::song::status::READY })