Fix SQLx User Data Parsing

SQLx gives you a hard time if you don't explicitly define a tuple's type
(Ex joining against Users and taking * as a row).

Author: jabbate19

src/db/car.rs

@@ -94,10 +94,10 @@ impl Car {
                 VALUES ($1, $2, $3, $4, $5, $6) RETURNING *
             )
             SELECT car.id, car.event_id, car.max_capacity, car.departure_time, car.return_time, car.comment,
-            (driverUser.id, driverUser.realm::text, driverUser.name, driverUser.email) AS "driver!: UserData",
+            ROW(driverUser.*)::users AS "driver!: UserData",
             ARRAY_REMOVE(ARRAY_AGG(
                 CASE WHEN riderUser.id IS NOT NULL
-                THEN (riderUser.id, riderUser.realm::text, riderUser.name, riderUser.email)
+                THEN ROW(riderUser.*)::users
                 END
             ), NULL) as "riders!: Vec<UserData>"
             FROM car
@@ -138,10 +138,10 @@ impl Car {
                 WHERE event_id = $5 AND id = $6 AND driver = $7 RETURNING *
             )
             SELECT new_car.id, new_car.event_id, new_car.max_capacity, new_car.departure_time, new_car.return_time, new_car.comment,
-            (driverUser.id, driverUser.realm::text, driverUser.name, driverUser.email) AS "driver!: UserData",
+            ROW(driverUser.*)::users AS "driver!: UserData",
             ARRAY_REMOVE(ARRAY_AGG(
                 CASE WHEN riderUser.id IS NOT NULL
-                THEN (riderUser.id, riderUser.realm::text, riderUser.name, riderUser.email)
+                THEN ROW(riderUser.*)::users
                 END
             ), NULL) as "riders!: Vec<UserData>"
             FROM new_car
