mitchell/engage_earn_api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix report err

Browse Source
This commit is contained in:
Mitchell Marino 2023-04-16 20:12:55 -05:00
parent 8d08147329
commit c5bbad6460
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/report.rs
View File

@ -46,10 +46,10 @@ pub async fn get_report(
u.username, u.username,
u.grade, u.grade,
COALESCE(SUM(e.points), 0) AS points, COALESCE(SUM(e.points), 0) AS points,
array_agg(e.title) AS "event_titles!", COALESCE(array_agg(e.title), ARRAY[]::varchar(255)[]) AS "event_titles!",
array_agg(e.description) AS "event_discriptions!", COALESCE(array_agg(e.description), ARRAY[]::text[]) AS "event_discriptions!",
array_agg(e.points) AS "event_points!", COALESCE(array_agg(e.points), ARRAY[]::INTEGER[]) AS "event_points!",
array_agg(e.event_type) AS "event_types!: Vec<String>" COALESCE(array_agg(e.event_type), ARRAY[]::event_type[]) AS "event_types!: Vec<String>"
FROM users u FROM users u
LEFT JOIN event_attendees ea LEFT JOIN event_attendees ea
ON u.id = ea.user_id AND ea.confirmed = true ON u.id = ea.user_id AND ea.confirmed = true
@ -67,9 +67,9 @@ pub async fn get_report(
Ok(records) => records, Ok(records) => records,
Err(err) => { Err(err) => {
return ( return (
StatusCode::BAD_REQUEST, StatusCode::INTERNAL_SERVER_ERROR,
Json(json!({ Json(json!({
"error": format!("Unknown error creating event: {:?}", err) "error": format!("Unknown error getting user data: {:?}", err)
})), })),
) )
.into_response() .into_response()
@ -85,9 +85,9 @@ pub async fn get_report(
Ok(report) => report, Ok(report) => report,
Err(err) => { Err(err) => {
return ( return (
StatusCode::BAD_REQUEST, StatusCode::INTERNAL_SERVER_ERROR,
Json(json!({ Json(json!({
"error": format!("Unknown error creating event: {:?}", err) "error": format!("Unknown error rendering report: {:?}", err)
})), })),
) )
.into_response() .into_response()