feat(leave_tracking): leave count query

Author: naveensrinivas282

migrations/20260214152404_create_leave_table.sql

@@ -1,12 +1,13 @@
 -- Leave table for tracking leaves
 CREATE TABLE Leave (
         leave_id SERIAL PRIMARY KEY,
-        discord_id VARCHAR(255) REFERENCES Member(discord_id) ON DELETE CASCADE,
-        from_date DATE DEFAULT CURRENT_DATE,
-        duration INT DEFAULT 1,
+        discord_id VARCHAR(255) NOT NULL REFERENCES Member(discord_id) ON DELETE CASCADE,
+        from_date DATE DEFAULT CURRENT_DATE NOT NULL,
+        duration INT DEFAULT 1 NOT NULL,
         reason TEXT NOT NULL,
-        applied_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        approved_by VARCHAR(255) REFERENCES Member(discord_id),
+        applied_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        approved_by VARCHAR(255) REFERENCES Member(discord_id) ON DELETE SET NULL,
         CHECK (approved_by IS NULL OR approved_by <> discord_id),
+        CHECK (duration > 0),
         UNIQUE (from_date, discord_id)
 );

src/graphql/mutations/attendance_mutations.rs

@@ -1,14 +1,14 @@
 use std::sync::Arc;
 
 use async_graphql::{Context, Object, Result};
-use chrono::{NaiveDate, NaiveDateTime};
+use chrono::NaiveDate;
 use chrono_tz::Asia::Kolkata;
 use hmac::{Hmac, Mac};
 use sha2::Sha256;
 use sqlx::PgPool;
 
 use crate::auth::guards::AdminOrBotGuard;
-use crate::models::attendance::{AttendanceRecord, MarkAttendanceInput, MarkLeaveOutput};
+use crate::models::attendance::{AttendanceRecord, LeaveRecord, MarkAttendanceInput};
 
 type HmacSha256 = Hmac<Sha256>;
 
@@ -69,24 +69,22 @@ impl AttendanceMutations {
         ctx: &Context<'_>,
         discord_id: String,
         reason: String,
-        applied_at: NaiveDateTime,
         from_date: NaiveDate,
         duration: i32,
-    ) -> Result<MarkLeaveOutput> {
+    ) -> Result<LeaveRecord> {
         let pool = ctx
             .data::<Arc<PgPool>>()
             .expect("Pool not found in context");
 
-        let leave: MarkLeaveOutput = sqlx::query_as::<_, MarkLeaveOutput>(
+        let leave: LeaveRecord = sqlx::query_as::<_, LeaveRecord>(
             "INSERT INTO Leave
-            (discord_id, reason, applied_at, from_date, duration) 
-            VALUES ($1, $2, $3, $4, $5)
+            (discord_id, reason, from_date, duration) 
+            VALUES ($1, $2, $3, $4)
             RETURNING *
             ",
         )
         .bind(discord_id)
         .bind(reason)
-        .bind(applied_at)
         .bind(from_date)
         .bind(duration)
         .fetch_one(pool.as_ref())
@@ -100,23 +98,28 @@ impl AttendanceMutations {
         &self,
         ctx: &Context<'_>,
         discord_id: String,
+        from_date: NaiveDate,
         approved_by: String,
-    ) -> Result<MarkLeaveOutput> {
+    ) -> Result<LeaveRecord> {
         let pool = ctx
             .data::<Arc<PgPool>>()
             .expect("Pool not found in context");
 
-        let leave: MarkLeaveOutput = sqlx::query_as::<_, MarkLeaveOutput>(
+        let leave: LeaveRecord = sqlx::query_as::<_, LeaveRecord>(
             "UPDATE Leave
             SET approved_by = $1
-            WHERE discord_id = $2
+            WHERE discord_id = $2 AND
+            from_date=$3 AND
+            approved_by IS NULL
             RETURNING *
             ",
         )
         .bind(approved_by)
         .bind(discord_id)
-        .fetch_one(pool.as_ref())
-        .await?;
+        .bind(from_date)
+        .fetch_optional(pool.as_ref())
+        .await?
+        .ok_or_else(|| async_graphql::Error::new("no pending leave found to approve"))?;
 
         Ok(leave)
     }

src/graphql/queries/member_queries.rs

@@ -91,7 +91,7 @@ impl MemberQueries {
         }
     }
 
-    // Fetch the details of the currently logged in member
+    /// Fetch the details of the currently logged in member
     #[graphql(guard = "AuthGuard")]
     async fn me(&self, ctx: &Context<'_>) -> Result<Member> {
         let auth = ctx.data::<AuthContext>()?;
@@ -434,11 +434,16 @@ impl Member {
         start_date: NaiveDate,
         end_date: NaiveDate,
     ) -> Result<i64> {
-        let pool = ctx.data::<Arc<PgPool>>().expect("Pool must be in context.");
+        let pool = ctx.data::<Arc<PgPool>>()?;
 
         if end_date < start_date {
             return Err("end_date must be >= start_date".into());
         }
+        let discord_id = self
+            .discord_id
+            .as_ref()
+            .expect("Leave count needs discord_id");
+
         let total: Option<i64> = sqlx::query_scalar(
             r#"
             SELECT SUM(
@@ -454,11 +459,7 @@ impl Member {
         )
         .bind(start_date)
         .bind(end_date)
-        .bind(
-            self.discord_id
-                .as_ref()
-                .expect("Leave count needs discord_id"),
-        )
+        .bind(discord_id)
         .fetch_one(pool.as_ref())
         .await?;
         Ok(total.unwrap_or(0))

src/models/attendance.rs

@@ -23,7 +23,7 @@ pub struct MarkAttendanceInput {
 }
 
 #[derive(SimpleObject, FromRow)]
-pub struct MarkLeaveOutput {
+pub struct LeaveRecord {
     pub discord_id: String,
     pub from_date: NaiveDate,
     pub applied_at: NaiveDateTime,