tsk-271: Got it to build
This commit is contained in:
3 files changed
+50
-10
No files matched your search
+20
-6
@@ -20,7 +20,7 @@ pub struct PlaybackQueue {
|
|||||||
pub mod create_playback_queue {
|
pub mod create_playback_queue {
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Debug, Default, Deserialize, Serialize)]
|
#[derive(Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
|
||||||
pub struct CreatePlaybackQueueRequest {
|
pub struct CreatePlaybackQueueRequest {
|
||||||
pub name: String,
|
pub name: String,
|
||||||
pub device_type: String,
|
pub device_type: String,
|
||||||
@@ -49,7 +49,7 @@ pub struct PlaybackQueue {
|
|||||||
pub mod create_playback_queue {
|
pub mod create_playback_queue {
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Debug, Default, Deserialize, Serialize)]
|
#[derive(Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
|
||||||
pub struct CreatePlaybackQueueResponse {
|
pub struct CreatePlaybackQueueResponse {
|
||||||
pub message: String,
|
pub message: String,
|
||||||
pub data: Vec<super::super::PlaybackQueue>,
|
pub data: Vec<super::super::PlaybackQueue>,
|
||||||
@@ -60,10 +60,24 @@ pub struct PlaybackQueue {
|
|||||||
pub mod endpoint {
|
pub mod endpoint {
|
||||||
use axum::{http, Extension, Json};
|
use axum::{http, Extension, Json};
|
||||||
use http::StatusCode;
|
use http::StatusCode;
|
||||||
// use josekit::jwe::zip::deflate::DeflateJweCompression::Def;
|
|
||||||
|
|
||||||
use crate::repo::playback as playback_repo;
|
use crate::repo::playback::queue as playback_repo;
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
post,
|
||||||
|
path = super::super::super::endpoints::CREATEPLAYBACKQUEUE,
|
||||||
|
request_body(
|
||||||
|
content = super::request::create_playback_queue::CreatePlaybackQueueRequest,
|
||||||
|
description = "Create playback queue for a user",
|
||||||
|
content_type = "application/json"
|
||||||
|
),
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Queue already exists", body = super::response::create_playback_queue::CreatePlaybackQueueResponse),
|
||||||
|
(status = 201, description = "Playback queue created", body = super::response::create_playback_queue::CreatePlaybackQueueResponse),
|
||||||
|
(status = 400, description = "Bad request", body = super::response::create_playback_queue::CreatePlaybackQueueResponse),
|
||||||
|
(status = 505, description = "Something went wrong", body = super::response::create_playback_queue::CreatePlaybackQueueResponse)
|
||||||
|
)
|
||||||
|
)]
|
||||||
pub async fn create_playback_queue(
|
pub async fn create_playback_queue(
|
||||||
Extension(pool): Extension<sqlx::PgPool>,
|
Extension(pool): Extension<sqlx::PgPool>,
|
||||||
Json(payload): Json<super::request::create_playback_queue::CreatePlaybackQueueRequest>,
|
Json(payload): Json<super::request::create_playback_queue::CreatePlaybackQueueRequest>,
|
||||||
@@ -78,7 +92,7 @@ pub struct PlaybackQueue {
|
|||||||
response.message = super::super::super::response::INVALID.to_string();
|
response.message = super::super::super::response::INVALID.to_string();
|
||||||
(StatusCode::BAD_REQUEST, Json(response))
|
(StatusCode::BAD_REQUEST, Json(response))
|
||||||
} else {
|
} else {
|
||||||
let res = match playback_repo::queue::queue_existence_search(&pool, &payload.device_type, &payload.user_id).await {
|
let res = match playback_repo::queue_existence_search(&pool, &payload.device_type, &payload.user_id).await {
|
||||||
Ok(result) => {
|
Ok(result) => {
|
||||||
result
|
result
|
||||||
}
|
}
|
||||||
@@ -100,7 +114,7 @@ pub struct PlaybackQueue {
|
|||||||
user_id: payload.user_id,
|
user_id: payload.user_id,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
match playback_repo::queue::create_queue(&pool, &playback_queue).await {
|
match playback_repo::create_queue(&pool, &playback_queue).await {
|
||||||
Ok((id, date_created)) => {
|
Ok((id, date_created)) => {
|
||||||
playback_queue.id = id;
|
playback_queue.id = id;
|
||||||
playback_queue.date_created = Some(date_created);
|
playback_queue.date_created = Some(date_created);
|
||||||
|
|||||||
+10
-2
@@ -9,6 +9,8 @@ use crate::callers::queue::coverart as coverart_queue_callers;
|
|||||||
use crate::callers::queue::metadata as metadata_queue_caller;
|
use crate::callers::queue::metadata as metadata_queue_caller;
|
||||||
use crate::callers::queue::song as song_queue_callers;
|
use crate::callers::queue::song as song_queue_callers;
|
||||||
use crate::callers::song as song_caller;
|
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::endpoint as coverart_endpoints;
|
||||||
use coverart_caller::response as coverart_responses;
|
use coverart_caller::response as coverart_responses;
|
||||||
use coverart_queue_callers::endpoint as coverart_queue_endpoints;
|
use coverart_queue_callers::endpoint as coverart_queue_endpoints;
|
||||||
@@ -19,6 +21,8 @@ use song_caller::endpoint as song_endpoints;
|
|||||||
use song_caller::response as song_responses;
|
use song_caller::response as song_responses;
|
||||||
use song_queue_callers::endpoint as song_queue_endpoints;
|
use song_queue_callers::endpoint as song_queue_endpoints;
|
||||||
use song_queue_callers::response as song_queue_responses;
|
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 {
|
mod cors {
|
||||||
pub async fn configure_cors() -> tower_http::cors::CorsLayer {
|
pub async fn configure_cors() -> tower_http::cors::CorsLayer {
|
||||||
@@ -73,14 +77,14 @@ mod cors {
|
|||||||
song_endpoints::delete_song, coverart_queue_endpoints::queue, coverart_queue_endpoints::link, coverart_queue_endpoints::fetch_coverart_no_data,
|
song_endpoints::delete_song, coverart_queue_endpoints::queue, coverart_queue_endpoints::link, coverart_queue_endpoints::fetch_coverart_no_data,
|
||||||
coverart_queue_endpoints::fetch_coverart_with_data, coverart_endpoints::create_coverart, coverart_queue_endpoints::wipe_data_from_coverart_queue,
|
coverart_queue_endpoints::fetch_coverart_with_data, coverart_endpoints::create_coverart, coverart_queue_endpoints::wipe_data_from_coverart_queue,
|
||||||
coverart_endpoints::get_coverart, coverart_endpoints::download_coverart,
|
coverart_endpoints::get_coverart, coverart_endpoints::download_coverart,
|
||||||
metadata_queue_endpoints::queue_metadata, metadata_queue_endpoints::fetch_metadata),
|
metadata_queue_endpoints::queue_metadata, metadata_queue_endpoints::fetch_metadata, playback_endpoints::create_playback_queue),
|
||||||
components(schemas(song_queue_callers::response::song_queue::Response, song_queue_callers::response::link_user_id::Response, song_queue_callers::response::fetch_queue_song::Response,
|
components(schemas(song_queue_callers::response::song_queue::Response, song_queue_callers::response::link_user_id::Response, song_queue_callers::response::fetch_queue_song::Response,
|
||||||
song_queue_responses::update_status::Response, song_queue_callers::response::update_song_queue::Response, song_responses::create_metadata::Response,
|
song_queue_responses::update_status::Response, song_queue_callers::response::update_song_queue::Response, song_responses::create_metadata::Response,
|
||||||
song_queue_callers::response::wipe_data_from_song_queue::Response, song_responses::get_songs::Response, song_responses::delete_song::Response,
|
song_queue_callers::response::wipe_data_from_song_queue::Response, song_responses::get_songs::Response, song_responses::delete_song::Response,
|
||||||
coverart_queue_responses::queue::Response, coverart_queue_responses::link::Response, coverart_queue_responses::fetch_coverart_no_data::Response,
|
coverart_queue_responses::queue::Response, coverart_queue_responses::link::Response, coverart_queue_responses::fetch_coverart_no_data::Response,
|
||||||
coverart_queue_responses::fetch_coverart_with_data::Response, coverart_responses::create_coverart::Response,
|
coverart_queue_responses::fetch_coverart_with_data::Response, coverart_responses::create_coverart::Response,
|
||||||
coverart_queue_responses::wipe_data_from_coverart_queue::Response, coverart_responses::get_coverart::Response,
|
coverart_queue_responses::wipe_data_from_coverart_queue::Response, coverart_responses::get_coverart::Response,
|
||||||
metadata_queue_responses::queue_metadata::Response, metadata_queue_responses::fetch_metadata::Response)),
|
metadata_queue_responses::queue_metadata::Response, metadata_queue_responses::fetch_metadata::Response, playback_responses::create_playback_queue::CreatePlaybackQueueResponse)),
|
||||||
tags(
|
tags(
|
||||||
(name = "soaricarus API", description = "Web API to manage music")
|
(name = "soaricarus API", description = "Web API to manage music")
|
||||||
)
|
)
|
||||||
@@ -227,6 +231,10 @@ pub async fn routes() -> axum::Router {
|
|||||||
crate::callers::endpoints::GETALLSONGS,
|
crate::callers::endpoints::GETALLSONGS,
|
||||||
get(crate::callers::song::endpoint::get_all_songs),
|
get(crate::callers::song::endpoint::get_all_songs),
|
||||||
)
|
)
|
||||||
|
.route(
|
||||||
|
crate::callers::endpoints::CREATEPLAYBACKQUEUE,
|
||||||
|
post(playback_endpoints::create_playback_queue),
|
||||||
|
)
|
||||||
.layer(cors::configure_cors().await)
|
.layer(cors::configure_cors().await)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+20
-2
@@ -5,7 +5,7 @@ pub mod queue {
|
|||||||
use sqlx::Error as SqlxError;
|
use sqlx::Error as SqlxError;
|
||||||
use crate::callers::playback::queue::PlaybackQueue;
|
use crate::callers::playback::queue::PlaybackQueue;
|
||||||
|
|
||||||
pub async fn create_queue(pool: &PgPool, playback_queue: &PlaybackQueue) -> Result<(time::OffsetDateTime, uuid::Uuid), SqlxError> {
|
pub async fn create_queue(pool: &PgPool, playback_queue: &PlaybackQueue) -> Result<(uuid::Uuid, time::OffsetDateTime), SqlxError> {
|
||||||
|
|
||||||
let query = r#"
|
let query = r#"
|
||||||
INSERT INTO "playbackQueue" (name, device_type, user_id)
|
INSERT INTO "playbackQueue" (name, device_type, user_id)
|
||||||
@@ -32,7 +32,25 @@ pub mod queue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub async fn queue_existence_search(pool: &PgPool, device_type: &str, user_id: &uuid::Uuid) -> Result<bool, SqlxError> {
|
pub async fn queue_existence_search(pool: &PgPool, device_type: &str, user_id: &uuid::Uuid) -> Result<bool, SqlxError> {
|
||||||
Ok(false)
|
let query =
|
||||||
|
r#"
|
||||||
|
SELECT id FROM "playbackQueue"
|
||||||
|
WHERE device_type = $1 AND user_id = $2;
|
||||||
|
"#;
|
||||||
|
|
||||||
|
match sqlx::query(query)
|
||||||
|
.bind(device_type)
|
||||||
|
.bind(user_id)
|
||||||
|
.execute(pool)
|
||||||
|
.await {
|
||||||
|
Ok(row) => {
|
||||||
|
let rows_affected = row.rows_affected();
|
||||||
|
Ok(rows_affected > 0)
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
Err(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: For later
|
// TODO: For later
|
||||||
|
|||||||
Reference in new issue
Block a user