Fix: Schema bug with timetable generation

Author: kevin-lann

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

@@ -1,18 +1,10 @@
 import { generateWeeklyCourseEvents } from "../controllers/eventsController";
-import {
-  categorizeValidOfferings,
-  getMaxDays,
-  getOfferings,
-  getValidOfferings,
-  getValidSchedules,
-  GroupedOfferingList,
-  groupOfferings,
-  Offering,
-  OfferingList,
-  trim,
-} from "../controllers/generatorController";
 import { supabase } from "../db/setupDb";
 import { Request } from "express";
+import { GroupedOfferingList, Offering, OfferingList } from "../types/generatorTypes";
+import { categorizeValidOfferings, getMaxDays, getValidOfferings, groupOfferings, trim } from "../utils/generatorHelpers";
+import getOfferings from "../services/getOfferings";
+import { getValidSchedules } from "../services/getValidSchedules";
 
 // Add all possible function names here
 export type FunctionNames =
@@ -260,7 +252,7 @@ export const availableFunctions: AvailableFunctions = {
           .maybeSingle();
 
       if (existingTimetableError) {
-        return { status: 400, error: existingTimetableError.message };
+        return { status: 400, error: `Existing timetable with name: ${name}. Please rename timetable.`};
       }
 
       if (existingTimetable) {
@@ -291,9 +283,9 @@ export const availableFunctions: AvailableFunctions = {
         await insertTimetable;
 
       if (timetableError) {
-        return { status: 400, error: timetableError.message };
+        return { status: 400, error: "Timetable error" + timetableError.message };
       }
-
+      console.log("1")
       // Insert events
       for (const offering of schedule) {
         //Query course offering information
@@ -304,7 +296,7 @@ export const availableFunctions: AvailableFunctions = {
           .eq("id", offering.id)
           .maybeSingle();
 
-        if (offeringError) return { status: 400, error: offeringError.message };
+        if (offeringError) return { status: 400, error: `Offering error id: ${offering.id} ` + offeringError.message };
 
         if (!offeringData || offeringData.length === 0) {
           return {
@@ -366,7 +358,7 @@ export const availableFunctions: AvailableFunctions = {
             .select("*");
 
         if (courseEventError) {
-          return { status: 400, error: courseEventError.message };
+          return { status: 400, error: "Coruse event error " + courseEventError.message };
         }
       }
 

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

@@ -73,6 +73,7 @@ export const RestrictionSchema = z.object({
     .describe("The type of restriction being applied"),
   days: z
     .array(DayOfWeekEnum)
+    .default(["SU", "MO", "TU", "WE", "TH", "FR", "SA"])
     .describe("Specific days of the week this restriction applies to"),
   numDays: z
     .number()

course-matrix/backend/src/utils/generatorHelpers.ts

@@ -74,9 +74,9 @@ export function isValidOffering(
         break;
 
       case RestrictionType.RestrictAfter:
-        console.log("====");
-        console.log(offering.end);
-        console.log(restriction.endTime);
+        // console.log("====");
+        // console.log(offering.end);
+        // console.log(restriction.endTime);
         if (offering.end > restriction.startTime) return false;
         break;
 
@@ -97,7 +97,7 @@ export function isValidOffering(
     }
   }
 
-  console.log(offering);
+  // console.log(offering);
   return true;
 }
 
@@ -189,7 +189,7 @@ export async function canInsertList(
   toInsertList: Offering[],
   curList: Offering[],
 ) {
-  console.log(toInsertList);
+  // console.log(toInsertList);
   return toInsertList.every((x) => canInsert(x, curList));
 }