Fix: Restrictions not saving

Author: kevin-lann

course-matrix/backend/src/constants/availableFunctions.ts

@@ -15,6 +15,8 @@ import {
 } from "../utils/generatorHelpers";
 import getOfferings from "../services/getOfferings";
 import { getValidSchedules } from "../services/getValidSchedules";
+import { RestrictionForm } from "../models/timetable-form";
+import { convertTimeStringToDate } from "../utils/convert-time-string";
 
 // Add all possible function names here
 export type FunctionNames =
@@ -385,6 +387,42 @@ export const availableFunctions: AvailableFunctions = {
         }
       }
 
+      // Save restrictions
+      for (const restriction of (restrictions as RestrictionForm[])) {
+        let startTime: String | null = null;
+        let endTime: String | null = null;
+
+        if (restriction.startTime) {
+          let restriction_start_time = convertTimeStringToDate(restriction.startTime);
+          startTime = restriction_start_time.toISOString().split("T")[1];
+        }
+
+        if (restriction.endTime) {
+          let restriction_end_time = convertTimeStringToDate(restriction.endTime);
+          endTime = restriction_end_time.toISOString().split("T")[1];
+        }
+        const { data: restrictionData, error: restrictionError } = await supabase
+          .schema("timetable")
+          .from("restriction")
+          .insert([
+            {
+              user_id,
+              type: restriction?.type,
+              days: restriction?.days,
+              start_time: startTime,
+              end_time: endTime,
+              disabled: restriction?.disabled,
+              num_days: restriction?.numDays,
+              calendar_id: timetableData?.id,
+            },
+          ])
+          .select();
+
+        if (restrictionError) {
+          return { status: 400, error: restrictionError.message };
+        }
+      }
+
       return { status: 201, data: timetableData };
     } catch (error) {
       // Catch any error and return the error message

course-matrix/backend/src/controllers/aiController.ts

@@ -293,12 +293,12 @@ export const chat = asyncHandler(async (req: Request, res: Response) => {
             parameters: TimetableFormSchema,
             execute: async (args) => {
               // console.log("Args for generate: ", args)
-              // console.log("restrictions :", JSON.stringify(args.restrictions))
+              console.log("restrictions :", JSON.stringify(args.restrictions))
               const data = await availableFunctions.generateTimetable(
                 args,
                 req,
               );
-              // console.log("Generated timetable: ", data)
+              console.log("Generated timetable: ", data)
               return data;
             },
           }),

course-matrix/backend/src/models/timetable-form.ts

@@ -17,8 +17,8 @@ export type RestrictionForm = {
   type: string;
   days?: string[];
   numDays?: number;
-  startTime?: Date;
-  endTime?: Date;
+  startTime?: string;
+  endTime?: string;
   disabled?: boolean;
 };
 

course-matrix/backend/src/utils/convert-time-string.ts

@@ -0,0 +1,18 @@
+export function convertTimeStringToDate(timeString: string): Date {
+  // Validate the timeString format (HH:mm:ss)
+  const isValidFormat = /^([0-1]?[0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]$/.test(timeString);
+  if (!isValidFormat) {
+    throw new Error("Invalid time format. Expected HH:mm:ss");
+  }
+
+  const date = new Date();
+  
+  const [hours, minutes, seconds] = timeString.split(':').map(Number);
+  
+  date.setHours(hours);
+  date.setMinutes(minutes);
+  date.setSeconds(seconds);
+  date.setMilliseconds(0);
+  
+  return date;
+}