Merge branch 'refactor' into production

Author: hrideshmg

docs/attendance.md

@@ -19,17 +19,6 @@ struct Attendance {
 ```
 The final two fields are not exposed in the interface for obvious reasons.
 
-### AttendanceSummary
-Monthly attendance summary for each member.
-```rust
-struct AttendanceSummary {
-    member_id: i32,
-    year: i32,
-    month: i32,
-    days_attended: i32,
-}
-```
-
 ## Queries
 
 ### Get Attendance
@@ -85,19 +74,6 @@ mutation {
 }
 ```
 
-### Get Attendance Summary
-Get monthly attendance summary for a member.
-
-```graphql
-query {
-    attendanceSummary(memberId: 1) {
-        year
-        month
-        daysAttended
-    }
-}
-```
-
 ## Daily Task
 
 The `src/daily_task/daily_task.rs` system automatically updates attendance summaries at midnight.

migrations/20250929191135_drop_unnecessary_tables.sql

@@ -0,0 +1,3 @@
+-- Add migration script here
+DROP TABLE statusupdatestreak;
+DROP TABLE project;

migrations/20251006152634_rename_status_is_updated.sql

@@ -0,0 +1,3 @@
+-- Add migration script here
+ALTER table statusupdatehistory
+RENAME COLUMN is_updated TO is_sent;

src/daily_task/mod.rs

@@ -36,7 +36,6 @@ pub async fn run_daily_task_at_midnight(pool: Arc<PgPool>) {
 
 /// This function does a number of things, including:
 /// * Insert new attendance records everyday for [`presense`](https://www.github.com/amfoss/presense) to update them later in the day.
-/// * Update the AttendanceSummary table
 async fn execute_daily_task(pool: Arc<PgPool>) {
     // Members is queried outside of each function to avoid repetition
     let members = sqlx::query_as::<_, Member>("SELECT * FROM Member")
@@ -90,7 +89,6 @@ async fn update_attendance(members: &Vec<Member>, pool: &PgPool) {
             }
         }
         // This could have been called in `execute_daily_task()` but that would require us to loop through members twice.
-        // Whether or not inserting attendance failed, Root will attempt to update AttendanceSummary. This can potentially fail too since insertion failed earlier. However, these two do not depend on each other and one of them failing is no reason to avoid trying the other.
     }
 }
 
