Merge branch 'develop' into main

Author: ivinjabraham

.github/workflows/lint.yml

@@ -8,8 +8,7 @@ jobs:
   clippy:
     name: Clippy
     runs-on: ubuntu-latest
-    env:
-      DATABASE_URL: "sqlite::memory:"
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

Cargo.lock

@@ -7,7 +7,7 @@ edition = "2021"
 async-graphql = { version = "7.0.15", features = ["chrono"] }
 async-graphql-axum = "7.0.6"
 axum = "0.8.1"
-chrono = "0.4.38"
+chrono = { version = "0.4.38", features = ["clock"] }
 serde = { version = "1.0.188", features = ["derive"] }
 sqlx = { version = "0.8.3", features = ["chrono", "postgres", "runtime-tokio"] }
 tokio = { version = "1.28.2", features = ["default", "macros", "rt-multi-thread"] }                       # For async tests
@@ -21,5 +21,6 @@ serde_json = "1.0"
 reqwest = { version = "0.12.12", features = ["json"] }
 config = "0.15"
 tracing = "0.1.41"
-tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.19", features = ["env-filter", "time", "fmt", "std"] }
 dotenv = "0.15.0"
+time = { version = "0.3.37", features = ["formatting"] }

Cargo.toml

@@ -32,6 +32,38 @@ struct AttendanceSummary {
 
 ## Queries
 
+### Get Attendance
+Retrieve attendance records by member ID or date.
+
+```graphql
+# Get attendance by member ID
+query {
+    attendance(memberId: 1) {
+        attendanceId
+        date
+        isPresent
+        timeIn
+        timeOut
+    }
+}
+```
+
+Get all attendance for a specific date
+
+```graphql
+query {
+    attendanceByDate(date: "2025-02-27") {
+        attendanceId
+        memberId
+        name
+        year
+        isPresent
+        timeIn
+        timeOut
+    }
+}
+```
+
 ### Mark Attendance
 Record a member's attendance for the day.
 

docs/attendance.md

@@ -55,7 +55,7 @@ async fn execute_daily_task(pool: Arc<PgPool>) {
 // We need to add a record for every member because otherwise [`Presense`](https://www.github.com/presense) will only add present members to the DB, and we will have to JOIN Members and Attendance records for the day to get the absent members. In exchange for increased storage use, we get simpler queries for Home which needs the data for every member for every day so far. But as of Jan 2025, there are less than 50 members in the club and thus storage really shouldn't be an issue.
 /// Inserts new attendance records everyday for [`presense`](https://www.github.com/amfoss/presense) to update them later in the day and updates the AttendanceSummary table to keep track of monthly streaks.
 async fn update_attendance(members: Vec<Member>, pool: &PgPool) {
-    let today = chrono::Utc::now().with_timezone(&Kolkata).date_naive();
+    let today = chrono::Utc::now().with_timezone(&Kolkata).date().naive_local();
     debug!("Updating attendance on {}", today);
 
     for member in members {
@@ -96,8 +96,8 @@ async fn update_attendance(members: Vec<Member>, pool: &PgPool) {
 /// Checks if the member was present yesterday, and if so, increments the `days_attended` value. Otherwise, do nothing.
 async fn update_attendance_summary(member_id: i32, pool: &PgPool) {
     debug!("Updating summary for member #{}", member_id);
-    let today = chrono::Utc::now().with_timezone(&Kolkata).date_naive();
-    let yesterday = today.pred_opt().expect("Time must be valid");
+    let today = chrono::Utc::now().with_timezone(&Kolkata).date().naive_local();
+    let yesterday = today - chrono::Duration::days(1);
 
     // Check if the member was present yesterday
     let was_present_yesterday = sqlx::query_scalar::<_, bool>(

src/daily_task/mod.rs

@@ -1,12 +1,15 @@
 use std::sync::Arc;
 
+use crate::models::{
+    attendance::{Attendance, AttendanceWithMember},
+    member::Member,
+};
 use async_graphql::{Context, Object, Result};
+use chrono::NaiveDate;
 use sqlx::PgPool;
 
-use crate::models::{attendance::Attendance, member::Member};
-
 /// Sub-query for the [`Attendance`] table. The queries are:
-/// * attendance - get a specific member's attendance details using their member_id, roll_no or discord_id
+/// * attendance - get a specific member's attendance details using their member_id, roll_no or discord_id, or by date for all members.
 #[derive(Default)]
 pub struct AttendanceQueries;
 
@@ -66,4 +69,26 @@ impl AttendanceQueries {
 
         Ok(attendance_query)
     }
+
+    // Query to get attendance by date
+    async fn attendance_by_date(
+        &self,
+        ctx: &Context<'_>,
+        date: NaiveDate,
+    ) -> Result<Vec<AttendanceWithMember>> {
+        let pool = ctx.data::<Arc<PgPool>>().expect("Pool must be in context.");
+
+        let records = sqlx::query_as::<_, AttendanceWithMember>(
+            "SELECT a.attendance_id, a.member_id, a.date, a.is_present, 
+                    a.time_in, a.time_out, m.name, m.year
+             FROM Attendance a
+             JOIN Member m ON a.member_id = m.member_id
+             WHERE a.date = $1",
+        )
+        .bind(date)
+        .fetch_all(pool.as_ref())
+        .await?;
+
+        Ok(records)
+    }
 }

src/graphql/queries/attendance_queries.rs

@@ -1,6 +1,8 @@
 use async_graphql::EmptySubscription;
 use axum::http::{HeaderValue, Method};
+use chrono::FixedOffset;
 use sqlx::PgPool;
+use time::UtcOffset;
 use std::sync::Arc;
 use tower_http::cors::CorsLayer;
 use tracing::info;
@@ -68,11 +70,14 @@ async fn main() {
 
 /// Abstraction over initializing the global subscriber for tracing depending on whether it's in production or dev.
 fn setup_tracing(env: &str) {
+    let kolkata_offset = UtcOffset::from_hms(5, 30, 0).expect("Hardcoded offset must be correct");
+    let timer = fmt::time::OffsetTime::new(kolkata_offset, time::format_description::well_known::Rfc2822);
     if env == "production" {
         tracing_subscriber::registry()
             // In production, no need to write to stdout, write directly to file.
             .with(
                 fmt::layer()
+                    .event_format(fmt::format().with_timer(timer.clone()))
                     .pretty()
                     .with_ansi(false) // ANSI encodings make it pretty but unreadable in the raw file.
                     .with_writer(std::fs::File::create("root.log").unwrap()),
@@ -84,9 +89,10 @@ fn setup_tracing(env: &str) {
     } else {
         tracing_subscriber::registry()
             // Write to both stdout and file in development.
-            .with(fmt::layer().pretty().with_writer(std::io::stdout))
+            .with(fmt::layer().event_format(fmt::format().with_timer(timer.clone())).pretty().with_writer(std::io::stdout))
             .with(
                 fmt::layer()
+                    .event_format(fmt::format().with_timer(timer.clone()))
                     .pretty()
                     .with_ansi(false)
                     .with_writer(std::fs::File::create("root.log").unwrap()),

src/main.rs

@@ -48,3 +48,17 @@ pub struct MarkAttendanceInput {
     pub date: NaiveDate,
     pub hmac_signature: String,
 }
+
+/// This struct combines attendance data with member name for queries that need both.
+/// It joins the Attendance table with Member to include the member's name.
+#[derive(SimpleObject, FromRow)]
+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,
+}