fix: toggle notification settings

Author: kevin-lann

course-matrix/backend/src/index.ts

@@ -45,7 +45,7 @@ app.use("/api/ai", aiRouter);
 
 // Initialize cron job
 // Note: For testing purposes can set first argument to '*/15 * * * * *' to run every 15s
-cron.schedule("* * * * *", checkAndNotifyEvents);
+cron.schedule("*/15 * * * * *", checkAndNotifyEvents);
 
 /**
  * Root route to test the backend server.

course-matrix/backend/src/services/emailNotificationService.ts

@@ -119,6 +119,30 @@ export async function checkAndNotifyEvents() {
 
     // Send email notifications for each event
     for (const event of events) {
+      // get timetable notif enabled
+      const { data: timetables, error: errorTimetable} = 
+        await supabaseServersideClient
+          .schema("timetable")
+          .from("timetables")
+          .select("email_notifications_enabled")
+          .eq("id", event.calendar_id)
+          .eq("user_id", event.user_id)
+          .limit(1);
+      
+      if (errorTimetable) {
+        console.error("Error fetching timetable: ", errorTimetable);
+        return;
+      }
+
+      if (!timetables || timetables.length === 0) {
+        console.error("Timetable not found id:", event.offering_id);
+        return;
+      }
+      
+      if (!timetables[0].email_notifications_enabled) {
+        continue;
+      }
+
       // Get offering
       const { data: offerings, error: errorOffering } =
         await supabaseServersideClient

course-matrix/frontend/src/models/models.ts

@@ -111,12 +111,6 @@ export interface CorequisiteModel {
   course_code: string;
 
   /** Course code for the corequisite course */
-  id: number;
-  created_at: string;
-  updated_at: string;
-  course_id: number;
-  corequisite_id: number;
-  course_code: string;
   corequisite_code: string;
 }
 
@@ -175,3 +169,32 @@ export interface OfferingModel {
   /** Additional notes about the course offering */
   notes: string;
 }
+
+/**
+ * Represents a timetable including details like its title, semester, and favorite satus
+ */
+export interface TimetableModel {
+  /** Unique identifier */
+  id: number;
+
+  /** Creation timestamp */
+  created_at: string;
+
+  /** Last updated at timestamp  */
+  updated_at: string;
+
+  /**  Name of timetable */
+  timetable_title: string;
+
+  /** ID of user owning this timetable  */
+  user_id: string;
+
+  /** Semester that the timetable is for */
+  semester: string;
+
+  /** Is timetable favorited by user */
+  favorite: boolean;
+
+  /** Has user enabled email notifications for this timetable */
+  email_notifications_enabled: boolean;
+}

course-matrix/frontend/src/pages/Home/EmailNotificationSettings.tsx

@@ -14,6 +14,7 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 import { Switch } from "@/components/ui/switch";
+import { TimetableModel } from "@/models/models";
 import { useEffect, useState } from "react";
 
 interface EmailNotificationSettingsProps {
@@ -28,9 +29,11 @@ export const EmailNotificationSettings = ({
   const [toggled, setToggled] = useState<boolean>(false);
 
   useEffect(() => {
-    if ((data as any)?.email_notifications_enabled !== undefined) {
-      setToggled((data as any)?.email_notifications_enabled);
-      console.log((data as any)?.email_notifications_enabled);
+    if (data) {
+      const val = (data as TimetableModel[])[0]?.email_notifications_enabled;
+      if ( val !== undefined) {
+        setToggled(val);
+      }
     }
   }, [data]);