@@ -104,7 +102,7 @@ async fn update_status_history(members: &Vec<Member>, pool: &PgPool) {
 
     for member in members {
         let status_update = sqlx::query(
-            "INSERT INTO StatusUpdateHistory (member_id, date, is_updated) 
+            "INSERT INTO StatusUpdateHistory (member_id, date, is_sent)
                      VALUES ($1, $2, $3)
                      ON CONFLICT (member_id, date) DO NOTHING",
         )

src/database_seeder/seed.sql

@@ -58,60 +58,9 @@ WHERE (random() < 0.75)
 ON CONFLICT (member_id, date) DO NOTHING;
 
 
--- AttendanceSummary
-INSERT INTO AttendanceSummary (
-    member_id, year, month, days_attended
-)
-SELECT 
-    m.member_id,
-    2025,
-    (i % 12) + 1,
-    FLOOR(random() * 26 + 3)::INT
-FROM generate_series(1, 400) AS i
-JOIN (
-    SELECT generate_series(1, 60) AS idx, member_id
-    FROM member
-) AS m ON (i % 60) + 1 = m.idx
-ON CONFLICT (member_id, year, month) DO NOTHING;
-
-
--- StatusUpdateStreak
-INSERT INTO StatusUpdateStreak (
-    member_id, current_streak, max_streak
-)
-SELECT 
-    member_id,
-    FLOOR(random() * 10 + 1)::INT,
-    FLOOR(random() * 30 + 10)::INT
-FROM member
-ON CONFLICT (member_id) DO NOTHING;
-
-
--- Project
-INSERT INTO Project (
-    member_id, title
-)
-SELECT 
-    (i % 60) + 1,
-    CASE
-        WHEN i % 3 = 0 THEN 'Machine Learning Project ' || i
-        WHEN i % 3 = 1 THEN 'Web Development Project ' || i
-        ELSE 'Data Analysis Project ' || i
-    END
-FROM generate_series(1, 200) AS i
-WHERE NOT EXISTS (
-    SELECT 1 FROM Project 
-    WHERE member_id = (i % 60) + 1 AND title = CASE
-        WHEN i % 3 = 0 THEN 'Machine Learning Project ' || i
-        WHEN i % 3 = 1 THEN 'Web Development Project ' || i
-        ELSE 'Data Analysis Project ' || i
-    END
-);
-
-
 -- StatusUpdateHistory
 INSERT INTO StatusUpdateHistory (
-    member_id, date, is_updated
+    member_id, date, is_sent
 )
 SELECT 
     m.member_id,

src/graphql/mod.rs

@@ -1,22 +1,12 @@
 use async_graphql::MergedObject;
-use mutations::{AttendanceMutations, MemberMutations, ProjectMutations, StreakMutations};
-use queries::{AttendanceQueries, MemberQueries, ProjectQueries, StreakQueries};
+use mutations::{AttendanceMutations, MemberMutations, StatusMutations};
+use queries::MemberQueries;
 
 pub mod mutations;
 pub mod queries;
 
 #[derive(MergedObject, Default)]
-pub struct Query(
-    MemberQueries,
-    AttendanceQueries,
-    StreakQueries,
-    ProjectQueries,
-);
+pub struct Query(MemberQueries);
 
 #[derive(MergedObject, Default)]
-pub struct Mutation(
-    MemberMutations,
-    AttendanceMutations,
-    StreakMutations,
-    ProjectMutations,
-);
+pub struct Mutation(MemberMutations, AttendanceMutations, StatusMutations);

src/graphql/mutations/attendance_mutations.rs

@@ -7,7 +7,7 @@ use hmac::{Hmac, Mac};
 use sha2::Sha256;
 use sqlx::PgPool;
 
-use crate::models::attendance::{Attendance, MarkAttendanceInput};
+use crate::models::attendance::{AttendanceRecord, MarkAttendanceInput};
 
 type HmacSha256 = Hmac<Sha256>;
 
@@ -21,7 +21,7 @@ impl AttendanceMutations {
         &self,
         ctx: &Context<'_>,
         input: MarkAttendanceInput,
-    ) -> Result<Attendance> {
+    ) -> Result<AttendanceRecord> {
         let pool = ctx
             .data::<Arc<PgPool>>()
             .expect("Pool not found in context");
@@ -43,7 +43,7 @@ impl AttendanceMutations {
         }
 
         let now = Local::now().with_timezone(&Kolkata).time();
-        let attendance = sqlx::query_as::<_, Attendance>(
+        let attendance = sqlx::query_as::<_, AttendanceRecord>(
             "UPDATE Attendance SET time_in = CASE 
                 WHEN time_in IS NULL THEN $1 
                 ELSE time_in END,

src/graphql/mutations/mod.rs

@@ -1,9 +1,7 @@
 pub mod attendance_mutations;
 pub mod member_mutations;
-pub mod project_mutations;
-pub mod streak_mutations;
+pub mod status_mutations;
 
 pub use attendance_mutations::AttendanceMutations;
 pub use member_mutations::MemberMutations;
-pub use project_mutations::ProjectMutations;
-pub use streak_mutations::StreakMutations;
+pub use status_mutations::StatusMutations;

src/graphql/mutations/project_mutations.rs

@@ -0,0 +1,41 @@
+use async_graphql::{Context, Object, Result};
+use chrono_tz::Asia::Kolkata;
+use sqlx::PgPool;
+use std::sync::Arc;
+
+use crate::models::status_update::StatusUpdateRecord;
+
+#[derive(Default)]
+pub struct StatusMutations;
+
+#[Object]
+impl StatusMutations {
+    async fn mark_status_update(
+        &self,
+        ctx: &Context<'_>,
+        emails: Vec<String>,
+    ) -> Result<Vec<StatusUpdateRecord>> {
+        let pool = ctx.data::<Arc<PgPool>>().expect("Pool must be in context");
+        #[allow(deprecated)]
+        let yesterday = chrono::Utc::now()
+            .with_timezone(&Kolkata)
+            .date()
+            .naive_local()
+            - chrono::Duration::days(1);
+
+        let status = sqlx::query_as::<_, StatusUpdateRecord>(
+            "UPDATE StatusUpdateHistory SET
+                is_sent = true
+            WHERE member_id IN (SELECT member_id from Member where email = ANY($1))
+            AND date = $2
+            RETURNING *
+            ",
+        )
+        .bind(emails)
+        .bind(yesterday)
+        .fetch_all(pool.as_ref())
+        .await?;
+
+        Ok(status)
+    }
+}