Updated duplicate checking

Author: NewSkyLine-dev

.vscode/launch.json

@@ -8,15 +8,12 @@
             "type": "node",
             "request": "launch",
             "name": "Launch Program",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "program": "${workspaceFolder}/dist/app.js",
+            "skipFiles": ["<node_internals>/**"],
+            "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/ts-node",
+            "runtimeArgs": ["--transpile-only"],
+            "program": "${workspaceFolder}/src/app.ts",
             "console": "integratedTerminal",
-            "outFiles": [
-                "${workspaceFolder}/dist/**/*.js"
-            ],
             "envFile": "${workspaceFolder}/.env"
         }
     ]
-}
+}

package-lock.json

@@ -12,6 +12,7 @@
         "@types/luxon": "^3.4.2",
         "@types/node": "^20.11.5",
         "dotenv": "^16.4.0",
+        "ts-node": "^10.9.2",
         "typescript": "^5.3.3"
     },
     "dependencies": {

package.json

@@ -45,7 +45,7 @@ const untis = new WebUntis(
     const exams_events: IExam[] = parseExams(exams);
 
     // Check for duplicate events
-    timetable_events = checkDuplicateEvents(timetable_events, exams_events);
+    // timetable_events = checkDuplicateEvents(timetable_events, exams_events);
 
     // Create calendars
     const [timetable_calendar, exam_calendar] = [
@@ -99,7 +99,9 @@ function checkDuplicateEvents(
         return !exams_events.some((exam_event) => {
             return (
                 timetable_event.startTime.getTime() ===
-                exam_event.startTime.getTime()
+                    exam_event.startTime.getTime() &&
+                timetable_event.endTime.getTime() ===
+                    exam_event.endTime.getTime()
             );
         });
     });

src/app.ts

@@ -4,7 +4,7 @@ interface ILesson {
     room: string;
     startTime: Date;
     endTime: Date;
-    description: string | null;
+    description?: string;
 }
 
 interface IExam extends ILesson {