@@ -168,10 +168,10 @@ impl Car {
         query_as!(
             Car,
             r#"SELECT car.id, car.event_id, car.max_capacity, car.departure_time, car.return_time, car.comment,
-            (driverUser.id, driverUser.realm::text, driverUser.name, driverUser.email) AS "driver!: UserData",
+            ROW(driverUser.*)::users AS "driver!: UserData",
             ARRAY_REMOVE(ARRAY_AGG(
                 CASE WHEN riderUser.id IS NOT NULL
-                THEN (riderUser.id, riderUser.realm::text, riderUser.name, riderUser.email)
+                THEN ROW(riderUser.*)::users
                 END
             ), NULL) as "riders!: Vec<UserData>"
             FROM car
@@ -190,10 +190,10 @@ impl Car {
         query_as!(
             Car,
             r#"SELECT car.id, car.event_id, car.max_capacity, car.departure_time, car.return_time, car.comment,
-            (driverUser.id, driverUser.realm::text, driverUser.name, driverUser.email) AS "driver!: UserData",
+            ROW(driverUser.*)::users AS "driver!: UserData",
             ARRAY_REMOVE(ARRAY_AGG(
                 CASE WHEN riderUser.id IS NOT NULL
-                THEN (riderUser.id, riderUser.realm::text, riderUser.name, riderUser.email)
+                THEN ROW(riderUser.*)::users
                 END
             ), NULL) as "riders!: Vec<UserData>"
             FROM car

src/db/event.rs

@@ -60,7 +60,7 @@ impl Event {
                 INSERT INTO event (name, location, start_time, end_time, creator) VALUES ($1, $2, $3, $4, $5) RETURNING *
             )
             SELECT new_event.id, new_event.name, new_event.location, new_event.start_time, new_event.end_time,
-            (users.id, users.realm, users.name, users.email) AS "creator!: UserData"
+            (users.id, users.realm, users.name, users.email)::users AS "creator!: UserData"
             FROM new_event LEFT JOIN users ON new_event.creator = users.id
             "#,
             data.name, data.location, data.start_time, data.end_time, creator_id
@@ -90,8 +90,8 @@ impl Event {
                 RETURNING *
             )
             SELECT new_event.id, new_event.name, new_event.location, new_event.start_time, new_event.end_time,
-            (users.id, users.realm, users.name, users.email) AS "creator!: UserData"
-            FROM new_event LEFT JOIN users ON new_event.creator = users.id
+            ROW(users.*)::users AS "creator!: UserData"
+            FROM new_event JOIN users ON new_event.creator = users.id
             "#,
             data.name,
             data.location,
@@ -112,7 +112,7 @@ impl Event {
             r#"
             SELECT
             event.id, event.name, event.location, event.start_time, event.end_time,
-            (users.id, users.realm::text, users.name, users.email) AS "creator!: UserData"
+            ROW(users.*)::users AS "creator!: UserData"
             FROM event
             JOIN users ON users.id = event.creator
             WHERE (end_time >= NOW() AND $1 = False) OR (end_time < NOW() AND $1)
@@ -133,7 +133,7 @@ impl Event {
             r#"
             SELECT
             event.id, event.name, event.location, event.start_time, event.end_time,
-            (users.id, users.realm, users.name, users.email) AS "creator!: UserData"
+            ROW(users.*)::users AS "creator!: UserData"
             FROM event
             JOIN users ON users.id = event.creator
             WHERE event.id = $1

src/db/user.rs

@@ -5,18 +5,20 @@ use serde::{Deserialize, Serialize};
 use sqlx::{query_as, Executor, Postgres};
 use utoipa::ToSchema;
 
-#[derive(Serialize, Deserialize, sqlx::Type)]
+#[derive(Serialize, Deserialize, sqlx::Type, Clone, PartialEq)]
 #[sqlx(type_name = "user_realm", rename_all = "lowercase")]
 pub enum UserRealm {
     Csh,
     Google,
 }
 
+
+
 #[derive(Serialize, Deserialize, sqlx::Type, ToSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct UserData {
     pub id: String,
-    pub realm: String,
+    pub realm: UserRealm,
     pub name: String,
     pub email: String,
 }
@@ -37,7 +39,7 @@ impl UserData {
             r#"INSERT INTO users (id, realm, name, email)
             VALUES ($1, $2, $3, $4)
             ON CONFLICT (id) DO UPDATE SET realm = EXCLUDED.realm, name = EXCLUDED.name, email = EXCLUDED.email
-            RETURNING id AS "id!", realm::text AS "realm!", name AS "name!", email AS "email!";"#,
+            RETURNING id AS "id!", realm AS "realm!: UserRealm", name AS "name!", email AS "email!";"#,
             id,
             realm as _,
             name,
@@ -50,7 +52,7 @@ impl UserData {
     where
         C: Executor<'c, Database = Postgres>,
     {
-        query_as!(UserData, r#"SELECT id AS "id!", realm::text AS "realm!", name AS "name!", email AS "email!" FROM users WHERE LOWER(name) LIKE $1 OR LOWER(email) LIKE $1;"#, query.to_lowercase())
+        query_as!(UserData, r#"SELECT id AS "id!", realm AS "realm!: UserRealm", name AS "name!", email AS "email!" FROM users WHERE LOWER(name) LIKE $1 OR LOWER(email) LIKE $1;"#, query.to_lowercase())
         .fetch_all(conn)
         .await.map_err(|err| anyhow!("Failed to get users: {}", err))
     }
@@ -61,7 +63,7 @@ impl UserData {
         let data = query_as!(
             UserData,
             r#"
-            SELECT id AS "id!", realm::text AS "realm!", name AS "name!", email AS "email!"
+            SELECT id AS "id!", realm AS "realm!: UserRealm", name AS "name!", email AS "email!"
             FROM users WHERE id IN (SELECT UNNEST($1::VARCHAR[]))
             "#,
             &ids
@@ -80,7 +82,7 @@ impl UserData {
         query_as!(
             UserData,
             r#"
-            SELECT users.id AS "id!", users.realm::text AS "realm!", users.name AS "name!", users.email AS "email!"
+            SELECT users.id AS "id!", users.realm AS "realm!: UserRealm", users.name AS "name!", users.email AS "email!"
             FROM users where id = $1;
             "#, id
         ).fetch_optional(conn).await

src/worker.rs

@@ -9,7 +9,7 @@ use std::time::Duration;
 
 use crate::{
     app::{RedisJob, SimpleRiderChange},
-    db::user::UserData,
+    db::user::{UserData, UserRealm},
     pings::PingClient,
 };
 
@@ -56,7 +56,7 @@ async fn get_driver(car_id: i32, db_pool: &Pool<Postgres>) -> Result<UserData> {
     query_as!(
         UserData,
         r#"
-        SELECT users.id AS "id!", users.realm::text AS "realm!", users.name AS "name!", users.email AS "email!"
+        SELECT users.id AS "id!", users.realm AS "realm!: UserRealm", users.name AS "name!", users.email AS "email!"
         FROM car JOIN users ON car.driver = users.id WHERE car.id = $1;
         "#, car_id
     ).fetch_one(db_pool).await.map_err(|err| anyhow!("Failed to get driver: {}", err))
@@ -90,7 +90,7 @@ async fn work(job: &Item, db_pool: &Pool<Postgres>, pings: &PingClient) -> Resul
                         msg: err.to_string(),
                         should_retry: false,
                     })?;
-            if driver.realm != "csh" {
+            if driver.realm != UserRealm::Csh {
                 return Ok(());
             }
             pings
@@ -113,7 +113,7 @@ async fn work(job: &Item, db_pool: &Pool<Postgres>, pings: &PingClient) -> Resul
                         msg: err.to_string(),
                         should_retry: false,
                     })?;
-            if driver.realm != "csh" {
+            if driver.realm != UserRealm::Csh {
                 return Ok(());
             }
             pings
@@ -161,7 +161,7 @@ async fn work(job: &Item, db_pool: &Pool<Postgres>, pings: &PingClient) -> Resul
                     msg: "User was missing from map.".to_string(),
                     should_retry: false,
                 })?;
-                if user.realm != "csh" {
+                if user.realm != UserRealm::Csh {
                     continue;
                 }
                 pings
@@ -181,7 +181,7 @@ async fn work(job: &Item, db_pool: &Pool<Postgres>, pings: &PingClient) -> Resul
                     msg: "User was missing from map.".to_string(),
                     should_retry: false,
                 })?;
-                if user.realm != "csh" {
+                if user.realm != UserRealm::Csh {
                     continue;
                 }
                 pings