updated code to return member object

Update .env.sample

Updated

Updated code to return Member Object

Author: Harshith-2208

.env.sample

@@ -8,4 +8,4 @@ POSTGRES_HOST=localhost
 ROOT_DB_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}
 RUST_ENV=development
 ROOT_SECRET=insecuresecret123 # Used to verify origin of attendance mutations
-ROOT_PORT=3000
+ROOT_PORT=8000

Cargo.lock

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
-use crate::models::attendance::{Attendance, AttendanceWithMember};
+use crate::models::attendance::{Attendance, AttendanceMemberRow, AttendanceWithMember};
+use crate::models::member::Member;
 use async_graphql::{Context, Object, Result};
 use chrono::NaiveDate;
 use sqlx::PgPool;
@@ -28,17 +29,43 @@ impl AttendanceQueries {
     ) -> Result<Vec<AttendanceWithMember>> {
         let pool = ctx.data::<Arc<PgPool>>().expect("Pool must be in context.");
 
-        let records = sqlx::query_as::<_, AttendanceWithMember>(
-            "SELECT att.attendance_id, att.member_id, att.date, att.is_present,
-                    att.time_in, att.time_out, mem.name, mem.year, mem.group_id
-             FROM Attendance att
-             JOIN Member mem ON att.member_id = mem.member_id
-             WHERE att.date = $1",
+        let rows: Vec<AttendanceMemberRow> = sqlx::query_as(
+        r#"
+        SELECT * FROM Attendance att JOIN Member mem ON att.member_id = mem.member_id WHERE att.date = $1
+        "#,
         )
         .bind(date)
         .fetch_all(pool.as_ref())
         .await?;
 
-        Ok(records)
+        let result = rows
+            .into_iter()
+            .map(|r| AttendanceWithMember {
+                attendance_id: r.attendance_id,
+                member_id: r.member_id,
+                date: r.date,
+                is_present: r.is_present,
+                time_in: r.time_in,
+                time_out: r.time_out,
+                created_at: r.created_at,
+                updated_at: r.updated_at,
+                member: Member {
+                    member_id: r.mem_member_id,
+                    roll_no: r.mem_roll_no,
+                    name: r.mem_name,
+                    email: r.mem_email,
+                    sex: r.mem_sex,
+                    year: r.mem_year,
+                    hostel: r.mem_hostel,
+                    mac_address: r.mem_mac_address,
+                    discord_id: r.mem_discord_id,
+                    group_id: r.mem_group_id,
+                    track: r.mem_track,
+                    created_at: r.mem_created_at,
+                },
+            })
+            .collect();
+
+        Ok(result)
     }
 }

src/graphql/queries/attendance_queries.rs

@@ -1,7 +1,10 @@
 use std::sync::Arc;
 
-use crate::models::status_update::StatusUpdateHistory;
+use crate::models::member::Member;
 use crate::models::status_update::StatusUpdateStreak as Streak;
+use crate::models::status_update::{
+    StatusUpdateHistory, StatusUpdateHistoryMemberRow, StatusUpdateHistoryWithMember,
+};
 use async_graphql::{Context, Object, Result};
 use sqlx::PgPool;
 
@@ -46,13 +49,45 @@ impl StreakQueries {
         .await?)
     }
 
-    async fn status_update_history(&self, ctx: &Context<'_>) -> Result<Vec<StatusUpdateHistory>> {
-        let pool = ctx.data::<Arc<PgPool>>().expect("Pool must be in context.");
+    async fn status_update_history(
+        &self,
+        ctx: &Context<'_>,
+    ) -> Result<Vec<StatusUpdateHistoryWithMember>> {
+        {
+            let pool = ctx.data::<Arc<PgPool>>().expect("Pool must be in context.");
+            let rows: Vec<StatusUpdateHistoryMemberRow> = sqlx::query_as(
+            r#"
+            SELECT * FROM StatusUpdateHistory status JOIN Member mem ON status.member_id = mem.member_id
+            "#,
+            )
+            .fetch_all(pool.as_ref())
+            .await?;
 
-        Ok(
-            sqlx::query_as::<_, StatusUpdateHistory>("SELECT * FROM StatusUpdateHistory")
-                .fetch_all(pool.as_ref())
-                .await?,
-        )
+            let result = rows
+                .into_iter()
+                .map(|r| StatusUpdateHistoryWithMember {
+                    update_id: r.update_id,
+                    member_id: r.member_id,
+                    is_updated: r.is_updated,
+                    date: r.date,
+                    member: Member {
+                        member_id: r.mem_member_id,
+                        roll_no: r.mem_roll_no,
+                        name: r.mem_name,
+                        email: r.mem_email,
+                        sex: r.mem_sex,
+                        year: r.mem_year,
+                        hostel: r.mem_hostel,
+                        mac_address: r.mem_mac_address,
+                        discord_id: r.mem_discord_id,
+                        group_id: r.mem_group_id,
+                        track: r.mem_track,
+                        created_at: r.mem_created_at,
+                    },
+                })
+                .collect();
+
+            Ok(result)
+        }
     }
 }

