phoenix/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

Formatting

Browse Source
This commit is contained in:
kdeng00
2025-04-29 21:37:24 -04:00
parent fe818fc154
commit 07eead8b92
2 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/callers/metadata.rs
+41 -43
View File
@@ -171,29 +171,30 @@ pub mod metadata_queue {
}); });
match result { match result {
Ok(row) => Ok(row) => {
{ let data: serde_json::Value = row
let data: serde_json::Value = row.try_get("metadata").map_err(|_e| sqlx::Error::RowNotFound).unwrap(); .try_get("metadata")
.map_err(|_e| sqlx::Error::RowNotFound)
.unwrap();
Ok(MetadataQueue { Ok(MetadataQueue {
id: row id: row
.try_get("id") .try_get("id")
.map_err(|_e| sqlx::Error::RowNotFound) .map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(), .unwrap(),
metadata: data, metadata: data,
created_at: row created_at: row
.try_get("created_at") .try_get("created_at")
.map_err(|_e| sqlx::Error::RowNotFound) .map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(), .unwrap(),
song_queue_id: row song_queue_id: row
.try_get("song_queue_id") .try_get("song_queue_id")
.map_err(|_e| sqlx::Error::RowNotFound) .map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(), .unwrap(),
}) })
}, }
Err(_err) => Err(sqlx::Error::RowNotFound), Err(_err) => Err(sqlx::Error::RowNotFound),
} }
} }
} }
pub mod endpoint { pub mod endpoint {
@@ -235,8 +236,23 @@ pub mod endpoint {
Some(id) => { Some(id) => {
println!("Something works {:?}", id); println!("Something works {:?}", id);
match super::metadata_queue::get_with_id(&pool, &id).await {
match super::metadata_queue::get_with_id(&pool, &id).await { Ok(item) => {
response.message = String::from("Successful");
response.data.push(item);
(StatusCode::OK, Json(response))
}
Err(err) => {
response.message = err.to_string();
(StatusCode::BAD_REQUEST, Json(response))
}
}
}
_ => match params.song_queue_id {
Some(song_queue_id) => {
println!("Song queue Id is probably not nil");
match super::metadata_queue::get_with_song_queue_id(&pool, &song_queue_id).await
{
Ok(item) => { Ok(item) => {
response.message = String::from("Successful"); response.message = String::from("Successful");
response.data.push(item); response.data.push(item);
@@ -247,30 +263,12 @@ pub mod endpoint {
(StatusCode::BAD_REQUEST, Json(response)) (StatusCode::BAD_REQUEST, Json(response))
} }
} }
}
_ => {
match params.song_queue_id {
Some(song_queue_id) => {
println!("Song queue Id is probably not nil");
match super::metadata_queue::get_with_song_queue_id(&pool, &song_queue_id).await
{
Ok(item) => {
response.message = String::from("Successful");
response.data.push(item);
(StatusCode::OK, Json(response))
}
Err(err) => {
response.message = err.to_string();
(StatusCode::BAD_REQUEST, Json(response))
}
}
}
None => {
println!("What is going on?");
(StatusCode::BAD_REQUEST, Json(response))
}
} }
} None => {
println!("What is going on?");
(StatusCode::BAD_REQUEST, Json(response))
}
},
} }
} }
} }
src/main.rs
+15 -12
View File
@@ -565,18 +565,21 @@ mod tests {
let id = resp.data[0]; let id = resp.data[0];
let uri = format!("{}?id={}", crate::callers::endpoints::QUEUEMETADATA, id); let uri = format!("{}?id={}", crate::callers::endpoints::QUEUEMETADATA, id);
match app.clone().oneshot( match app
axum::http::Request::builder() .clone()
.method(axum::http::Method::GET) .oneshot(
// .uri(crate::callers::endpoints::QUEUEMETADATA) axum::http::Request::builder()
.uri(crate::callers::endpoints::QUEUEMETADATA) .method(axum::http::Method::GET)
.header(axum::http::header::CONTENT_TYPE, "application/json") // .uri(crate::callers::endpoints::QUEUEMETADATA)
// .body(axum::body::Body::from(new_payload.to_string())) .uri(crate::callers::endpoints::QUEUEMETADATA)
.body(axum::body::Body::empty()) .header(axum::http::header::CONTENT_TYPE, "application/json")
.unwrap(), // .body(axum::body::Body::from(new_payload.to_string()))
).await { .body(axum::body::Body::empty())
Ok(response) => { .unwrap(),
} )
.await
{
Ok(response) => {}
Err(err) => { Err(err) => {
assert!(false, "Error: {:?}", err); assert!(false, "Error: {:?}", err);
} }