diff --git a/src/callers/playback.rs b/src/callers/playback.rs index e50a30a..c1a3ab4 100644 --- a/src/callers/playback.rs +++ b/src/callers/playback.rs @@ -1,20 +1,17 @@ - - - pub mod queue { const PLAYBACK_QUEUE_DEVICE_TYPE_BROWSER: &str = "BROWSER"; const PLAYBACK_QUEUE_DEVICE_TYPE_MOBILE: &str = "MOBILE"; -#[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] -pub struct PlaybackQueue { - pub id: uuid::Uuid, - pub name: String, - pub device_type: String, - pub user_id: uuid::Uuid, - #[serde(with = "time::serde::rfc3339::option")] - pub date_created: Option -} + #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] + pub struct PlaybackQueue { + pub id: uuid::Uuid, + pub name: String, + pub device_type: String, + pub user_id: uuid::Uuid, + #[serde(with = "time::serde::rfc3339::option")] + pub date_created: Option, + } pub mod request { pub mod create_playback_queue { @@ -24,12 +21,13 @@ pub struct PlaybackQueue { pub struct CreatePlaybackQueueRequest { pub name: String, pub device_type: String, - pub user_id: uuid::Uuid + pub user_id: uuid::Uuid, } impl CreatePlaybackQueueRequest { pub fn is_valid(&self) -> bool { - let pre_check = !self.user_id.is_nil() && !self.name.is_empty() && !self.user_id.is_nil(); + let pre_check = + !self.user_id.is_nil() && !self.name.is_empty() && !self.user_id.is_nil(); pre_check && self.valid_device_type() } @@ -58,12 +56,12 @@ pub struct PlaybackQueue { } pub mod endpoint { - use axum::{http, Extension, Json}; + use axum::{Extension, Json, http}; use http::StatusCode; use crate::repo::playback::queue as playback_repo; - #[utoipa::path( + #[utoipa::path( post, path = super::super::super::endpoints::CREATEPLAYBACKQUEUE, request_body( @@ -79,27 +77,31 @@ pub struct PlaybackQueue { ) )] pub async fn create_playback_queue( - Extension(pool): Extension, - Json(payload): Json, + Extension(pool): Extension, + Json(payload): Json, ) -> ( - axum::http::StatusCode, + axum::http::StatusCode, axum::Json, - ) { - let mut response = super::response::create_playback_queue::CreatePlaybackQueueResponse::default(); + let mut response = + super::response::create_playback_queue::CreatePlaybackQueueResponse::default(); if !payload.is_valid() { response.message = super::super::super::response::INVALID.to_string(); (StatusCode::BAD_REQUEST, Json(response)) } else { - let res = match playback_repo::queue_existence_search(&pool, &payload.device_type, &payload.user_id).await { - Ok(result) => { - result - } + let res = match playback_repo::queue_existence_search( + &pool, + &payload.device_type, + &payload.user_id, + ) + .await + { + Ok(result) => result, Err(err) => { eprintln!("Error: {err:?}"); response.message = err.to_string(); - return (StatusCode::INTERNAL_SERVER_ERROR, Json(response)) + return (StatusCode::INTERNAL_SERVER_ERROR, Json(response)); } }; @@ -119,7 +121,8 @@ pub struct PlaybackQueue { playback_queue.id = id; playback_queue.date_created = Some(date_created); response.data.push(playback_queue); - response.message = super::super::super::response::SUCCESSFUL.to_string(); + response.message = + super::super::super::response::SUCCESSFUL.to_string(); (StatusCode::CREATED, Json(response)) } diff --git a/src/config/init.rs b/src/config/init.rs index 1e8c897..bad3f83 100644 --- a/src/config/init.rs +++ b/src/config/init.rs @@ -5,11 +5,11 @@ use tower_http::timeout::TimeoutLayer; use utoipa::OpenApi; use crate::callers::coverart as coverart_caller; +use crate::callers::playback::queue as playback_caller; use crate::callers::queue::coverart as coverart_queue_callers; use crate::callers::queue::metadata as metadata_queue_caller; use crate::callers::queue::song as song_queue_callers; use crate::callers::song as song_caller; -use crate::callers::playback::queue as playback_caller; use coverart_caller::endpoint as coverart_endpoints; use coverart_caller::response as coverart_responses; @@ -17,12 +17,12 @@ use coverart_queue_callers::endpoint as coverart_queue_endpoints; use coverart_queue_callers::response as coverart_queue_responses; use metadata_queue_caller::endpoint as metadata_queue_endpoints; use metadata_queue_caller::response as metadata_queue_responses; +use playback_caller::endpoint as playback_endpoints; +use playback_caller::response as playback_responses; use song_caller::endpoint as song_endpoints; use song_caller::response as song_responses; use song_queue_callers::endpoint as song_queue_endpoints; use song_queue_callers::response as song_queue_responses; -use playback_caller::endpoint as playback_endpoints; -use playback_caller::response as playback_responses; mod cors { pub async fn configure_cors() -> tower_http::cors::CorsLayer { diff --git a/src/repo/playback.rs b/src/repo/playback.rs index 047767c..5ec95bb 100644 --- a/src/repo/playback.rs +++ b/src/repo/playback.rs @@ -1,12 +1,13 @@ - pub mod queue { use sqlx::{PgPool, Row}; // use sqlx::postgres::PgRow; - use sqlx::Error as SqlxError; use crate::callers::playback::queue::PlaybackQueue; + use sqlx::Error as SqlxError; - pub async fn create_queue(pool: &PgPool, playback_queue: &PlaybackQueue) -> Result<(uuid::Uuid, time::OffsetDateTime), SqlxError> { - + pub async fn create_queue( + pool: &PgPool, + playback_queue: &PlaybackQueue, + ) -> Result<(uuid::Uuid, time::OffsetDateTime), SqlxError> { let query = r#" INSERT INTO "playbackQueue" (name, device_type, user_id) VALUES ($1, $2, $3) @@ -18,22 +19,30 @@ pub mod queue { .bind(&playback_queue.device_type) .bind(&playback_queue.user_id) .fetch_one(pool) - .await { + .await + { Ok(row) => { - let id = row.try_get("id").map_err(|_e| SqlxError::RowNotFound).unwrap(); - let date_created = row.try_get("date_created").map_err(|_e| SqlxError::RowNotFound).unwrap(); + let id = row + .try_get("id") + .map_err(|_e| SqlxError::RowNotFound) + .unwrap(); + let date_created = row + .try_get("date_created") + .map_err(|_e| SqlxError::RowNotFound) + .unwrap(); Ok((id, date_created)) } - Err(err) => { - Err(err) - } + Err(err) => Err(err), } } - pub async fn queue_existence_search(pool: &PgPool, device_type: &str, user_id: &uuid::Uuid) -> Result { - let query = - r#" + pub async fn queue_existence_search( + pool: &PgPool, + device_type: &str, + user_id: &uuid::Uuid, + ) -> Result { + let query = r#" SELECT id FROM "playbackQueue" WHERE device_type = $1 AND user_id = $2; "#; @@ -42,14 +51,13 @@ pub mod queue { .bind(device_type) .bind(user_id) .execute(pool) - .await { + .await + { Ok(row) => { let rows_affected = row.rows_affected(); Ok(rows_affected > 0) } - Err(err) => { - Err(err) - } + Err(err) => Err(err), } }