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

Code refactoring

Browse Source
This commit is contained in:
kdeng00
2025-06-04 20:34:45 -04:00
parent 83dd055c5e
commit aade49507a
1 changed files with 124 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.rs
+124 -140
View File
@@ -760,18 +760,18 @@ mod tests {
let app = init::app(pool).await; let app = init::app(pool).await;
// Send request // Send request
match sequence_flow::queue_song_flow(&app).await { match sequence_flow::queue_song_flow(&app).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");
} }
Err(err) => { Err(err) => {
assert!(false, "Error: {:?}", 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;
} }
@@ -1002,26 +1002,22 @@ 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");
match sequence_flow::queue_coverart_flow(&app, &song_queue_id).await { match sequence_flow::queue_coverart_flow(&app, &song_queue_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,
>(response) >(response)
.await; .await;
assert_eq!( assert_eq!(false, resp.data.is_empty(), "Should not be empty");
false, }
resp.data.is_empty(), Err(err) => {
"Should not be empty" assert!(false, "Error: {:?}", err);
); }
} }
Err(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;
@@ -1278,42 +1274,45 @@ mod tests {
let app = init::app(pool).await; let app = init::app(pool).await;
// Send request // Send request
match sequence_flow::queue_song_flow(&app).await { match sequence_flow::queue_song_flow(&app).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_q_id = resp.data[0].song_queue_id;
match create_song_req(&app, &song_q_id).await { match create_song_req(&app, &song_q_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::<
assert_eq!( crate::callers::song::response::create_metadata::Response,
false, >(response)
resp.data.is_empty(), .await;
"No songs found, Response {:?}", assert_eq!(
resp false,
); resp.data.is_empty(),
let song = &resp.data[0]; "No songs found, Response {:?}",
let song_id = song.id; resp
assert_eq!( );
false, let song = &resp.data[0];
song_id.is_nil(), let song_id = song.id;
"Song id should not be nil {:?}", assert_eq!(
song false,
); song_id.is_nil(),
} "Song id should not be nil {:?}",
Err(err) => { song
assert!(false, "Error: {:?}", err); );
} }
} Err(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;
} }
@@ -1338,92 +1337,77 @@ mod tests {
let app = init::app(pool).await; let app = init::app(pool).await;
// Send request // Send request
match sequence_flow::queue_song_flow(&app).await { match sequence_flow::queue_song_flow(&app).await {
Ok(response) => {
let resp = get_resp_data::<
crate::callers::metadata::response::fetch_metadata::Response,
>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Data should not be empty");
let song_queue_id = resp.data[0].song_queue_id;
match create_song_req(&app, &song_queue_id).await {
Ok(response) => {
let resp = get_resp_data::<
crate::callers::song::response::create_metadata::Response,
>(response)
.await;
assert_eq!(
false,
resp.data.is_empty(),
"No songs found, Response {:?}",
resp
);
let song = &resp.data[0];
let song_id = song.id;
assert_eq!(
false,
song_id.is_nil(),
"Song id should not be nil {:?}",
song
);
eprintln!("Song: {:?}", song);
match sequence_flow::queue_coverart_flow(&app, &song_queue_id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::metadata::response::fetch_metadata::Response,
>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Data should not be empty");
let song_queue_id = resp.data[0].song_queue_id;
match create_song_req(&app, &song_queue_id).await {
Ok(response) => {
let resp = get_resp_data::<crate::callers::song::response::create_metadata::Response>(response).await;
assert_eq!(
false,
resp.data.is_empty(),
"No songs found, Response {:?}",
resp
);
let song = &resp.data[0];
let song_id = song.id;
assert_eq!(
false,
song_id.is_nil(),
"Song id should not be nil {:?}",
song
);
eprintln!("Song: {:?}", song);
match sequence_flow::queue_coverart_flow(
&app,
&song_queue_id
)
.await
{
Ok(response) => {
let resp = get_resp_data::<
crate::callers::coverart::response::fetch_coverart_no_data::Response, crate::callers::coverart::response::fetch_coverart_no_data::Response,
>(response) >(response)
.await; .await;
assert_eq!( assert_eq!(false, resp.data.is_empty(), "Should not be empty");
false, let resp_queue_coverart_id = resp.data[0].id;
resp.data.is_empty(),
"Should not be empty"
);
let resp_queue_coverart_id = resp.data[0].id;
match create_coverart_req( match create_coverart_req(&app, &song_id, &resp_queue_coverart_id)
&app, .await
&song_id, {
&resp_queue_coverart_id, Ok(response) => {
) let resp = get_resp_data::<
.await
{
Ok(response) => {
let resp = get_resp_data::<
crate::callers::coverart::response::create_coverart::Response, crate::callers::coverart::response::create_coverart::Response,
>(response) >(response)
.await; .await;
assert_eq!( assert_eq!(
false, false,
resp.data.is_empty(), resp.data.is_empty(),
"Should not be empty" "Should not be empty"
); );
} }
Err(err) => { Err(err) => {
assert!( assert!(false, "Error: {:?}", err);
false, }
"Error: {:?}", }
err
);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
}
} }
Err(err) => { Err(err) => {
assert!(false, "Error: {:?}", 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;
} }