From c5bbad6460152919dd76b877819315fd50212578 Mon Sep 17 00:00:00 2001 From: Mitchell Marino Date: Sun, 16 Apr 2023 20:12:55 -0500 Subject: [PATCH] fix report err --- src/report.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/report.rs b/src/report.rs index c31ead8..ad32660 100644 --- a/src/report.rs +++ b/src/report.rs @@ -46,10 +46,10 @@ pub async fn get_report( u.username, u.grade, COALESCE(SUM(e.points), 0) AS points, - array_agg(e.title) AS "event_titles!", - array_agg(e.description) AS "event_discriptions!", - array_agg(e.points) AS "event_points!", - array_agg(e.event_type) AS "event_types!: Vec" + COALESCE(array_agg(e.title), ARRAY[]::varchar(255)[]) AS "event_titles!", + COALESCE(array_agg(e.description), ARRAY[]::text[]) AS "event_discriptions!", + COALESCE(array_agg(e.points), ARRAY[]::INTEGER[]) AS "event_points!", + COALESCE(array_agg(e.event_type), ARRAY[]::event_type[]) AS "event_types!: Vec" FROM users u LEFT JOIN event_attendees ea ON u.id = ea.user_id AND ea.confirmed = true @@ -67,9 +67,9 @@ pub async fn get_report( Ok(records) => records, Err(err) => { return ( - StatusCode::BAD_REQUEST, + StatusCode::INTERNAL_SERVER_ERROR, Json(json!({ - "error": format!("Unknown error creating event: {:?}", err) + "error": format!("Unknown error getting user data: {:?}", err) })), ) .into_response() @@ -85,9 +85,9 @@ pub async fn get_report( Ok(report) => report, Err(err) => { return ( - StatusCode::BAD_REQUEST, + StatusCode::INTERNAL_SERVER_ERROR, Json(json!({ - "error": format!("Unknown error creating event: {:?}", err) + "error": format!("Unknown error rendering report: {:?}", err) })), ) .into_response()