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

Link user id to song queue #159

Merged
kdeng00 merged 24 commits from link_user_id_to_song_queue into v0.2 2025-07-22 21:36:29 -04:00
Conversation 1 Commits 24 Files Changed 7
+29 -31
2 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3e82d7e3d6 - Show all commits
src/callers/song.rs
+6 -14
View File
@@ -438,13 +438,9 @@ mod song_queue {
.map_err(|_e| sqlx::Error::RowNotFound) .map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(), .unwrap(),
user_id: match user_id_result { user_id: match user_id_result {
Ok(id) => { Ok(id) => id,
id Err(_) => uuid::Uuid::nil(),
} },
Err(_) => {
uuid::Uuid::nil()
}
}
}; };
Ok(song_queue) Ok(song_queue)
@@ -565,13 +561,9 @@ mod song_queue {
.map_err(|_e| sqlx::Error::RowNotFound) .map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(), .unwrap(),
user_id: match user_id_result { user_id: match user_id_result {
Ok(id) => { Ok(id) => id,
id Err(_) => uuid::Uuid::nil(),
} },
Err(_) => {
uuid::Uuid::nil()
}
}
}; };
Ok(song_queue) Ok(song_queue)
src/main.rs
+23 -17
View File
@@ -493,30 +493,36 @@ mod tests {
// match super::get_resp_data::<crate::callers::song::response::link_user_id::Response>(response).await { // match super::get_resp_data::<crate::callers::song::response::link_user_id::Response>(response).await {
match super::song_queue_link_req(&app, &song_queue_id, &user_id).await { match super::song_queue_link_req(&app, &song_queue_id, &user_id).await {
Ok(response) => { Ok(response) => {
let resp = super::get_resp_data::<crate::callers::song::response::link_user_id::Response>(response).await; let resp = super::get_resp_data::<
assert_eq!(false, resp.data.is_empty(), "The response should not be empty"); crate::callers::song::response::link_user_id::Response,
>(response)
.await;
assert_eq!(
false,
resp.data.is_empty(),
"The response should not be empty"
);
match super::queue_metadata_req(&app, &song_queue_id).await { match super::queue_metadata_req(&app, &song_queue_id).await {
Ok(response) => { Ok(response) => {
let resp = super::get_resp_data::< let resp = super::get_resp_data::<
crate::callers::song::response::Response, crate::callers::song::response::Response,
>(response) >(response)
.await; .await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let id = resp.data[0]; let id = resp.data[0];
match super::fetch_metadata_queue_req(&app, &id).await { match super::fetch_metadata_queue_req(&app, &id).await {
Ok(response) => Ok((response, user_id)), Ok(response) => Ok((response, user_id)),
Err(err) => Err(err), Err(err) => Err(err),
}
} }
} }
}
} }
Err(err) => Err(err) Err(err) => Err(err),
} }
} }
Err(err) => Err(err), Err(err) => Err(err),
} }