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

More refactoring

Browse Source
This commit is contained in:
kdeng00
2025-06-04 20:34:28 -04:00
parent 392c4cb8a8
commit 83dd055c5e
1 changed files with 30 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.rs
+10 -193
View File
@@ -760,23 +760,7 @@ mod tests {
let app = init::app(pool).await; let app = init::app(pool).await;
// Send request // Send request
match song_queue_req(&app).await { match sequence_flow::queue_song_flow(&app).await {
Ok(response) => {
let resp =
get_resp_data::<crate::callers::song::response::Response>(response).await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
assert_eq!(false, resp.data[0].is_nil(), "Should not be empty");
match queue_metadata_req(&app, &resp.data[0]).await {
Ok(response) => {
let resp =
get_resp_data::<crate::callers::song::response::Response>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let id = resp.data[0];
match fetch_metadata_queue_req(&app, &id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::metadata::response::fetch_metadata::Response, crate::callers::metadata::response::fetch_metadata::Response,
@@ -787,16 +771,6 @@ mod tests {
Err(err) => { Err(err) => {
assert!(false, "Error: {:?}", err); assert!(false, "Error: {:?}", err);
} }
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}; };
let _ = db_mgr::drop_database(&tm_pool, &db_name).await; let _ = db_mgr::drop_database(&tm_pool, &db_name).await;
@@ -1028,36 +1002,7 @@ mod tests {
let song_queue_id = resp.data[0]; let song_queue_id = resp.data[0];
assert_eq!(false, song_queue_id.is_nil(), "Should not be empty"); assert_eq!(false, song_queue_id.is_nil(), "Should not be empty");
// Send request match sequence_flow::queue_coverart_flow(&app, &song_queue_id).await {
match upload_coverart_queue_req(&app).await {
Ok(response) => {
let resp =
get_resp_data::<crate::callers::coverart::response::Response>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
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
{
Ok(response) => {
let resp = get_resp_data::<
crate::callers::coverart::response::link::Response,
>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let resp_coverart_id = resp.data[0].coverart_id;
let resp_song_queue_id = resp.data[0].song_queue_id;
assert_eq!(false, resp_coverart_id.is_nil(), "Should not be empty");
assert_eq!(
false,
resp_song_queue_id.is_nil(),
"Should not be empty"
);
match get_queued_coverart(&app, &resp_coverart_id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::coverart::response::fetch_coverart_no_data::Response, crate::callers::coverart::response::fetch_coverart_no_data::Response,
@@ -1078,16 +1023,6 @@ mod tests {
assert!(false, "Error: {:?}", err); assert!(false, "Error: {:?}", err);
} }
} }
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
let _ = db_mgr::drop_database(&tm_pool, &db_name).await; let _ = db_mgr::drop_database(&tm_pool, &db_name).await;
} }
@@ -1343,23 +1278,7 @@ mod tests {
let app = init::app(pool).await; let app = init::app(pool).await;
// Send request // Send request
match song_queue_req(&app).await { match sequence_flow::queue_song_flow(&app).await {
Ok(response) => {
let resp =
get_resp_data::<crate::callers::song::response::Response>(response).await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
assert_eq!(false, resp.data[0].is_nil(), "Should not be empty");
match queue_metadata_req(&app, &resp.data[0]).await {
Ok(response) => {
let resp =
get_resp_data::<crate::callers::song::response::Response>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let id = resp.data[0];
match fetch_metadata_queue_req(&app, &id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::metadata::response::fetch_metadata::Response, crate::callers::metadata::response::fetch_metadata::Response,
@@ -1394,16 +1313,6 @@ mod tests {
Err(err) => { Err(err) => {
assert!(false, "Error: {:?}", err); assert!(false, "Error: {:?}", err);
} }
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}; };
let _ = db_mgr::drop_database(&tm_pool, &db_name).await; let _ = db_mgr::drop_database(&tm_pool, &db_name).await;
@@ -1429,34 +1338,16 @@ mod tests {
let app = init::app(pool).await; let app = init::app(pool).await;
// Send request // Send request
match song_queue_req(&app).await { match sequence_flow::queue_song_flow(&app).await {
Ok(response) => {
let resp =
get_resp_data::<crate::callers::song::response::Response>(response).await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
assert_eq!(false, resp.data[0].is_nil(), "Should not be empty");
let song_queue_id = resp.data[0];
assert_eq!(false, song_queue_id.is_nil(), "Should not be empty");
match queue_metadata_req(&app, &resp.data[0]).await {
Ok(response) => {
let resp =
get_resp_data::<crate::callers::song::response::Response>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let id = resp.data[0];
match fetch_metadata_queue_req(&app, &id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::metadata::response::fetch_metadata::Response, crate::callers::metadata::response::fetch_metadata::Response,
>(response) >(response)
.await; .await;
assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); assert_eq!(false, resp.data.is_empty(), "Data should not be empty");
let song_q_id = resp.data[0].song_queue_id; let song_queue_id = resp.data[0].song_queue_id;
match create_song_req(&app, &song_q_id).await { match create_song_req(&app, &song_queue_id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::<crate::callers::song::response::create_metadata::Response>(response).await; let resp = get_resp_data::<crate::callers::song::response::create_metadata::Response>(response).await;
assert_eq!( assert_eq!(
@@ -1476,62 +1367,10 @@ mod tests {
eprintln!("Song: {:?}", song); eprintln!("Song: {:?}", song);
match upload_coverart_queue_req(&app).await {
Ok(response) => {
let resp = get_resp_data::<
crate::callers::coverart::response::Response,
>(
response
)
.await;
assert_eq!(
false,
resp.data.is_empty(),
"Should not be empty"
);
let coverart_id = resp.data[0];
assert_eq!(
false,
coverart_id.is_nil(),
"Should not be empty"
);
match coverart_queue_song_queue_link_req( match sequence_flow::queue_coverart_flow(
&app, &app,
&coverart_id, &song_queue_id
&song_queue_id,
)
.await
{
Ok(response) => {
let resp = get_resp_data::<
crate::callers::coverart::response::link::Response,
>(response)
.await;
assert_eq!(
false,
resp.data.is_empty(),
"Should not be empty"
);
let resp_coverart_id =
resp.data[0].coverart_id;
let resp_song_queue_id =
resp.data[0].song_queue_id;
assert_eq!(
false,
resp_coverart_id.is_nil(),
"Should not be empty"
);
assert_eq!(
false,
resp_song_queue_id.is_nil(),
"Should not be empty"
);
match get_queued_coverart(
&app,
&resp_coverart_id,
) )
.await .await
{ {
@@ -1545,11 +1384,12 @@ mod tests {
resp.data.is_empty(), resp.data.is_empty(),
"Should not be empty" "Should not be empty"
); );
let resp_queue_coverart_id = resp.data[0].id;
match create_coverart_req( match create_coverart_req(
&app, &app,
&song_id, &song_id,
&resp_coverart_id, &resp_queue_coverart_id,
) )
.await .await
{ {
@@ -1578,29 +1418,6 @@ mod tests {
} }
} }
} }
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
} }
} }
Err(err) => { Err(err) => {