src/graphql/queries/streak_queries.rs

@@ -1,3 +1,4 @@
+use crate::models::member::Member;
 use async_graphql::{InputObject, SimpleObject};
 use chrono::{NaiveDate, NaiveDateTime, NaiveTime};
 use sqlx::FromRow;
@@ -46,15 +47,43 @@ pub struct MarkAttendanceInput {
     pub hmac_signature: String,
 }
 
-#[derive(SimpleObject, FromRow)]
+#[derive(sqlx::FromRow)]
+pub struct AttendanceMemberRow {
+    pub attendance_id: i32,
+    pub member_id: i32,
+    pub date: NaiveDate,
+    pub is_present: bool,
+    pub time_in: Option<NaiveTime>,
+    pub time_out: Option<NaiveTime>,
+    pub created_at: NaiveDateTime,
+    pub updated_at: NaiveDateTime,
+
+    pub mem_member_id: i32,
+    pub mem_roll_no: String,
+    pub mem_name: String,
+    pub mem_email: String,
+    pub mem_sex: crate::models::member::Sex,
+    pub mem_year: i32,
+    pub mem_hostel: String,
+    pub mem_mac_address: String,
+    pub mem_discord_id: String,
+    pub mem_group_id: i32,
+    pub mem_track: Option<String>,
+    pub mem_created_at: NaiveDateTime,
+}
+
+#[derive(SimpleObject)]
 pub struct AttendanceWithMember {
     pub attendance_id: i32,
     pub member_id: i32,
     pub date: NaiveDate,
     pub is_present: bool,
     pub time_in: Option<NaiveTime>,
     pub time_out: Option<NaiveTime>,
-    pub name: String,
-    pub year: i32,
-    pub group_id: i32,
+    #[graphql(skip)]
+    pub created_at: NaiveDateTime,
+    #[graphql(skip)]
+    pub updated_at: NaiveDateTime,
+
+    pub member: Member,
 }

src/models/attendance.rs

@@ -1,5 +1,6 @@
+use crate::models::member::Member;
 use async_graphql::{InputObject, SimpleObject};
-use chrono::NaiveDate;
+use chrono::{NaiveDate, NaiveDateTime};
 use sqlx::FromRow;
 
 #[derive(SimpleObject, FromRow)]
@@ -27,3 +28,34 @@ pub struct StatusUpdateHistory {
     pub is_updated: bool,
     pub date: NaiveDate,
 }
+
+#[derive(sqlx::FromRow)]
+pub struct StatusUpdateHistoryMemberRow {
+    pub update_id: i32,
+    pub member_id: i32,
+    pub is_updated: bool,
+    pub date: NaiveDate,
+
+    pub mem_member_id: i32,
+    pub mem_roll_no: String,
+    pub mem_name: String,
+    pub mem_email: String,
+    pub mem_sex: crate::models::member::Sex,
+    pub mem_year: i32,
+    pub mem_hostel: String,
+    pub mem_mac_address: String,
+    pub mem_discord_id: String,
+    pub mem_group_id: i32,
+    pub mem_track: Option<String>,
+    pub mem_created_at: NaiveDateTime,
+}
+
+#[derive(SimpleObject)]
+pub struct StatusUpdateHistoryWithMember {
+    pub update_id: i32,
+    pub member_id: i32,
+    pub is_updated: bool,
+    pub date: NaiveDate,
+
+    pub member: Member,
+}