Auto-formatted the code using Prettier

Author: dawangk

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

@@ -1,8 +1,18 @@
 import exp from "constants";
 import { Request, Response } from "express";
 
-import {Offering, OfferingList, GroupedOfferingList} from "../types/generatorTypes"
-import {getMaxDays, groupOfferings, getValidOfferings, categorizeValidOfferings, trim} from "../utils/generatorHelpers"
+import {
+  Offering,
+  OfferingList,
+  GroupedOfferingList,
+} from "../types/generatorTypes";
+import {
+  getMaxDays,
+  groupOfferings,
+  getValidOfferings,
+  categorizeValidOfferings,
+  trim,
+} from "../utils/generatorHelpers";
 import getOfferings from "../services/getOfferings";
 import { getValidSchedules } from "../services/getValidSchedules";
 
@@ -13,7 +23,7 @@ export default {
   generateTimetable: asyncHandler(async (req: Request, res: Response) => {
     try {
       // Extract event details and course information from the request
-      const {semester, courses, restrictions } = req.body;
+      const { semester, courses, restrictions } = req.body;
       const courseOfferingsList: OfferingList[] = [];
       const validCourseOfferingsList: GroupedOfferingList[] = [];
       const maxdays = await getMaxDays(restrictions);
@@ -62,12 +72,10 @@ export default {
         return res.status(404).json({ error: "No valid schedules found." });
       }
       // Return the valid schedules
-      return res
-        .status(200)
-        .json({
-          amount: validSchedules.length,
-          schedules: trim(validSchedules),
-        });
+      return res.status(200).json({
+        amount: validSchedules.length,
+        schedules: trim(validSchedules),
+      });
     } catch (error) {
       // Catch any error and return the error message
       const errorMessage =

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

@@ -1,12 +1,15 @@
 import { supabase } from "../db/setupDb";
 
 // Function to fetch offerings from the database for a given course and semester
-export default async function getOfferings(course_id: number, semester: string) {
-    let { data: offeringData, error: offeringError } = await supabase
-      .schema("course")
-      .from("offerings")
-      .select(
-        `
+export default async function getOfferings(
+  course_id: number,
+  semester: string,
+) {
+  let { data: offeringData, error: offeringError } = await supabase
+    .schema("course")
+    .from("offerings")
+    .select(
+      `
       id, 
       course_id, 
       meeting_section, 
@@ -23,9 +26,9 @@ export default async function getOfferings(course_id: number, semester: string)
       notes, 
       code
     `,
-      )
-      .eq("course_id", course_id)
-      .eq("offering", semester);
-  
-    return offeringData;
-  }
+    )
+    .eq("course_id", course_id)
+    .eq("offering", semester);
+
+  return offeringData;
+}

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

@@ -1,49 +1,49 @@
-import {Offering, CategorizedOfferingList} from "../types/generatorTypes"
-import {getFrequencyTable, canInsertList} from "../utils/generatorHelpers"
+import { Offering, CategorizedOfferingList } from "../types/generatorTypes";
+import { getFrequencyTable, canInsertList } from "../utils/generatorHelpers";
 // Function to generate all valid schedules based on offerings and restrictions
 
 export async function getValidSchedules(
-    validSchedules: Offering[][],
-    courseOfferingsList: CategorizedOfferingList[],
-    curList: Offering[],
-    cur: number,
-    len: number,
-    maxdays: number,
-  ) {
-    // Base case: if all courses have been considered
-    if (cur == len) {
-      const freq: Map<string, number> = getFrequencyTable(curList);
-  
-      // If the number of unique days is within the allowed limit, add the current
-      // schedule to the list
-      if (freq.size <= maxdays) {
-        validSchedules.push([...curList]); // Push a copy of the current list
-      }
-      return;
+  validSchedules: Offering[][],
+  courseOfferingsList: CategorizedOfferingList[],
+  curList: Offering[],
+  cur: number,
+  len: number,
+  maxdays: number,
+) {
+  // Base case: if all courses have been considered
+  if (cur == len) {
+    const freq: Map<string, number> = getFrequencyTable(curList);
+
+    // If the number of unique days is within the allowed limit, add the current
+    // schedule to the list
+    if (freq.size <= maxdays) {
+      validSchedules.push([...curList]); // Push a copy of the current list
     }
-  
-    const offeringsForCourse = courseOfferingsList[cur];
-  
-    // Recursively attempt to add offerings for the current course
-    for (const [groupKey, offerings] of Object.entries(
-      offeringsForCourse.offerings,
-    )) {
-      if (await canInsertList(offerings, curList)) {
-        const count = offerings.length;
-        curList.push(...offerings); // Add offering to the current list
-  
-        // Recursively generate schedules for the next course
-        await getValidSchedules(
-          validSchedules,
-          courseOfferingsList,
-          curList,
-          cur + 1,
-          len,
-          maxdays,
-        );
-  
-        // Backtrack: remove the last offering if no valid schedule was found
-        for (let i = 0; i < count; i++) curList.pop();
-      }
+    return;
+  }
+
+  const offeringsForCourse = courseOfferingsList[cur];
+
+  // Recursively attempt to add offerings for the current course
+  for (const [groupKey, offerings] of Object.entries(
+    offeringsForCourse.offerings,
+  )) {
+    if (await canInsertList(offerings, curList)) {
+      const count = offerings.length;
+      curList.push(...offerings); // Add offering to the current list
+
+      // Recursively generate schedules for the next course
+      await getValidSchedules(
+        validSchedules,
+        courseOfferingsList,
+        curList,
+        cur + 1,
+        len,
+        maxdays,
+      );
+
+      // Backtrack: remove the last offering if no valid schedule was found
+      for (let i = 0; i < count; i++) curList.pop();
     }
-  }
+  }
+}

course-matrix/backend/src/types/generatorTypes.ts

@@ -1,58 +1,57 @@
-
 // Interface to define the structure of an Offering
 export interface Offering {
-    id: number;
-    course_id: number;
-    meeting_section: string;
-    offering: string;
-    day: string;
-    start: string;
-    end: string;
-    location: string;
-    current: number;
-    max: number;
-    is_waitlisted: boolean;
-    delivery_mode: string;
-    instructor: string;
-    notes: string;
-    code: string;
+  id: number;
+  course_id: number;
+  meeting_section: string;
+  offering: string;
+  day: string;
+  start: string;
+  end: string;
+  location: string;
+  current: number;
+  max: number;
+  is_waitlisted: boolean;
+  delivery_mode: string;
+  instructor: string;
+  notes: string;
+  code: string;
 }
 
 // Enum to define different types of restrictions for offerings
 export enum RestrictionType {
-    RestrictBefore = "Restrict Before",
-    RestrictAfter = "Restrict After",
-    RestrictBetween = "Restrict Between",
-    RestrictDay = "Restrict Day",
-    RestrictDaysOff = "Days Off",
+  RestrictBefore = "Restrict Before",
+  RestrictAfter = "Restrict After",
+  RestrictBetween = "Restrict Between",
+  RestrictDay = "Restrict Day",
+  RestrictDaysOff = "Days Off",
 }
-  
+
 // Interface for the restriction object
 export interface Restriction {
-    type: RestrictionType;
-    days: string[];
-    startTime: string;
-    endTime: string;
-    disabled: boolean;
-    numDays: number;
+  type: RestrictionType;
+  days: string[];
+  startTime: string;
+  endTime: string;
+  disabled: boolean;
+  numDays: number;
 }
 
 // Interface for organizing offerings with the same meeting_section together
 export interface GroupedOfferingList {
-    course_id: number;
-    groups: Record<string, Offering[]>;
+  course_id: number;
+  groups: Record<string, Offering[]>;
 }
-  
+
 // Interface for organizing offerings by course ID
 export interface OfferingList {
-    course_id: number;
-    offerings: Offering[];
+  course_id: number;
+  offerings: Offering[];
 }
-  
+
 // Interface for organizing offerings by course ID and the category of the
 // course (LEC, TUT, PRA)
 export interface CategorizedOfferingList {
-    course_id: number;
-    category: "LEC" | "TUT" | "PRA";
-    offerings: Record<string, Offering[]>;
-}
+  course_id: number;
+  category: "LEC" | "TUT" | "PRA";
+  offerings: Record<string, Offering[]>;
+}