Merge branch 'develop' into kl/scrum-147-fix-timetable-integration-bugs

Author: kevin-lann

.github/workflows/autodeploy.yml

@@ -115,21 +115,20 @@ jobs:
             cd /home/masahisasekita/term-group-project-c01w25-project-course-matrix || { echo "Error: Directory /root/myapp does not exist!"; exit 1; }
 
             # Step 13: Clears deployment environment
+            sudo docker stop $(sudo docker ps -q)
             sudo docker rmi -f $(sudo docker images -q)
             sudo docker system prune -a --volumes -f
             
             # Step 14: Pull the latest images
-            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-frontend:master
-            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-backend:master
+            sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-frontend:master
+            sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-backend:master
 
             # Step 15: Run the docker containers
-            docker run -d -p 5173:5173 ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-frontend:master
-            docker run -d -p 8081:8081 ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-backend:master
+            sudo docker run -d -p 5173:5173 ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-frontend:master
+            sudo docker run -d -p 8081:8081 ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-backend:master
 
             # Step 16: Run post deployment tests
-            docker compose down
-            docker compose up -d --pull always
-            docker ps 
-            docker exec -it ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-frontend:master npm test
-            docker exec -it ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-backend:master npm test
+            sudo docker ps 
+            sudo docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-frontend:master npm test
+            sudo docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-backend:master npm test
           EOF

.github/workflows/workflow.yml .github/workflows/format.yml.github/workflows/workflow.yml renamed to .github/workflows/format.yml

@@ -1,6 +1,7 @@
 name: Format the code
 
 on:
+  workflow_dispatch:
   push:
 
 jobs:

.github/workflows/testing.yml

@@ -1,5 +1,9 @@
 name: Run Tests
-on: push
+
+on:
+  workflow_dispatch:
+  push:
+
 jobs:
   build:
     runs-on: ubuntu-latest

course-matrix/backend/__tests__/canInsert.test.ts

@@ -1,7 +1,11 @@
 import { describe, expect, it, test } from "@jest/globals";
 
-import { createOffering, canInsert } from "../src/utils/generatorHelpers";
 import { Offering } from "../src/types/generatorTypes";
+import {
+  canInsert,
+  canInsertList,
+  createOffering,
+} from "../src/utils/generatorHelpers";
 
 describe("canInsert function", () => {
   const offering1: Offering = createOffering({
@@ -115,4 +119,52 @@ describe("canInsert function", () => {
 
     expect(result).toBe(true); // Different day, no overlap
   });
+
+  it("special case", async () => {
+    const toInsert: Offering = createOffering({
+      id: 1069,
+      course_id: 1271,
+      day: "TH",
+      start: "05:00:00",
+      end: "17:00:00",
+    });
+    const offering11: Offering = createOffering({
+      id: 414,
+      course_id: 337,
+      day: "TU",
+      start: "15:00:00",
+      end: "16:00:00",
+    });
+    const offering12: Offering = createOffering({
+      id: 415,
+      course_id: 337,
+      day: "TH",
+      start: "15:00:00",
+      end: "17:00:00",
+    });
+    const offering13: Offering = createOffering({
+      id: 1052,
+      course_id: 1271,
+      day: "TU",
+      start: "10:00:00",
+      end: "11:00:00",
+    });
+    const offering14: Offering = createOffering({
+      id: 1053,
+      course_id: 1271,
+      day: "TU",
+      start: "09:00:00",
+      end: "11:00:00",
+    });
+    const curList: Offering[] = [
+      offering11,
+      offering12,
+      offering13,
+      offering14,
+    ];
+
+    const result = await canInsertList([toInsert], curList);
+
+    expect(result).toBe(false); // Special bug-causing case
+  });
 });

course-matrix/backend/__tests__/timetablesController.test.ts

@@ -139,6 +139,11 @@ jest.mock("../src/db/setupDb", () => ({
       ) {
         return {
           eq: jest.fn().mockReturnThis(), // Allow further chaining of eq if required
+          neq: jest.fn().mockImplementation(() => ({
+            maybeSingle: jest
+              .fn()
+              .mockImplementation(() => ({ data: null, error: null })),
+          })),
           maybeSingle: jest.fn().mockImplementation(() => {
             return { data: mockTimetables1, error: null };
           }),