feat: multiple classes in week

Author: D0dii

backend/app/scrap-registrations/scrap_registrations.ts

@@ -225,26 +225,31 @@ const scrapGroupDetails = async (groupUrl: string) => {
   const type = giveGroupType(mainContent.find("h1").text().trim());
   const group = getGroupNumber(mainContent.find("h1").text());
 
+  const days = [] as string[];
+  const startTimeEndTimes = [] as { startTime: string; endTime: string }[];
+
   const dayWeek = mainContent
     .find("table")
     .find("tbody")
     .find("tr")
     .eq(2)
     .find("td")
     .eq(1);
+  dayWeek.children("div").each((_, element) => {
+    const day = checkDay($(element).text().trim());
+    const { startTime, endTime } = getStartEndTime($(element).text().trim());
+    if (
+      day !== "unknown" &&
+      startTime !== "error" &&
+      endTime !== "error" &&
+      startTime !== "00:00" &&
+      endTime !== "00:00"
+    ) {
+      days.push(day);
+      startTimeEndTimes.push({ startTime, endTime });
+    }
+  });
   const week = checkWeek(dayWeek.text());
-  const day = checkDay(dayWeek.text());
-  const { startTime, endTime } = getStartEndTime(
-    mainContent
-      .find("table")
-      .find("tbody")
-      .find("tr")
-      .eq(2)
-      .find("td")
-      .eq(1)
-      .text()
-      .trim(),
-  );
   const lecturer = mainContent
     .find("table")
     .find("tbody")
@@ -280,15 +285,13 @@ const scrapGroupDetails = async (groupUrl: string) => {
     .trim();
   const spotsOccupiedNumber = Number.parseInt(spotsOccupied, 10);
   const spotsTotalNumber = Number.parseInt(spotsTotal, 10);
-
   return {
     name,
     type,
     group,
     week,
-    day,
-    startTime,
-    endTime,
+    days,
+    startTimeEndTimes,
     lecturer,
     spotsOccupied: Number.isNaN(spotsOccupiedNumber) ? 0 : spotsOccupiedNumber,
     spotsTotal: Number.isNaN(spotsTotalNumber) ? 0 : spotsTotalNumber,

backend/commands/scraper.ts

@@ -220,42 +220,51 @@ export default class Scraper extends BaseCommand {
               }),
             );
 
-            const group = await Group.updateOrCreate(
-              {
-                name: details.name.slice(0, 255),
-                startTime: details.startTime.slice(0, 255),
-                endTime: details.endTime.slice(0, 255),
-                group: details.group.slice(0, 255),
-                week: details.week,
-                day: details.day.slice(0, 255),
-                type: details.type.slice(0, 255),
-                courseId:
-                  course.courseCode.slice(0, 255) +
-                  (extractLastStringInBrackets(registration.name) ??
-                    registration.name),
-              },
-              {
-                name: details.name.slice(0, 255),
-                startTime: details.startTime.slice(0, 255),
-                endTime: details.endTime.slice(0, 255),
-                group: details.group.slice(0, 255),
-                week: details.week,
-                day: details.day.slice(0, 255),
-                type: details.type.slice(0, 255),
-                courseId:
-                  course.courseCode.slice(0, 255) +
-                  (extractLastStringInBrackets(registration.name) ??
-                    registration.name),
-                spotsOccupied: details.spotsOccupied,
-                spotsTotal: details.spotsTotal,
-                url: url.slice(0, 255),
-                isActive: true,
-              },
-            );
+            for (const day of details.days) {
+              const group = await Group.updateOrCreate(
+                {
+                  name: details.name.slice(0, 255),
+                  startTime: details.startTimeEndTimes[
+                    details.days.indexOf(day)
+                  ].startTime.slice(0, 255),
+                  endTime: details.startTimeEndTimes[
+                    details.days.indexOf(day)
+                  ].endTime.slice(0, 255),
+                  group: details.group.slice(0, 255),
+                  week: details.week,
+                  day: day.slice(0, 255),
+                  type: details.type.slice(0, 255),
+                  courseId:
+                    course.courseCode.slice(0, 255) +
+                    (extractLastStringInBrackets(registration.name) ??
+                      registration.name),
+                },
+                {
+                  name: details.name.slice(0, 255),
+                  startTime: details.startTimeEndTimes[
+                    details.days.indexOf(day)
+                  ].startTime.slice(0, 255),
+                  endTime: details.startTimeEndTimes[
+                    details.days.indexOf(day)
+                  ].endTime.slice(0, 255),
+                  group: details.group.slice(0, 255),
+                  week: details.week,
+                  day: day.slice(0, 255),
+                  type: details.type.slice(0, 255),
+                  courseId:
+                    course.courseCode.slice(0, 255) +
+                    (extractLastStringInBrackets(registration.name) ??
+                      registration.name),
+                  spotsOccupied: details.spotsOccupied,
+                  spotsTotal: details.spotsTotal,
+                  url: url.slice(0, 255),
+                  isActive: true,
+                },
+              );
+              processedGroupIds.push(group.id);
 
-            processedGroupIds.push(group.id);
-
-            await group.related("lecturers").sync(lecturerIds);
+              await group.related("lecturers").sync(lecturerIds);
+            }
           }),
         );
       }