Fixing possible nil user_id field in SongQueue when calling a function

This commit is contained in:
kdeng00
2025-07-21 19:44:48 -04:00
parent 0eeacd2ed4
commit 3118cff274
+15 -6
View File
@@ -422,7 +422,9 @@ mod song_queue {
}); });
match result { match result {
Ok(row) => Ok(SongQueue { Ok(row) => {
let user_id_result = row.try_get("user_id");
let song_queue = SongQueue {
id: row id: row
.try_get("id") .try_get("id")
.map_err(|_e| sqlx::Error::RowNotFound) .map_err(|_e| sqlx::Error::RowNotFound)
@@ -435,11 +437,18 @@ mod song_queue {
.try_get("status") .try_get("status")
.map_err(|_e| sqlx::Error::RowNotFound) .map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(), .unwrap(),
user_id: row user_id: match user_id_result {
.try_get("user_id") Ok(id) => {
.map_err(|_e| sqlx::Error::RowNotFound) id
.unwrap(), }
}), Err(_) => {
uuid::Uuid::nil()
}
}
};
Ok(song_queue)
}
Err(_err) => Err(sqlx::Error::RowNotFound), Err(_err) => Err(sqlx::Error::RowNotFound),
} }
} }