Change schema and interfaces to give enough data to reconstruct. Also…

… added helper func to call scraper public endpoint

server/prisma/schema.prisma

@@ -60,8 +60,10 @@ model Event {
 
 model Class {
   id          String     @unique
-  // classType   ClassType
   classNo     String  // From scraper (not unique in db, but between classes)
+  term        Term
+  year        String
+  courseCode  String
   Timetable   Timetable? @relation(fields: [timetableId], references: [id], onDelete: Cascade)
   timetableId String?
   @@map("classes")
@@ -109,6 +111,13 @@ enum GroupVisibility {
   @@map("group_visibility")
 }
 
+enum Term {
+  U1
+  T1
+  T2
+  T3
+}
+
 // enum ClassType { 
 //   LECTURE
 //   TUTORIAL

server/src/user/dto/timetable.dto.ts

@@ -13,9 +13,24 @@ export class TimetableDto {
   name?: string;
 }
 
+export class ReconstructedTimetableDto {
+  @IsString()
+  timetableId: string; // Randomly generated on the backend
+
+  @IsArray()
+  @IsString({ each: true })
+  selectedCourses: string[];
+  selectedClasses: ReconstructedClassDto[];
+  createdEvents: EventDto[];
+  name?: string;
+}
+
 export class ClassDto {
   id: string;
   classNo: string; // From scraper
+  year: string;
+  term: 'T1' | 'T2' | 'T3' | 'U1';
+  courseCode: string;
   timetableId?: string;
 }
 

server/src/user/user.service.ts

@@ -6,14 +6,43 @@ import {
   TimetableDto,
   ClassDto,
   InitUserDTO,
+  ReconstructedTimetableDto,
 } from './dto';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { v4 as uuidv4 } from 'uuid';
 import { Timetable, User } from '@prisma/client';
 
+const API_URL = 'https://timetable.csesoc.app/api/terms';
 @Injectable()
 export class UserService {
   constructor(private readonly prisma: PrismaService) {}
+
+  private async convertClasses(classes: ClassDto[]) {
+    try {
+      // For each class in class DTO, we need to fetch information
+      const cache = {};
+
+      for (const clz of classes) {
+        const k = `${clz.year}-${clz.term}/courses/${clz.courseCode}`;
+        if (!(k in cache)) {
+          const data = await fetch(`${API_URL}/${k}`);
+          const json = await data.json();
+
+          cache[k] = json.classes;
+        }
+      }
+
+      return classes.map((clz) => {
+        const k = `${clz.year}-${clz.term}/courses/${clz.courseCode}`;
+        const data = cache[k].find((c) => c.classID === clz.classNo);
+        // TODO: MORE CONVERSION HERE
+        return data;
+      });
+    } catch (e) {
+      throw new Error('uhh');
+    }
+  }
+
   async getUserInfo(_userID: string): Promise<UserDTO> {
     const { userID, timetables, ...userData } =
       await this.prisma.user.findUniqueOrThrow({
@@ -96,7 +125,8 @@ export class UserService {
     }
   }
 
-  async getUserTimetables(_userID: string): Promise<TimetableDto[]> {
+  async getUserTimetables(_userID: string): Promise<any[]> {
+    // ): Promise<ReconstructedTimetableDto[]> {
     try {
       const res = await this.prisma.timetable.findMany({
         where: { userID: _userID },
@@ -136,11 +166,8 @@ export class UserService {
       const classes = _selectedClasses.map((c) => {
         // const classId = uuidv4(); // on second thought, its already been generated on the frontend, and I think there are advantages to this
         return {
+          ...c,
           // timetableId: _timetableId,
-          id: c.id,
-          // section: c.section,
-          // courseCode: c.courseCode,
-          // classType: c.classType,
         };
       });
 
@@ -236,7 +263,8 @@ export class UserService {
     }
   }
 
-  async getTimetablesByIDs(timetableIDs: string[]): Promise<Timetable[]> {
+  async getTimetablesByIDs(timetableIDs: string[]): Promise<any[]> {
+    // ): Promise<ReconstructedTimetableDto[]> {
     try {
       const timetables = await this.prisma.timetable.findMany({
         where: {

server/test/db.spec.ts

@@ -226,10 +226,13 @@ describe('Integration testing for user/friend db endpoints', () => {
       selectedCourses: ['COMP2511', 'COMP2521'],
       selectedClasses: [
         timetable.selectedClasses[1],
-        { ...timetable.selectedClasses[2], section: 'A321' },
+        { ...timetable.selectedClasses[2], term: 'T1', classNo: '8839' },
         {
           id: 'c4',
-          classNo: '11127',
+          classNo: '8930',
+          year: '2024',
+          term: 'T2',
+          courseCode: 'COMP2521',
         },
       ],
       createdEvents: [

server/test/mockData.ts

@@ -48,11 +48,17 @@ const mockData = {
       selectedClasses: [
         {
           id: 'c1',
-          classNo: '11069',
+          classNo: '8713',
+          year: '2024',
+          term: 'T1',
+          courseCode: 'COMP1511',
         },
         {
           id: 'c2',
-          classNo: '8332',
+          classNo: '8714',
+          year: '2024',
+          term: 'T1',
+          courseCode: 'COMP1511',
         },
       ],
       createdEvents: [
@@ -82,15 +88,24 @@ const mockData = {
       selectedClasses: [
         {
           id: 'c1',
-          classNo: '11069',
+          classNo: '8713',
+          year: '2024',
+          term: 'T1',
+          courseCode: 'COMP1511',
         },
         {
           id: 'c2',
-          classNo: '8332',
+          classNo: '8714',
+          year: '2024',
+          term: 'T1',
+          courseCode: 'COMP1511',
         },
         {
           id: 'c3',
-          classNo: '8364',
+          classNo: '8890',
+          year: '2024',
+          term: 'T2',
+          courseCode: 'COMP2511',
         },
       ],
       createdEvents: [