From c78bf74dfdfc1f89271b31252422f15b345679a5 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sun, 23 Mar 2025 17:13:52 +0100
Subject: [PATCH 001/177] fix: code in commentaar wegdoen uit menubar

---
 frontend/src/components/MenuBar.vue | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/frontend/src/components/MenuBar.vue b/frontend/src/components/MenuBar.vue
index ed80d7c2..37465aac 100644
--- a/frontend/src/components/MenuBar.vue
+++ b/frontend/src/components/MenuBar.vue
@@ -225,25 +225,6 @@
             </div>
             <div class="right">
                 <li>
-                    <!-- <v-btn
-                        @click="performLogout"
-                        to="/login"
-                        style="background-color: transparent; box-shadow: none !important"
-                    >
-                        <v-tooltip
-                            :text="t('logout')"
-                            location="bottom"
-                        >
-                            <template v-slot:activator="{ props }">
-                                <v-icon
-                                    v-bind="props"
-                                    icon="mdi-logout"
-                                    size="x-large"
-                                    color="#0e6942"
-                                ></v-icon>
-                            </template>
-                        </v-tooltip>
-                    </v-btn> -->
                     <v-dialog max-width="500">
                         <template v-slot:activator="{ props: activatorProps }">
                             <v-btn

From 15e2fa99606b402a12464ed04aca4de125415b59 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sun, 23 Mar 2025 21:25:20 +0100
Subject: [PATCH 002/177] feat: tabel gemaakt student klassen

---
 frontend/src/views/classes/UserClasses.vue | 100 ++++++++++++++++++++-
 1 file changed, 97 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index 1a35a59f..1a0b69a8 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -1,7 +1,101 @@
-<script setup lang="ts"></script>
+<script setup lang="ts">
+    import { useI18n } from "vue-i18n";
+    import authState from "@/services/auth/auth-service.ts";
+    const { t, locale } = useI18n();
 
+    const role: String = authState.authState.activeRole!;
+
+    const classIds = ["class01", "class02", "class03"];
+    const classmembers = [22, 11, 9];
+    const zipped = classIds.map((item, index) => [item, classmembers[index]]);
+</script>
 <template>
-    <main></main>
+    <main>
+        <h class="title">{{ t("classes") }}</h>
+        <div v-if="role === 'student'">
+            <v-table class="table">
+                <thead>
+                    <tr>
+                        <th class="header">{{ t("classes") }}</th>
+                        <th class="header">{{ t("members") }}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr
+                        v-for="[id, members] in zipped"
+                        :key="id"
+                    >
+                        <td>{{ id }}</td>
+                        <td>{{ members }}</td>
+                    </tr>
+                </tbody>
+            </v-table>
+        </div>
+        <div v-else>
+            <v-table class="table">
+                <thead>
+                    <tr>
+                        <th class="header">{{ t("classes") }}</th>
+                        <th class="header">{{ t("members") }}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr
+                        v-for="[id, members] in zipped"
+                        :key="id"
+                    >
+                        <td>{{ id }}</td>
+                        <td>{{ members }}</td>
+                    </tr>
+                </tbody>
+            </v-table>
+        </div>
+    </main>
 </template>
 
-<style scoped></style>
+<style scoped>
+    .header {
+        font-weight: bold !important;
+        background-color: #0e6942;
+        color: white;
+        padding: 10px;
+    }
+
+    table thead th:first-child {
+        border-top-left-radius: 10px; /* Top-left rounded corner */
+    }
+
+    .table thead th:last-child {
+        border-top-right-radius: 10px; /* Top-right rounded corner */
+    }
+
+    .table tbody tr:nth-child(odd) {
+        background-color: white;
+    }
+
+    .table tbody tr:nth-child(even) {
+        background-color: #f6faf2;
+    }
+
+    td,
+    th {
+        border-bottom: 1px solid #0e6942;
+        border-top: 1px solid #0e6942;
+    }
+
+    .table {
+        width: 60%;
+        margin: 0 auto;
+        padding-top: 3%;
+        border-collapse: collapse;
+    }
+
+    .title {
+        color: #0e6942;
+        text-transform: uppercase;
+        font-weight: bolder;
+        padding-left: 30px;
+        padding-top: 2%;
+        font-size: 50px;
+    }
+</style>

From 28392a5cee3e77d289e476cf04b019c67d0ed08a Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Fri, 28 Mar 2025 17:43:13 +0100
Subject: [PATCH 003/177] feat: tekstveld om code in te vullen om zich bij een
 klas te voegen

---
 frontend/src/views/classes/UserClasses.vue | 28 ++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index 1a0b69a8..c374ec31 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -50,6 +50,17 @@
                 </tbody>
             </v-table>
         </div>
+        <div class="join">
+            <h1>{{ t("joinClass") }}</h1>
+            <p>{{ t("Enter the code the teacher has given you to join the class.") }}</p>
+
+            <v-text-field
+                label="CODE"
+                placeholder="Enter the code"
+                variant="outlined"
+                max-width="300px"
+            ></v-text-field>
+        </div>
     </main>
 </template>
 
@@ -62,11 +73,11 @@
     }
 
     table thead th:first-child {
-        border-top-left-radius: 10px; /* Top-left rounded corner */
+        border-top-left-radius: 10px;
     }
 
     .table thead th:last-child {
-        border-top-right-radius: 10px; /* Top-right rounded corner */
+        border-top-right-radius: 10px;
     }
 
     .table tbody tr:nth-child(odd) {
@@ -98,4 +109,17 @@
         padding-top: 2%;
         font-size: 50px;
     }
+
+    h1 {
+        color: #0e6942;
+        font-size: 30px;
+    }
+
+    .join {
+        display: flex;
+        flex-direction: column;
+        gap: 20px;
+        margin-left: 30px;
+        margin-top: 50px;
+    }
 </style>

From 5bb43829a3f846c41a1b10039ac9c19ffa930d55 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Fri, 28 Mar 2025 17:59:53 +0100
Subject: [PATCH 004/177] feat: vertalingen

---
 frontend/src/i18n/locale/de.json           | 2 ++
 frontend/src/i18n/locale/en.json           | 3 +++
 frontend/src/i18n/locale/fr.json           | 2 ++
 frontend/src/i18n/locale/nl.json           | 2 ++
 frontend/src/views/classes/UserClasses.vue | 4 ++--
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/i18n/locale/de.json b/frontend/src/i18n/locale/de.json
index 956e8b96..5864da43 100644
--- a/frontend/src/i18n/locale/de.json
+++ b/frontend/src/i18n/locale/de.json
@@ -17,6 +17,8 @@
     "inclusive": "Inclusiv",
     "sociallyRelevant": "Gesellschaftlich relevant",
     "translate": "übersetzen",
+    "joinClass": "Klasse beitreten",
+    "JoinClassExplanation": "Geben Sie den Code ein, den Ihnen die Lehrkraft mitgeteilt hat, um der Klasse beizutreten.",
     "themes": "Themen",
     "choose-theme": "Wähle ein thema",
     "choose-age": "Alter auswählen",
diff --git a/frontend/src/i18n/locale/en.json b/frontend/src/i18n/locale/en.json
index cf7a19cb..0d8eacf0 100644
--- a/frontend/src/i18n/locale/en.json
+++ b/frontend/src/i18n/locale/en.json
@@ -17,6 +17,9 @@
     "sociallyRelevant": "Socially relevant",
     "login": "log in",
     "translate": "translate",
+    "joinClass": "Join class",
+    "JoinClassExplanation": "Enter the code the teacher has given you to join the class.",
+    "enterCode": "Enter the code.",
     "themes": "Themes",
     "choose-theme": "Select a theme",
     "choose-age": "Select age",
diff --git a/frontend/src/i18n/locale/fr.json b/frontend/src/i18n/locale/fr.json
index 0b4041a4..d49c20d0 100644
--- a/frontend/src/i18n/locale/fr.json
+++ b/frontend/src/i18n/locale/fr.json
@@ -17,6 +17,8 @@
     "inclusive": "Inclusif",
     "sociallyRelevant": "Socialement pertinent",
     "translate": "traduire",
+    "joinClass": "Rejoindre une classe",
+    "JoinClassExplanation": "Entrez le code que l'enseignant vous a donné pour rejoindre la classe.",
     "themes": "Thèmes",
     "choose-theme": "Choisis un thème",
     "choose-age": "Choisis un âge",
diff --git a/frontend/src/i18n/locale/nl.json b/frontend/src/i18n/locale/nl.json
index 9f944a5a..a4046a37 100644
--- a/frontend/src/i18n/locale/nl.json
+++ b/frontend/src/i18n/locale/nl.json
@@ -17,6 +17,8 @@
     "sociallyRelevant": "Maatschappelijk relevant",
     "login": "log in",
     "translate": "vertalen",
+    "joinClass": "Word lid van een klas",
+    "JoinClassExplanation": "Voer de code in die je van de docent hebt gekregen om lid te worden van de klas.",
     "themes": "Lesthema's",
     "choose-theme": "Kies een thema",
     "choose-age": "Kies een leeftijd",
diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index c374ec31..b2884ba8 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -52,11 +52,11 @@
         </div>
         <div class="join">
             <h1>{{ t("joinClass") }}</h1>
-            <p>{{ t("Enter the code the teacher has given you to join the class.") }}</p>
+            <p>{{ t("JoinClassExplanation") }}</p>
 
             <v-text-field
                 label="CODE"
-                placeholder="Enter the code"
+                placeholder=""
                 variant="outlined"
                 max-width="300px"
             ></v-text-field>

From ba28314ee3a927ca5d4964e1b76b59b8c70e044c Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Fri, 28 Mar 2025 18:00:05 +0100
Subject: [PATCH 005/177] fix: verwijder overbodige files

---
 frontend/src/views/classes/StudentClasses.vue | 7 -------
 frontend/src/views/classes/TeacherClasses.vue | 7 -------
 2 files changed, 14 deletions(-)
 delete mode 100644 frontend/src/views/classes/StudentClasses.vue
 delete mode 100644 frontend/src/views/classes/TeacherClasses.vue

diff --git a/frontend/src/views/classes/StudentClasses.vue b/frontend/src/views/classes/StudentClasses.vue
deleted file mode 100644
index 1a35a59f..00000000
--- a/frontend/src/views/classes/StudentClasses.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<script setup lang="ts"></script>
-
-<template>
-    <main></main>
-</template>
-
-<style scoped></style>
diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
deleted file mode 100644
index 1a35a59f..00000000
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<script setup lang="ts"></script>
-
-<template>
-    <main></main>
-</template>
-
-<style scoped></style>

From f8cdde7d30c55b1081e582d2af8a752228c71169 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Fri, 28 Mar 2025 19:23:45 +0100
Subject: [PATCH 006/177] feat: popup venster verschijnt om te zien wie in de
 klas zit met een student

---
 frontend/src/views/classes/UserClasses.vue | 108 ++++++++++++++++++---
 1 file changed, 95 insertions(+), 13 deletions(-)

diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index b2884ba8..c78f12e3 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -1,13 +1,65 @@
 <script setup lang="ts">
     import { useI18n } from "vue-i18n";
     import authState from "@/services/auth/auth-service.ts";
-    const { t, locale } = useI18n();
+    import { ref, watch } from "vue";
+    const { t } = useI18n();
 
     const role: String = authState.authState.activeRole!;
 
-    const classIds = ["class01", "class02", "class03"];
-    const classmembers = [22, 11, 9];
-    const zipped = classIds.map((item, index) => [item, classmembers[index]]);
+    type Teacher = {
+        username: string;
+        firstName: string;
+        lastName: string;
+        classes: Array<Class>;
+    };
+
+    type Student = {
+        username: string;
+        firstName: string;
+        lastName: string;
+        classes: Array<Class>;
+    };
+
+    type Class = {
+        id: string;
+        displayName: string;
+        teachers: Array<Teacher>;
+        students: Array<Student>;
+    };
+
+    const classIds: Array<string> = ["class01", "class02", "class03"];
+    let student01: Student = { username: "id01", firstName: "Mark", lastName: "Knopfler", classes: [] };
+    let student02: Student = { username: "id01", firstName: "John", lastName: "Hiat", classes: [] };
+    let student03: Student = { username: "id01", firstName: "Aaron", lastName: "Lewis", classes: [] };
+
+    const class01: Class = { id: "class01", displayName: "class 01", teachers: [], students: [student01, student02] };
+    const class02: Class = { id: "class02", displayName: "class 02", teachers: [], students: [student01, student03] };
+    const class03: Class = { id: "class03", displayName: "class 03", teachers: [], students: [student02, student03] };
+
+    student01.classes = [class01, class02];
+    student02.classes = [class01, class03];
+    student03.classes = [class02, class03];
+
+    const classes: Array<Class> = [class01, class02, class03];
+
+    const code = ref("");
+    console.log(code);
+    watch(code, (newValue) => {
+        console.log("Code changed:", newValue);
+    });
+
+    // handle dialog for showing members of a class
+    const dialog = ref(false);
+    const students = ref<Array<string>>([]);
+    const selectedClass = ref<Class | null>(null);
+    
+    const openDialog = (c: Class) => {
+        selectedClass.value = c;
+        if (selectedClass !== undefined) {
+            students.value = selectedClass.value.students.map((student) => `${student.firstName} ${student.lastName}`);
+            dialog.value = true;
+        }
+    };
 </script>
 <template>
     <main>
@@ -22,11 +74,11 @@
                 </thead>
                 <tbody>
                     <tr
-                        v-for="[id, members] in zipped"
-                        :key="id"
+                        v-for="c in classes"
+                        :key="c.id"
                     >
-                        <td>{{ id }}</td>
-                        <td>{{ members }}</td>
+                        <td>{{ c.displayName }}</td>
+                        <td class="link" @click="openDialog(c)">{{ c.students.length }}</td>
                     </tr>
                 </tbody>
             </v-table>
@@ -41,22 +93,47 @@
                 </thead>
                 <tbody>
                     <tr
-                        v-for="[id, members] in zipped"
-                        :key="id"
+                        v-for="c in classes"
+                        :key="c.id"
                     >
-                        <td>{{ id }}</td>
-                        <td>{{ members }}</td>
+                        <td>{{ c.displayName }}</td>
+                        <td>{{ c.students.length }}</td>
                     </tr>
                 </tbody>
             </v-table>
         </div>
+        <v-dialog
+            v-model="dialog"
+            width="400"
+        >
+            <v-card>
+                <v-card-title> {{ selectedClass?.displayName }} </v-card-title>
+                <v-card-text>
+                    <ul>
+                        <li
+                            v-for="student in students"
+                            :key="student"
+                        >
+                            {{ student }}
+                        </li>
+                    </ul>
+                </v-card-text>
+                <v-card-actions>
+                    <v-btn
+                        color="primary"
+                        @click="dialog = false"
+                        >Close</v-btn
+                    >
+                </v-card-actions>
+            </v-card>
+        </v-dialog>
         <div class="join">
             <h1>{{ t("joinClass") }}</h1>
             <p>{{ t("JoinClassExplanation") }}</p>
 
             <v-text-field
                 label="CODE"
-                placeholder=""
+                v-model="code"
                 variant="outlined"
                 max-width="300px"
             ></v-text-field>
@@ -122,4 +199,9 @@
         margin-left: 30px;
         margin-top: 50px;
     }
+
+    .link {
+        color: #0b75bb;
+        text-decoration: underline;
+    }
 </style>

From 729c3f69727cf0ff681b4dd0d6acbcd7900688c6 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 29 Mar 2025 09:55:36 +0100
Subject: [PATCH 007/177] feat: validatie voor de code die een student stuurt
 in de frontend

---
 frontend/src/views/classes/UserClasses.vue | 101 ++++++++++-----------
 1 file changed, 50 insertions(+), 51 deletions(-)

diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index c78f12e3..fd263aff 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -2,6 +2,8 @@
     import { useI18n } from "vue-i18n";
     import authState from "@/services/auth/auth-service.ts";
     import { ref, watch } from "vue";
+    import { validate, version } from "uuid";
+
     const { t } = useI18n();
 
     const role: String = authState.authState.activeRole!;
@@ -42,17 +44,25 @@
 
     const classes: Array<Class> = [class01, class02, class03];
 
-    const code = ref("");
-    console.log(code);
+    const valid = ref(false);
+    const code = ref<string>("");
+    const codeRules = [
+        (value: string | undefined) => {
+            if (value !== undefined && validate(value) && version(value) === 4) return true;
+            return "Invalid format.";
+        },
+    ];
     watch(code, (newValue) => {
-        console.log("Code changed:", newValue);
+        if (code.value !== undefined && validate(code.value) && version(code.value) == 4) {
+            console.log("Code changed:", newValue);
+        }
     });
 
     // handle dialog for showing members of a class
     const dialog = ref(false);
     const students = ref<Array<string>>([]);
     const selectedClass = ref<Class | null>(null);
-    
+
     const openDialog = (c: Class) => {
         selectedClass.value = c;
         if (selectedClass !== undefined) {
@@ -64,44 +74,29 @@
 <template>
     <main>
         <h class="title">{{ t("classes") }}</h>
-        <div v-if="role === 'student'">
-            <v-table class="table">
-                <thead>
-                    <tr>
-                        <th class="header">{{ t("classes") }}</th>
-                        <th class="header">{{ t("members") }}</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr
-                        v-for="c in classes"
-                        :key="c.id"
+
+        <v-table class="table">
+            <thead>
+                <tr>
+                    <th class="header">{{ t("classes") }}</th>
+                    <th class="header">{{ t("members") }}</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr
+                    v-for="c in classes"
+                    :key="c.id"
+                >
+                    <td>{{ c.displayName }}</td>
+                    <td
+                        class="link"
+                        @click="openDialog(c)"
                     >
-                        <td>{{ c.displayName }}</td>
-                        <td class="link" @click="openDialog(c)">{{ c.students.length }}</td>
-                    </tr>
-                </tbody>
-            </v-table>
-        </div>
-        <div v-else>
-            <v-table class="table">
-                <thead>
-                    <tr>
-                        <th class="header">{{ t("classes") }}</th>
-                        <th class="header">{{ t("members") }}</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr
-                        v-for="c in classes"
-                        :key="c.id"
-                    >
-                        <td>{{ c.displayName }}</td>
-                        <td>{{ c.students.length }}</td>
-                    </tr>
-                </tbody>
-            </v-table>
-        </div>
+                        {{ c.students.length }}
+                    </td>
+                </tr>
+            </tbody>
+        </v-table>
         <v-dialog
             v-model="dialog"
             width="400"
@@ -127,16 +122,20 @@
                 </v-card-actions>
             </v-card>
         </v-dialog>
-        <div class="join">
-            <h1>{{ t("joinClass") }}</h1>
-            <p>{{ t("JoinClassExplanation") }}</p>
-
-            <v-text-field
-                label="CODE"
-                v-model="code"
-                variant="outlined"
-                max-width="300px"
-            ></v-text-field>
+        <div v-if="role === 'student'">
+            <div class="join">
+                <h1>{{ t("joinClass") }}</h1>
+                <p>{{ t("JoinClassExplanation") }}</p>
+                <v-form v-model="valid">
+                    <v-text-field
+                        label="CODE"
+                        v-model="code"
+                        :rules="codeRules"
+                        variant="outlined"
+                        max-width="400px"
+                    ></v-text-field>
+                </v-form>
+            </div>
         </div>
     </main>
 </template>

From 87974bbfe5e1cb4a034c5bac0ed8d9a9afd98d54 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 29 Mar 2025 10:23:34 +0100
Subject: [PATCH 008/177] feat: submit knop om de code in te versturen

---
 frontend/src/views/classes/UserClasses.vue | 44 +++++++++++++++-------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index fd263aff..5dd6d920 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -1,13 +1,14 @@
 <script setup lang="ts">
     import { useI18n } from "vue-i18n";
     import authState from "@/services/auth/auth-service.ts";
-    import { ref, watch } from "vue";
+    import { ref } from "vue";
     import { validate, version } from "uuid";
 
     const { t } = useI18n();
 
     const role: String = authState.authState.activeRole!;
 
+    // TODO : temp data until frontend controllers are ready
     type Teacher = {
         username: string;
         firstName: string;
@@ -44,19 +45,24 @@
 
     const classes: Array<Class> = [class01, class02, class03];
 
-    const valid = ref(false);
+    // handle the class join requests
     const code = ref<string>("");
+
+    // the code needs to be formatted as v4 to be valid
+    // these rules are used to display a message to the user if they use a code that has an invalid format
     const codeRules = [
         (value: string | undefined) => {
             if (value !== undefined && validate(value) && version(value) === 4) return true;
             return "Invalid format.";
         },
     ];
-    watch(code, (newValue) => {
+    // submitting a code will send a request if the code is valid
+    const submitCode = () => {
         if (code.value !== undefined && validate(code.value) && version(code.value) == 4) {
-            console.log("Code changed:", newValue);
+            // TODO: temp function until frontend controllers are ready
+            console.log("Code submitted:", code.value);
         }
-    });
+    }
 
     // handle dialog for showing members of a class
     const dialog = ref(false);
@@ -126,15 +132,25 @@
             <div class="join">
                 <h1>{{ t("joinClass") }}</h1>
                 <p>{{ t("JoinClassExplanation") }}</p>
-                <v-form v-model="valid">
-                    <v-text-field
-                        label="CODE"
-                        v-model="code"
-                        :rules="codeRules"
-                        variant="outlined"
-                        max-width="400px"
-                    ></v-text-field>
-                </v-form>
+                <v-sheet width="400">
+                    <v-form @submit.prevent>
+                        <v-text-field
+                            label="CODE"
+                            v-model="code"
+                            placeholder="XXXXXXXX-XXXX-4XXX-XXXX-XXXXXXXXXXXX"
+                            :rules="codeRules"
+                            variant="outlined"
+                        ></v-text-field>
+                        <v-btn
+                            class="mt-4"
+                            style="background-color: #f6faf2"
+                            type="submit"
+                            @click="submitCode"
+                            block
+                            >Submit</v-btn
+                        >
+                    </v-form>
+                </v-sheet>
             </div>
         </div>
     </main>

From 06ac549c372bfbb9c2050dc93c027bde35f169fe Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 29 Mar 2025 11:35:39 +0100
Subject: [PATCH 009/177] style: format en lint warnings opgekuist (deze die er
 nog staan gaan over tijdelijke code)

---
 frontend/src/views/classes/UserClasses.vue | 29 +++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index 5dd6d920..ce9f9662 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -6,7 +6,7 @@
 
     const { t } = useI18n();
 
-    const role: String = authState.authState.activeRole!;
+    const role: string = authState.authState.activeRole!;
 
     // TODO : temp data until frontend controllers are ready
     type Teacher = {
@@ -30,10 +30,9 @@
         students: Array<Student>;
     };
 
-    const classIds: Array<string> = ["class01", "class02", "class03"];
-    let student01: Student = { username: "id01", firstName: "Mark", lastName: "Knopfler", classes: [] };
-    let student02: Student = { username: "id01", firstName: "John", lastName: "Hiat", classes: [] };
-    let student03: Student = { username: "id01", firstName: "Aaron", lastName: "Lewis", classes: [] };
+    const student01: Student = { username: "id01", firstName: "Mark", lastName: "Knopfler", classes: [] };
+    const student02: Student = { username: "id01", firstName: "John", lastName: "Hiat", classes: [] };
+    const student03: Student = { username: "id01", firstName: "Aaron", lastName: "Lewis", classes: [] };
 
     const class01: Class = { id: "class01", displayName: "class 01", teachers: [], students: [student01, student02] };
     const class02: Class = { id: "class02", displayName: "class 02", teachers: [], students: [student01, student03] };
@@ -45,37 +44,37 @@
 
     const classes: Array<Class> = [class01, class02, class03];
 
-    // handle the class join requests
+    // Handle the class join requests
     const code = ref<string>("");
 
-    // the code needs to be formatted as v4 to be valid
-    // these rules are used to display a message to the user if they use a code that has an invalid format
+    // The code needs to be formatted as v4 to be valid
+    // These rules are used to display a message to the user if they use a code that has an invalid format
     const codeRules = [
         (value: string | undefined) => {
             if (value !== undefined && validate(value) && version(value) === 4) return true;
             return "Invalid format.";
         },
     ];
-    // submitting a code will send a request if the code is valid
-    const submitCode = () => {
-        if (code.value !== undefined && validate(code.value) && version(code.value) == 4) {
+    // Submitting a code will send a request if the code is valid
+    function submitCode() {
+        if (code.value !== undefined && validate(code.value) && version(code.value) === 4) {
             // TODO: temp function until frontend controllers are ready
             console.log("Code submitted:", code.value);
         }
     }
 
-    // handle dialog for showing members of a class
+    // Handle dialog for showing members of a class
     const dialog = ref(false);
     const students = ref<Array<string>>([]);
     const selectedClass = ref<Class | null>(null);
 
-    const openDialog = (c: Class) => {
+    function openDialog(c: Class) {
         selectedClass.value = c;
-        if (selectedClass !== undefined) {
+        if (selectedClass.value !== undefined) {
             students.value = selectedClass.value.students.map((student) => `${student.firstName} ${student.lastName}`);
             dialog.value = true;
         }
-    };
+    }
 </script>
 <template>
     <main>

From e1f4d854c28e34e919b04c0f63ca6e0870883491 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 29 Mar 2025 12:01:07 +0100
Subject: [PATCH 010/177] feat: vertalingen

---
 frontend/src/i18n/locale/de.json           | 3 +++
 frontend/src/i18n/locale/en.json           | 4 +++-
 frontend/src/i18n/locale/fr.json           | 3 +++
 frontend/src/i18n/locale/nl.json           | 3 +++
 frontend/src/views/classes/UserClasses.vue | 4 ++--
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/frontend/src/i18n/locale/de.json b/frontend/src/i18n/locale/de.json
index 5864da43..7a20e3ce 100644
--- a/frontend/src/i18n/locale/de.json
+++ b/frontend/src/i18n/locale/de.json
@@ -19,6 +19,9 @@
     "translate": "übersetzen",
     "joinClass": "Klasse beitreten",
     "JoinClassExplanation": "Geben Sie den Code ein, den Ihnen die Lehrkraft mitgeteilt hat, um der Klasse beizutreten.",
+    "invalidFormat": "Ungültiges Format",
+    "submitCode" : "senden",
+    "members" : "mitglieder",
     "themes": "Themen",
     "choose-theme": "Wähle ein thema",
     "choose-age": "Alter auswählen",
diff --git a/frontend/src/i18n/locale/en.json b/frontend/src/i18n/locale/en.json
index 0d8eacf0..92c8275a 100644
--- a/frontend/src/i18n/locale/en.json
+++ b/frontend/src/i18n/locale/en.json
@@ -19,7 +19,9 @@
     "translate": "translate",
     "joinClass": "Join class",
     "JoinClassExplanation": "Enter the code the teacher has given you to join the class.",
-    "enterCode": "Enter the code.",
+    "invalidFormat": "Invalid format.",
+    "submitCode" : "submit",
+    "members" : "members",
     "themes": "Themes",
     "choose-theme": "Select a theme",
     "choose-age": "Select age",
diff --git a/frontend/src/i18n/locale/fr.json b/frontend/src/i18n/locale/fr.json
index d49c20d0..47a0f548 100644
--- a/frontend/src/i18n/locale/fr.json
+++ b/frontend/src/i18n/locale/fr.json
@@ -19,6 +19,9 @@
     "translate": "traduire",
     "joinClass": "Rejoindre une classe",
     "JoinClassExplanation": "Entrez le code que l'enseignant vous a donné pour rejoindre la classe.",
+    "invalidFormat": "Format non valide.",
+    "submitCode" : "envoyer",
+    "members" : "membres",
     "themes": "Thèmes",
     "choose-theme": "Choisis un thème",
     "choose-age": "Choisis un âge",
diff --git a/frontend/src/i18n/locale/nl.json b/frontend/src/i18n/locale/nl.json
index a4046a37..f5e3d771 100644
--- a/frontend/src/i18n/locale/nl.json
+++ b/frontend/src/i18n/locale/nl.json
@@ -19,6 +19,9 @@
     "translate": "vertalen",
     "joinClass": "Word lid van een klas",
     "JoinClassExplanation": "Voer de code in die je van de docent hebt gekregen om lid te worden van de klas.",
+    "invalidFormat": "Ongeldig formaat.",
+    "submitCode" : "verzenden",
+    "members" : "leden",
     "themes": "Lesthema's",
     "choose-theme": "Kies een thema",
     "choose-age": "Kies een leeftijd",
diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index ce9f9662..c96d0479 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -52,7 +52,7 @@
     const codeRules = [
         (value: string | undefined) => {
             if (value !== undefined && validate(value) && version(value) === 4) return true;
-            return "Invalid format.";
+            return t("invalidFormat");
         },
     ];
     // Submitting a code will send a request if the code is valid
@@ -146,7 +146,7 @@
                             type="submit"
                             @click="submitCode"
                             block
-                            >Submit</v-btn
+                            >{{ t("submitCode") }}</v-btn
                         >
                     </v-form>
                 </v-sheet>

From af556feb30aa5fdee6cdab671078c6a582d6618d Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 29 Mar 2025 13:12:26 +0100
Subject: [PATCH 011/177] feat: responsive css

---
 frontend/src/views/classes/UserClasses.vue | 48 ++++++++++++++++++----
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index c96d0479..406a5819 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -78,7 +78,7 @@
 </script>
 <template>
     <main>
-        <h class="title">{{ t("classes") }}</h>
+        <h1 class="title">{{ t("classes") }}</h1>
 
         <v-table class="table">
             <thead>
@@ -129,9 +129,13 @@
         </v-dialog>
         <div v-if="role === 'student'">
             <div class="join">
-                <h1>{{ t("joinClass") }}</h1>
+                <h2>{{ t("joinClass") }}</h2>
                 <p>{{ t("JoinClassExplanation") }}</p>
-                <v-sheet width="400">
+
+                <v-sheet
+                    class="pa-4 sheet"
+                    max-width="400"
+                >
                     <v-form @submit.prevent>
                         <v-text-field
                             label="CODE"
@@ -187,21 +191,19 @@
 
     .table {
         width: 60%;
-        margin: 0 auto;
-        padding-top: 3%;
+        padding-top: 10px;
         border-collapse: collapse;
     }
 
-    .title {
+    h1 {
         color: #0e6942;
         text-transform: uppercase;
         font-weight: bolder;
-        padding-left: 30px;
         padding-top: 2%;
         font-size: 50px;
     }
 
-    h1 {
+    h2 {
         color: #0e6942;
         font-size: 30px;
     }
@@ -210,7 +212,6 @@
         display: flex;
         flex-direction: column;
         gap: 20px;
-        margin-left: 30px;
         margin-top: 50px;
     }
 
@@ -218,4 +219,33 @@
         color: #0b75bb;
         text-decoration: underline;
     }
+
+    main {
+        margin-left: 30px;
+    }
+
+    @media screen and (max-width: 800px) {
+        h1 {
+            text-align: center;
+            padding-left: 0;
+        }
+
+        .join {
+            text-align: center;
+            align-items: center;
+            margin-left: 0;
+        }
+
+        .sheet {
+            width: 100%;
+        }
+
+        main {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            margin: 5px;
+        }
+    }
 </style>

From 62711f323dc8a3ffbc0e21e83392f7fc1b83cc2a Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 30 Mar 2025 19:24:52 +0200
Subject: [PATCH 012/177] feat: assignment/questions endpoint toegevoegd

---
 backend/src/controllers/classes.ts            |  4 +-
 backend/src/controllers/groups.ts             |  1 +
 .../src/data/questions/question-repository.ts |  9 +++
 backend/src/routes/groups.ts                  |  9 +--
 backend/src/services/assignments.ts           | 59 +++++++++++++------
 backend/src/services/classes.ts               | 29 ++++-----
 backend/src/services/groups.ts                | 51 +++++-----------
 7 files changed, 82 insertions(+), 80 deletions(-)

diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts
index 7526f7c4..ba11da8e 100644
--- a/backend/src/controllers/classes.ts
+++ b/backend/src/controllers/classes.ts
@@ -1,5 +1,5 @@
 import { Request, Response } from 'express';
-import { createClass, getAllClasses, getClass, getClassStudents, getClassStudentsIds, getClassTeacherInvitations } from '../services/classes.js';
+import { createClass, getAllClasses, getClass, getClassStudents, getClassTeacherInvitations } from '../services/classes.js';
 import { ClassDTO } from '../interfaces/class.js';
 
 export async function getAllClassesHandler(req: Request, res: Response): Promise<void> {
@@ -47,7 +47,7 @@ export async function getClassStudentsHandler(req: Request, res: Response): Prom
     const classId = req.params.id;
     const full = req.query.full === 'true';
 
-    const students = full ? await getClassStudents(classId) : await getClassStudentsIds(classId);
+    const students = getClassStudents(classId, full);
 
     res.json({
         students: students,
diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts
index 38d5d5d0..58624186 100644
--- a/backend/src/controllers/groups.ts
+++ b/backend/src/controllers/groups.ts
@@ -12,6 +12,7 @@ interface GroupParams {
 export async function getGroupHandler(req: Request<GroupParams>, res: Response): Promise<void> {
     const classId = req.params.classid;
     const full = req.query.full === 'true';
+
     const assignmentId = +req.params.assignmentid;
 
     if (isNaN(assignmentId)) {
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 9207e1dd..3fc92df1 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -3,6 +3,7 @@ import { Question } from '../../entities/questions/question.entity.js';
 import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js';
 import { Student } from '../../entities/users/student.entity.js';
 import { LearningObject } from '../../entities/content/learning-object.entity.js';
+import { Assignment } from '../../entities/assignments/assignment.entity.js';
 
 export class QuestionRepository extends DwengoEntityRepository<Question> {
     public createQuestion(question: { loId: LearningObjectIdentifier; author: Student; content: string }): Promise<Question> {
@@ -54,4 +55,12 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
             orderBy: { timestamp: 'ASC' },
         });
     }
+
+    public findAllByAssignment(assignment: Assignment): Promise<Question[]> {
+        return this.find({
+            author: assignment.groups.flatMap(group => group.members),
+            learningObjectHruid: assignment.learningPathHruid,
+            learningObjectLanguage: assignment.learningPathLanguage,
+        });
+    }
 }
diff --git a/backend/src/routes/groups.ts b/backend/src/routes/groups.ts
index 0c9692b0..81532a90 100644
--- a/backend/src/routes/groups.ts
+++ b/backend/src/routes/groups.ts
@@ -11,13 +11,6 @@ router.post('/', createGroupHandler);
 // Information about a group (members, ... [TODO DOC])
 router.get('/:groupid', getGroupHandler);
 
-router.get('/:groupid', getGroupSubmissionsHandler);
-
-// The list of questions a group has made
-router.get('/:id/questions', (req, res) => {
-    res.json({
-        questions: ['0'],
-    });
-});
+router.get('/:groupid/submissions', getGroupSubmissionsHandler);
 
 export default router;
diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts
index a21a96fa..05e8099a 100644
--- a/backend/src/services/assignments.ts
+++ b/backend/src/services/assignments.ts
@@ -1,7 +1,23 @@
-import { getAssignmentRepository, getClassRepository, getGroupRepository, getSubmissionRepository } from '../data/repositories.js';
+import { getAssignmentRepository, getClassRepository, getGroupRepository, getQuestionRepository, getSubmissionRepository } from '../data/repositories.js';
+import { Assignment } from '../entities/assignments/assignment.entity.js';
 import { AssignmentDTO, mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId } from '../interfaces/assignment.js';
+import { mapToQuestionDTO, mapToQuestionId, QuestionDTO, QuestionId } from '../interfaces/question.js';
 import { mapToSubmissionDTO, mapToSubmissionDTOId, SubmissionDTO, SubmissionDTOId } from '../interfaces/submission.js';
 
+export async function fetchAssignment(classid: string, assignmentNumber: number): Promise<Assignment | null> {
+    const classRepository = getClassRepository();
+    const cls = await classRepository.findById(classid);
+
+    if (!cls) {
+        return null;
+    }
+
+    const assignmentRepository = getAssignmentRepository();
+    const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber);
+
+    return assignment;
+}
+
 export async function getAllAssignments(classid: string, full: boolean): Promise<AssignmentDTO[]> {
     const classRepository = getClassRepository();
     const cls = await classRepository.findById(classid);
@@ -43,15 +59,7 @@ export async function createAssignment(classid: string, assignmentData: Assignme
 }
 
 export async function getAssignment(classid: string, id: number): Promise<AssignmentDTO | null> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classid);
-
-    if (!cls) {
-        return null;
-    }
-
-    const assignmentRepository = getAssignmentRepository();
-    const assignment = await assignmentRepository.findByClassAndId(cls, id);
+    const assignment = await fetchAssignment(classid, id);
 
     if (!assignment) {
         return null;
@@ -65,15 +73,7 @@ export async function getAssignmentsSubmissions(
     assignmentNumber: number,
     full: boolean
 ): Promise<SubmissionDTO[] | SubmissionDTOId[]> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classid);
-
-    if (!cls) {
-        return [];
-    }
-
-    const assignmentRepository = getAssignmentRepository();
-    const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber);
+    const assignment = await fetchAssignment(classid, assignmentNumber);
 
     if (!assignment) {
         return [];
@@ -91,3 +91,24 @@ export async function getAssignmentsSubmissions(
 
     return submissions.map(mapToSubmissionDTOId);
 }
+
+export async function getAssignmentsQuestions(
+    classid: string,
+    assignmentNumber: number,
+    full: boolean
+): Promise<QuestionDTO[] | QuestionId[]> {
+    const assignment = await fetchAssignment(classid, assignmentNumber);
+
+    if (!assignment) {
+        return [];
+    }
+
+    const questionRepository = getQuestionRepository();
+    const questions = await questionRepository.findAllByAssignment(assignment);
+
+    if (full) {
+        return questions.map(mapToQuestionDTO);
+    }
+
+    return questions.map(mapToQuestionDTO).map(mapToQuestionId); // mapToQuestionId should be updated
+}
\ No newline at end of file
diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index 5b1e3cfc..dbf6c63d 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -1,4 +1,5 @@
 import { getClassRepository, getStudentRepository, getTeacherInvitationRepository, getTeacherRepository } from '../data/repositories.js';
+import { Class } from '../entities/classes/class.entity.js';
 import { ClassDTO, mapToClassDTO } from '../interfaces/class.js';
 import { mapToStudentDTO, StudentDTO } from '../interfaces/student.js';
 import { mapToTeacherInvitationDTO, mapToTeacherInvitationDTOIds, TeacherInvitationDTO } from '../interfaces/teacher-invitation.js';
@@ -6,6 +7,13 @@ import { getLogger } from '../logging/initalize.js';
 
 const logger = getLogger();
 
+async function fetchClass(classid: string): Promise<Class | null> {
+    const classRepository = getClassRepository();
+    const cls = await classRepository.findById(classid);
+
+    return cls;
+}
+
 export async function getAllClasses(full: boolean): Promise<ClassDTO[] | string[]> {
     const classRepository = getClassRepository();
     const classes = await classRepository.find({}, { populate: ['students', 'teachers'] });
@@ -47,8 +55,7 @@ export async function createClass(classData: ClassDTO): Promise<ClassDTO | null>
 }
 
 export async function getClass(classId: string): Promise<ClassDTO | null> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classId);
+    const cls = await fetchClass(classId);
 
     if (!cls) {
         return null;
@@ -57,24 +64,18 @@ export async function getClass(classId: string): Promise<ClassDTO | null> {
     return mapToClassDTO(cls);
 }
 
-async function fetchClassStudents(classId: string): Promise<StudentDTO[]> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classId);
+export async function getClassStudents(classId: string, full: boolean): Promise<StudentDTO[] | string[]> {
+    const cls = await fetchClass(classId);
 
     if (!cls) {
         return [];
     }
 
-    return cls.students.map(mapToStudentDTO);
-}
+    if (full) {
+        return cls.students.map(mapToStudentDTO);
+    }
 
-export async function getClassStudents(classId: string): Promise<StudentDTO[]> {
-    return await fetchClassStudents(classId);
-}
-
-export async function getClassStudentsIds(classId: string): Promise<string[]> {
-    const students: StudentDTO[] = await fetchClassStudents(classId);
-    return students.map((student) => student.username);
+    return cls.students.map((student) => student.username);
 }
 
 export async function getClassTeacherInvitations(classId: string, full: boolean): Promise<TeacherInvitationDTO[]> {
diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts
index 4a1cbbf0..7c5afb82 100644
--- a/backend/src/services/groups.ts
+++ b/backend/src/services/groups.ts
@@ -1,24 +1,20 @@
+import { assign } from '@mikro-orm/core';
 import {
     getAssignmentRepository,
     getClassRepository,
     getGroupRepository,
+    getQuestionRepository,
     getStudentRepository,
     getSubmissionRepository,
 } from '../data/repositories.js';
 import { Group } from '../entities/assignments/group.entity.js';
 import { GroupDTO, mapToGroupDTO, mapToGroupDTOId } from '../interfaces/group.js';
 import { mapToSubmissionDTO, mapToSubmissionDTOId, SubmissionDTO, SubmissionDTOId } from '../interfaces/submission.js';
+import { fetchAssignment } from './assignments.js';
+import { mapToQuestionDTO, mapToQuestionId, QuestionDTO, QuestionId } from '../interfaces/question.js';
 
-export async function getGroup(classId: string, assignmentNumber: number, groupNumber: number, full: boolean): Promise<GroupDTO | null> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classId);
-
-    if (!cls) {
-        return null;
-    }
-
-    const assignmentRepository = getAssignmentRepository();
-    const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber);
+async function fetchGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise<Group | null> {
+    const assignment = await fetchAssignment(classId, assignmentNumber);
 
     if (!assignment) {
         return null;
@@ -27,6 +23,12 @@ export async function getGroup(classId: string, assignmentNumber: number, groupN
     const groupRepository = getGroupRepository();
     const group = await groupRepository.findByAssignmentAndGroupNumber(assignment, groupNumber);
 
+    return group; 
+}
+
+export async function getGroup(classId: string, assignmentNumber: number, groupNumber: number, full: boolean): Promise<GroupDTO | null> {
+    const group = await fetchGroup(classId, assignmentNumber, groupNumber);
+
     if (!group) {
         return null;
     }
@@ -76,15 +78,7 @@ export async function createGroup(groupData: GroupDTO, classid: string, assignme
 }
 
 export async function getAllGroups(classId: string, assignmentNumber: number, full: boolean): Promise<GroupDTO[]> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classId);
-
-    if (!cls) {
-        return [];
-    }
-
-    const assignmentRepository = getAssignmentRepository();
-    const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber);
+    const assignment = await fetchAssignment(classId, assignmentNumber);
 
     if (!assignment) {
         return [];
@@ -94,8 +88,6 @@ export async function getAllGroups(classId: string, assignmentNumber: number, fu
     const groups = await groupRepository.findAllGroupsForAssignment(assignment);
 
     if (full) {
-        console.log('full');
-        console.log(groups);
         return groups.map(mapToGroupDTO);
     }
 
@@ -108,22 +100,7 @@ export async function getGroupSubmissions(
     groupNumber: number,
     full: boolean
 ): Promise<SubmissionDTO[] | SubmissionDTOId[]> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classId);
-
-    if (!cls) {
-        return [];
-    }
-
-    const assignmentRepository = getAssignmentRepository();
-    const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber);
-
-    if (!assignment) {
-        return [];
-    }
-
-    const groupRepository = getGroupRepository();
-    const group = await groupRepository.findByAssignmentAndGroupNumber(assignment, groupNumber);
+    const group = await fetchGroup(classId, assignmentNumber, groupNumber);
 
     if (!group) {
         return [];

From 7ae2f1de0c187a6388f0c55fc1d1710f28b0391c Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Mon, 31 Mar 2025 12:39:22 +0200
Subject: [PATCH 013/177] feat: DELETE voor class geimplenteerd

---
 backend/src/services/classes.ts  | 35 +++++++++++++++-----------------
 backend/src/services/teachers.ts | 20 +++++++-----------
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index dbf6c63d..f2cb79e8 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -1,5 +1,6 @@
 import { getClassRepository, getStudentRepository, getTeacherInvitationRepository, getTeacherRepository } from '../data/repositories.js';
 import { Class } from '../entities/classes/class.entity.js';
+import { NotFoundException } from '../exceptions/not-found-exception.js';
 import { ClassDTO, mapToClassDTO } from '../interfaces/class.js';
 import { mapToStudentDTO, StudentDTO } from '../interfaces/student.js';
 import { mapToTeacherInvitationDTO, mapToTeacherInvitationDTOIds, TeacherInvitationDTO } from '../interfaces/teacher-invitation.js';
@@ -7,10 +8,14 @@ import { getLogger } from '../logging/initalize.js';
 
 const logger = getLogger();
 
-async function fetchClass(classid: string): Promise<Class | null> {
+async function fetchClass(classid: string): Promise<Class> {
     const classRepository = getClassRepository();
     const cls = await classRepository.findById(classid);
 
+    if (!cls) {
+        throw new NotFoundException("Class not found");
+    }
+
     return cls;
 }
 
@@ -18,16 +23,18 @@ export async function getAllClasses(full: boolean): Promise<ClassDTO[] | string[
     const classRepository = getClassRepository();
     const classes = await classRepository.find({}, { populate: ['students', 'teachers'] });
 
-    if (!classes) {
-        return [];
-    }
-
     if (full) {
         return classes.map(mapToClassDTO);
     }
     return classes.map((cls) => cls.classId!);
 }
 
+export async function getClass(classId: string): Promise<ClassDTO | null> {
+    const cls = await fetchClass(classId);
+
+    return mapToClassDTO(cls);
+}
+
 export async function createClass(classData: ClassDTO): Promise<ClassDTO | null> {
     const teacherRepository = getTeacherRepository();
     const teacherUsernames = classData.teachers || [];
@@ -54,12 +61,11 @@ export async function createClass(classData: ClassDTO): Promise<ClassDTO | null>
     }
 }
 
-export async function getClass(classId: string): Promise<ClassDTO | null> {
+export async function deleteClass(classId: string): Promise<ClassDTO> {
     const cls = await fetchClass(classId);
 
-    if (!cls) {
-        return null;
-    }
+    const classRepository = getClassRepository();
+    await classRepository.deleteById(classId);
 
     return mapToClassDTO(cls);
 }
@@ -67,10 +73,6 @@ export async function getClass(classId: string): Promise<ClassDTO | null> {
 export async function getClassStudents(classId: string, full: boolean): Promise<StudentDTO[] | string[]> {
     const cls = await fetchClass(classId);
 
-    if (!cls) {
-        return [];
-    }
-
     if (full) {
         return cls.students.map(mapToStudentDTO);
     }
@@ -79,12 +81,7 @@ export async function getClassStudents(classId: string, full: boolean): Promise<
 }
 
 export async function getClassTeacherInvitations(classId: string, full: boolean): Promise<TeacherInvitationDTO[]> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classId);
-
-    if (!cls) {
-        return [];
-    }
+    const cls = await fetchClass(classId);
 
     const teacherInvitationRepository = getTeacherInvitationRepository();
     const invitations = await teacherInvitationRepository.findAllInvitationsForClass(cls);
diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts
index fced2b61..cf2743e9 100644
--- a/backend/src/services/teachers.ts
+++ b/backend/src/services/teachers.ts
@@ -76,28 +76,22 @@ export async function getClassesByTeacher(username: string, full: boolean): Prom
     return classes.map((cls) => cls.id);
 }
 
-export async function fetchStudentsByTeacher(username: string): Promise<StudentDTO[] | null> {
+export async function getStudentsByTeacher(username: string, full: boolean): Promise<StudentDTO[] | string[] | null> {
     const classes = (await getClassesByTeacher(username, false)) as string[];
 
     if (!classes) {
         return null;
     }
 
-    return (await Promise.all(classes.map(async (id) => getClassStudents(id)))).flat();
-}
-
-export async function getStudentsByTeacher(username: string, full: boolean): Promise<StudentDTO[] | string[] | null> {
-    const students = await fetchStudentsByTeacher(username);
-
-    if (!students) {
-        return null;
-    }
-
+    // workaround
+    let students;
     if (full) {
-        return students;
+        students = (await Promise.all(classes.map(async (id) => await getClassStudents(id, full) as StudentDTO[]))).flat();
+    } else {
+        students = (await Promise.all(classes.map(async (id) => await getClassStudents(id, full) as string[]))).flat();
     }
 
-    return students.map((student) => student.username);
+    return students;
 }
 
 export async function fetchTeacherQuestions(username: string): Promise<QuestionDTO[] | null> {

From 6290d3dd9b3f469d598b24dd2b7e4771031d0fcf Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Tue, 1 Apr 2025 17:02:42 +0200
Subject: [PATCH 014/177] feat: get all submissions route toegevoegd

---
 backend/src/controllers/submissions.ts        | 57 +++++++++++--------
 .../data/assignments/submission-repository.ts |  8 +++
 backend/src/routes/submissions.ts             |  8 +--
 backend/src/services/submissions.ts           | 27 +++++----
 4 files changed, 59 insertions(+), 41 deletions(-)

diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts
index 512ac22e..5fa154b1 100644
--- a/backend/src/controllers/submissions.ts
+++ b/backend/src/controllers/submissions.ts
@@ -1,33 +1,41 @@
 import { Request, Response } from 'express';
-import { createSubmission, deleteSubmission, getSubmission } from '../services/submissions.js';
+import { createSubmission, deleteSubmission, getAllSubmissions, getSubmission } from '../services/submissions.js';
 import { Language, languageMap } from '../entities/content/language.js';
 import { SubmissionDTO } from '../interfaces/submission';
+import { BadRequestException } from '../exceptions/bad-request-exception.js';
+import { NotFoundException } from '../exceptions/not-found-exception.js';
+import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 
-interface SubmissionParams {
-    hruid: string;
-    id: number;
-}
 
-export async function getSubmissionHandler(req: Request<SubmissionParams>, res: Response): Promise<void> {
-    const lohruid = req.params.hruid;
+
+export async function getSubmissionHandler(req: Request, res: Response): Promise<void> {
     const submissionNumber = +req.params.id;
-
+    
     if (isNaN(submissionNumber)) {
-        res.status(400).json({ error: 'Submission number is not a number' });
-        return;
+        throw new BadRequestException('Submission number must be a number');
     }
-
+    
+    const lohruid = req.params.hruid;
     const lang = languageMap[req.query.language as string] || Language.Dutch;
     const version = (req.query.version || 1) as number;
 
-    const submission = await getSubmission(lohruid, lang, version, submissionNumber);
+    const loId = new LearningObjectIdentifier(lohruid, lang, version);
 
-    if (!submission) {
-        res.status(404).json({ error: 'Submission not found' });
-        return;
-    }
+    const submission = await getSubmission(loId, submissionNumber);
 
-    res.json(submission);
+    res.json({ submission });
+}
+
+export async function getAllSubmissionsHandler(req: Request, res: Response): Promise<void> {
+    const lohruid = req.params.hruid;
+    const lang = languageMap[req.query.language as string] || Language.Dutch;
+    const version = (req.query.version || 1) as number;
+
+    const loId = new LearningObjectIdentifier(lohruid, lang, version);
+
+    const submissions = await getAllSubmissions(loId);
+
+    res.json({ submissions });
 }
 
 export async function createSubmissionHandler(req: Request, res: Response) {
@@ -40,22 +48,23 @@ export async function createSubmissionHandler(req: Request, res: Response) {
         return;
     }
 
-    res.json(submission);
+    res.json({ submission });
 }
 
 export async function deleteSubmissionHandler(req: Request, res: Response) {
-    const hruid = req.params.hruid;
     const submissionNumber = +req.params.id;
-
+    
+    const hruid = req.params.hruid;
     const lang = languageMap[req.query.language as string] || Language.Dutch;
     const version = (req.query.version || 1) as number;
 
-    const submission = await deleteSubmission(hruid, lang, version, submissionNumber);
+    const loId = new LearningObjectIdentifier(hruid, lang, version);
+
+    const submission = await deleteSubmission(loId, submissionNumber);
 
     if (!submission) {
-        res.status(404).json({ error: 'Submission not found' });
-        return;
+        throw new NotFoundException('Could not delete submission');
     }
 
-    res.json(submission);
+    res.json({ submission });
 }
diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts
index 251823fa..25a66956 100644
--- a/backend/src/data/assignments/submission-repository.ts
+++ b/backend/src/data/assignments/submission-repository.ts
@@ -14,6 +14,14 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
         });
     }
 
+    public findByLearningObject(loId: LearningObjectIdentifier): Promise<Submission[]> {
+        return this.find({
+            learningObjectHruid: loId.hruid,
+            learningObjectLanguage: loId.language,
+            learningObjectVersion: loId.version,
+        });
+    }
+
     public findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise<Submission | null> {
         return this.findOne(
             {
diff --git a/backend/src/routes/submissions.ts b/backend/src/routes/submissions.ts
index 4db93027..7c91de52 100644
--- a/backend/src/routes/submissions.ts
+++ b/backend/src/routes/submissions.ts
@@ -1,13 +1,9 @@
 import express from 'express';
-import { createSubmissionHandler, deleteSubmissionHandler, getSubmissionHandler } from '../controllers/submissions.js';
+import { createSubmissionHandler, deleteSubmissionHandler, getAllSubmissionsHandler, getSubmissionHandler } from '../controllers/submissions.js';
 const router = express.Router({ mergeParams: true });
 
 // Root endpoint used to search objects
-router.get('/', (req, res) => {
-    res.json({
-        submissions: ['0', '1'],
-    });
-});
+router.get('/', getAllSubmissionsHandler);
 
 router.post('/:id', createSubmissionHandler);
 
diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts
index 0e1ad9ac..f9f42349 100644
--- a/backend/src/services/submissions.ts
+++ b/backend/src/services/submissions.ts
@@ -1,26 +1,32 @@
 import { getGroupRepository, getSubmissionRepository } from '../data/repositories.js';
 import { Language } from '../entities/content/language.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
+import { NotFoundException } from '../exceptions/not-found-exception.js';
 import { mapToSubmission, mapToSubmissionDTO, SubmissionDTO } from '../interfaces/submission.js';
 
 export async function getSubmission(
-    learningObjectHruid: string,
-    language: Language,
-    version: number,
+    loId: LearningObjectIdentifier,
     submissionNumber: number
-): Promise<SubmissionDTO | null> {
-    const loId = new LearningObjectIdentifier(learningObjectHruid, language, version);
-
+): Promise<SubmissionDTO> {
     const submissionRepository = getSubmissionRepository();
     const submission = await submissionRepository.findSubmissionByLearningObjectAndSubmissionNumber(loId, submissionNumber);
 
     if (!submission) {
-        return null;
+        throw new NotFoundException('Could not find submission');
     }
 
     return mapToSubmissionDTO(submission);
 }
 
+export async function getAllSubmissions(
+    loId: LearningObjectIdentifier,
+): Promise<SubmissionDTO[]> {
+    const submissionRepository = getSubmissionRepository();
+    const submissions = await submissionRepository.findByLearningObject(loId);
+
+    return submissions.map(mapToSubmissionDTO);
+}
+
 export async function createSubmission(submissionDTO: SubmissionDTO) {
     const submissionRepository = getSubmissionRepository();
     const submission = mapToSubmission(submissionDTO);
@@ -35,16 +41,15 @@ export async function createSubmission(submissionDTO: SubmissionDTO) {
     return mapToSubmissionDTO(submission);
 }
 
-export async function deleteSubmission(learningObjectHruid: string, language: Language, version: number, submissionNumber: number) {
+export async function deleteSubmission(loId: LearningObjectIdentifier, submissionNumber: number) {
     const submissionRepository = getSubmissionRepository();
 
-    const submission = getSubmission(learningObjectHruid, language, version, submissionNumber);
+    const submission = getSubmission(loId, submissionNumber);
 
     if (!submission) {
-        return null;
+        throw new NotFoundException('Could not delete submission because it does not exist');
     }
 
-    const loId = new LearningObjectIdentifier(learningObjectHruid, language, version);
     await submissionRepository.deleteSubmissionByLearningObjectAndSubmissionNumber(loId, submissionNumber);
 
     return submission;

From da5cb7d02d26142b563a88e820ed431cec9881db Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Tue, 1 Apr 2025 17:06:26 +0200
Subject: [PATCH 015/177] feat: delete op class geimplementeerd

---
 backend/src/controllers/classes.ts | 14 +++++++++++---
 backend/src/routes/classes.ts      |  3 ++-
 backend/src/services/classes.ts    |  4 ++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts
index ba11da8e..acf19476 100644
--- a/backend/src/controllers/classes.ts
+++ b/backend/src/controllers/classes.ts
@@ -1,6 +1,7 @@
 import { Request, Response } from 'express';
-import { createClass, getAllClasses, getClass, getClassStudents, getClassTeacherInvitations } from '../services/classes.js';
+import { createClass, deleteClass, getAllClasses, getClass, getClassStudents, getClassTeacherInvitations } from '../services/classes.js';
 import { ClassDTO } from '../interfaces/class.js';
+import { NotFoundException } from '../exceptions/not-found-exception.js';
 
 export async function getAllClassesHandler(req: Request, res: Response): Promise<void> {
     const full = req.query.full === 'true';
@@ -28,7 +29,7 @@ export async function createClassHandler(req: Request, res: Response): Promise<v
         return;
     }
 
-    res.status(201).json(cls);
+    res.status(201).json({ cls });
 }
 
 export async function getClassHandler(req: Request, res: Response): Promise<void> {
@@ -40,7 +41,14 @@ export async function getClassHandler(req: Request, res: Response): Promise<void
         return;
     }
 
-    res.json(cls);
+    res.json({ cls });
+}
+
+export async function deleteClassHandler(req: Request, res: Response): Promise<void> {
+    const classId = req.params.id;
+    const cls = await deleteClass(classId);
+
+    res.json({ cls });
 }
 
 export async function getClassStudentsHandler(req: Request, res: Response): Promise<void> {
diff --git a/backend/src/routes/classes.ts b/backend/src/routes/classes.ts
index e0972988..dc434fb0 100644
--- a/backend/src/routes/classes.ts
+++ b/backend/src/routes/classes.ts
@@ -15,9 +15,10 @@ router.get('/', getAllClassesHandler);
 
 router.post('/', createClassHandler);
 
-// Information about an class with id 'id'
 router.get('/:id', getClassHandler);
 
+router.delete('/:id', deleteClassHandler);
+
 router.get('/:id/teacher-invitations', getTeacherInvitationsHandler);
 
 router.get('/:id/students', getClassStudentsHandler);
diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index f2cb79e8..dcf6a432 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -64,6 +64,10 @@ export async function createClass(classData: ClassDTO): Promise<ClassDTO | null>
 export async function deleteClass(classId: string): Promise<ClassDTO> {
     const cls = await fetchClass(classId);
 
+    if (!cls) {
+        throw new NotFoundException('Could not delete class because it does not exist');
+    }
+
     const classRepository = getClassRepository();
     await classRepository.deleteById(classId);
 

From c79a295e683d6e84037a02bb08b477b0f44ddf02 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Tue, 1 Apr 2025 22:57:30 +0200
Subject: [PATCH 016/177] feat: werken aan delete voor assignment

---
 backend/src/controllers/assignments.ts | 14 ++++----------
 backend/src/services/assignments.ts    | 17 +++++++++--------
 backend/src/services/classes.ts        |  2 +-
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts
index 16dbb310..b104c27c 100644
--- a/backend/src/controllers/assignments.ts
+++ b/backend/src/controllers/assignments.ts
@@ -2,13 +2,7 @@ import { Request, Response } from 'express';
 import { createAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions } from '../services/assignments.js';
 import { AssignmentDTO } from '../interfaces/assignment.js';
 
-// Typescript is annoy with with parameter forwarding from class.ts
-interface AssignmentParams {
-    classid: string;
-    id: string;
-}
-
-export async function getAllAssignmentsHandler(req: Request<AssignmentParams>, res: Response): Promise<void> {
+export async function getAllAssignmentsHandler(req: Request, res: Response): Promise<void> {
     const classid = req.params.classid;
     const full = req.query.full === 'true';
 
@@ -19,7 +13,7 @@ export async function getAllAssignmentsHandler(req: Request<AssignmentParams>, r
     });
 }
 
-export async function createAssignmentHandler(req: Request<AssignmentParams>, res: Response): Promise<void> {
+export async function createAssignmentHandler(req: Request, res: Response): Promise<void> {
     const classid = req.params.classid;
     const assignmentData = req.body as AssignmentDTO;
 
@@ -40,7 +34,7 @@ export async function createAssignmentHandler(req: Request<AssignmentParams>, re
     res.status(201).json(assignment);
 }
 
-export async function getAssignmentHandler(req: Request<AssignmentParams>, res: Response): Promise<void> {
+export async function getAssignmentHandler(req: Request, res: Response): Promise<void> {
     const id = +req.params.id;
     const classid = req.params.classid;
 
@@ -59,7 +53,7 @@ export async function getAssignmentHandler(req: Request<AssignmentParams>, res:
     res.json(assignment);
 }
 
-export async function getAssignmentsSubmissionsHandler(req: Request<AssignmentParams>, res: Response): Promise<void> {
+export async function getAssignmentsSubmissionsHandler(req: Request, res: Response): Promise<void> {
     const classid = req.params.classid;
     const assignmentNumber = +req.params.id;
     const full = req.query.full === 'true';
diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts
index 05e8099a..f468b879 100644
--- a/backend/src/services/assignments.ts
+++ b/backend/src/services/assignments.ts
@@ -1,30 +1,31 @@
 import { getAssignmentRepository, getClassRepository, getGroupRepository, getQuestionRepository, getSubmissionRepository } from '../data/repositories.js';
 import { Assignment } from '../entities/assignments/assignment.entity.js';
+import { NotFoundException } from '../exceptions/not-found-exception.js';
 import { AssignmentDTO, mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId } from '../interfaces/assignment.js';
 import { mapToQuestionDTO, mapToQuestionId, QuestionDTO, QuestionId } from '../interfaces/question.js';
 import { mapToSubmissionDTO, mapToSubmissionDTOId, SubmissionDTO, SubmissionDTOId } from '../interfaces/submission.js';
+import { fetchClass } from './classes.js';
 
-export async function fetchAssignment(classid: string, assignmentNumber: number): Promise<Assignment | null> {
+export async function fetchAssignment(classid: string, assignmentNumber: number): Promise<Assignment> {
     const classRepository = getClassRepository();
     const cls = await classRepository.findById(classid);
 
     if (!cls) {
-        return null;
+        throw new NotFoundException('Could not find assignment\'s class');
     }
 
     const assignmentRepository = getAssignmentRepository();
     const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber);
 
+    if (!assignment) {
+        throw new NotFoundException('Could not find assignment');
+    }
+
     return assignment;
 }
 
 export async function getAllAssignments(classid: string, full: boolean): Promise<AssignmentDTO[]> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classid);
-
-    if (!cls) {
-        return [];
-    }
+    const cls = await fetchClass(classid);
 
     const assignmentRepository = getAssignmentRepository();
     const assignments = await assignmentRepository.findAllAssignmentsInClass(cls);
diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index dcf6a432..7735b08d 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -8,7 +8,7 @@ import { getLogger } from '../logging/initalize.js';
 
 const logger = getLogger();
 
-async function fetchClass(classid: string): Promise<Class> {
+export async function fetchClass(classid: string): Promise<Class> {
     const classRepository = getClassRepository();
     const cls = await classRepository.findById(classid);
 

From 8218aae6ec712394f79171d2788fbe84cdb58194 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Fri, 4 Apr 2025 18:18:50 +0200
Subject: [PATCH 017/177] fix: problee m met mergen en zorgen student Gerald in
 db komt bij npm run dev runnen

---
 backend/package.json                          |   2 +-
 backend/seed.ts                               |  69 +++++
 backend/src/orm.ts                            |   6 +-
 .../test_assets/users/students.testdata.ts    |   3 +
 frontend/src/controllers/controllers.ts       |   2 +
 frontend/src/i18n/locale/de.json              |  17 +-
 frontend/src/i18n/locale/en.json              |  17 +-
 frontend/src/i18n/locale/fr.json              |  17 +-
 frontend/src/i18n/locale/nl.json              |  17 +-
 frontend/src/views/classes/UserClasses.vue    | 284 ++++++++++++++----
 10 files changed, 372 insertions(+), 62 deletions(-)
 create mode 100644 backend/seed.ts

diff --git a/backend/package.json b/backend/package.json
index 83db321f..1ef8e85f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -7,7 +7,7 @@
     "main": "dist/app.js",
     "scripts": {
         "build": "cross-env NODE_ENV=production tsc --build",
-        "dev": "cross-env NODE_ENV=development tsx watch --env-file=.env.development.local src/app.ts",
+        "dev": "cross-env NODE_ENV=development tsx seed.ts; tsx watch --env-file=.env.development.local src/app.ts",
         "start": "cross-env NODE_ENV=production node --env-file=.env dist/app.js",
         "format": "prettier --write src/",
         "format-check": "prettier --check src/",
diff --git a/backend/seed.ts b/backend/seed.ts
new file mode 100644
index 00000000..f2ca1d32
--- /dev/null
+++ b/backend/seed.ts
@@ -0,0 +1,69 @@
+import { forkEntityManager, initORM } from "./src/orm.js";
+import dotenv from 'dotenv';
+import { makeTestAssignemnts } from "./tests/test_assets/assignments/assignments.testdata.js";
+import { makeTestGroups } from "./tests/test_assets/assignments/groups.testdata.js";
+import { makeTestSubmissions } from "./tests/test_assets/assignments/submission.testdata.js";
+import { makeTestClassJoinRequests } from "./tests/test_assets/classes/class-join-requests.testdata.js";
+import { makeTestClasses } from "./tests/test_assets/classes/classes.testdata.js";
+import { makeTestTeacherInvitations } from "./tests/test_assets/classes/teacher-invitations.testdata.js";
+import { makeTestAttachments } from "./tests/test_assets/content/attachments.testdata.js";
+import { makeTestLearningObjects } from "./tests/test_assets/content/learning-objects.testdata.js";
+import { makeTestLearningPaths } from "./tests/test_assets/content/learning-paths.testdata.js";
+import { makeTestAnswers } from "./tests/test_assets/questions/answers.testdata.js";
+import { makeTestQuestions } from "./tests/test_assets/questions/questions.testdata.js";
+import { makeTestStudents } from "./tests/test_assets/users/students.testdata.js";
+import { makeTestTeachers } from "./tests/test_assets/users/teachers.testdata.js";
+
+export async function seedDatabase() {
+    dotenv.config({ path: '.env.development.local' });
+    const orm = await initORM();
+    await orm.schema.clearDatabase();
+
+    const em = forkEntityManager();
+
+    console.log("seeding database...")
+
+    const students = makeTestStudents(em);
+    const teachers = makeTestTeachers(em);
+    const learningObjects = makeTestLearningObjects(em);
+    const learningPaths = makeTestLearningPaths(em);
+    const classes = makeTestClasses(em, students, teachers);
+    const assignments = makeTestAssignemnts(em, classes);
+    const groups = makeTestGroups(em, students, assignments);
+
+    assignments[0].groups = groups.slice(0, 3);
+    assignments[1].groups = groups.slice(3, 4);
+
+    const teacherInvitations = makeTestTeacherInvitations(em, teachers, classes);
+    const classJoinRequests = makeTestClassJoinRequests(em, students, classes);
+    const attachments = makeTestAttachments(em, learningObjects);
+
+    learningObjects[1].attachments = attachments;
+
+    const questions = makeTestQuestions(em, students);
+    const answers = makeTestAnswers(em, teachers, questions);
+    const submissions = makeTestSubmissions(em, students, groups);
+
+    // Persist all entities
+    await em.persistAndFlush([
+        ...students,
+        ...teachers,
+        ...learningObjects,
+        ...learningPaths,
+        ...classes,
+        ...assignments,
+        ...groups,
+        ...teacherInvitations,
+        ...classJoinRequests,
+        ...attachments,
+        ...questions,
+        ...answers,
+        ...submissions,
+    ]);
+
+    console.log('Development database seeded successfully!');
+
+    await orm.close();
+}
+
+seedDatabase().catch(console.error);
\ No newline at end of file
diff --git a/backend/src/orm.ts b/backend/src/orm.ts
index 3e6e26c8..aa59f0c8 100644
--- a/backend/src/orm.ts
+++ b/backend/src/orm.ts
@@ -1,10 +1,10 @@
-import { EntityManager, MikroORM } from '@mikro-orm/core';
+import { Connection, EntityManager, IDatabaseDriver, MikroORM } from '@mikro-orm/core';
 import config from './mikro-orm.config.js';
 import { envVars, getEnvVar } from './util/envVars.js';
 import { getLogger, Logger } from './logging/initalize.js';
 
 let orm: MikroORM | undefined;
-export async function initORM(testingMode = false): Promise<void> {
+export async function initORM(testingMode = false): Promise<MikroORM<IDatabaseDriver<Connection>, EntityManager<IDatabaseDriver<Connection>>>> {
     const logger: Logger = getLogger();
 
     logger.info('Initializing ORM');
@@ -25,6 +25,8 @@ export async function initORM(testingMode = false): Promise<void> {
             );
         }
     }
+
+    return orm;
 }
 export function forkEntityManager(): EntityManager {
     if (!orm) {
diff --git a/backend/tests/test_assets/users/students.testdata.ts b/backend/tests/test_assets/users/students.testdata.ts
index 5cd75787..e38ab25c 100644
--- a/backend/tests/test_assets/users/students.testdata.ts
+++ b/backend/tests/test_assets/users/students.testdata.ts
@@ -1,5 +1,6 @@
 import { EntityManager } from '@mikro-orm/core';
 import { Student } from '../../../src/entities/users/student.entity';
+import { fixupRule } from '@eslint/compat';
 
 // 🔓 Ruwe testdata array — herbruikbaar in assertions
 export const TEST_STUDENTS = [
@@ -11,6 +12,8 @@ export const TEST_STUDENTS = [
     { username: 'TheDoors', firstName: 'Jim', lastName: 'Morisson' },
     // ⚠️ Deze mag niet gebruikt worden in elke test!
     { username: 'Nirvana', firstName: 'Kurt', lastName: 'Cobain' },
+    // makes sure when logged in as leerling1, there exists a corresponding user
+    { username: 'testleerling1', firstName: 'Gerald', lastName: 'Schmittinger'},
 ];
 
 // 🏗️ Functie die ORM entities maakt uit de data array
diff --git a/frontend/src/controllers/controllers.ts b/frontend/src/controllers/controllers.ts
index 39392a7d..d8dbc9e2 100644
--- a/frontend/src/controllers/controllers.ts
+++ b/frontend/src/controllers/controllers.ts
@@ -1,6 +1,7 @@
 import { ThemeController } from "@/controllers/themes.ts";
 import { LearningObjectController } from "@/controllers/learning-objects.ts";
 import { LearningPathController } from "@/controllers/learning-paths.ts";
+import { ClassController } from "@/controllers/classes.ts";
 
 export function controllerGetter<T>(factory: new () => T): () => T {
     let instance: T | undefined;
@@ -16,3 +17,4 @@ export function controllerGetter<T>(factory: new () => T): () => T {
 export const getThemeController = controllerGetter(ThemeController);
 export const getLearningObjectController = controllerGetter(LearningObjectController);
 export const getLearningPathController = controllerGetter(LearningPathController);
+export const getClassController = controllerGetter(ClassController);
diff --git a/frontend/src/i18n/locale/de.json b/frontend/src/i18n/locale/de.json
index 7e72d334..92efc5d0 100644
--- a/frontend/src/i18n/locale/de.json
+++ b/frontend/src/i18n/locale/de.json
@@ -56,5 +56,20 @@
     "noLearningPathsFoundDescription": "Es gibt keine Lernpfade, die zu Ihrem Suchbegriff passen.",
     "legendNotCompletedYet": "Noch nicht fertig",
     "legendCompleted": "Fertig",
-    "legendTeacherExclusive": "Information für Lehrkräfte"
+    "legendTeacherExclusive": "Information für Lehrkräfte",
+    "code": "code",
+    "class": "klasse",
+    "invitations": "einladungen",
+    "createClass" : "Klasse erstellen",
+    "createClassInstructions": "Geben Sie einen Namen für Ihre Klasse ein und klicken Sie auf „Erstellen“. Es erscheint ein Fenster mit einem Code, den Sie kopieren können. Geben Sie diesen Code an Ihre Schüler weiter und sie können Ihrer Klasse beitreten.",
+    "classname": "Klassenname",
+    "EnterNameOfClass": "einen Klassennamen eingeben.",
+    "create": "erstellen",
+    "sender": "Absender",
+    "nameIsMandatory": "classname ist obligatorisch",
+    "onlyUse" : "nur Buchstaben, Zahlen, Bindestriche (-) und Unterstriche (_) verwenden",
+    "close": "schließen",
+    "copied": "kopiert!",
+    "accept": "akzeptieren",
+    "deny": "verweigern"
 }
diff --git a/frontend/src/i18n/locale/en.json b/frontend/src/i18n/locale/en.json
index 4fe9dd83..aeeeb1a5 100644
--- a/frontend/src/i18n/locale/en.json
+++ b/frontend/src/i18n/locale/en.json
@@ -56,5 +56,20 @@
         "high-school": "16-18 years old",
         "older": "18 and older"
     },
-    "read-more": "Read more"
+    "read-more": "Read more",
+    "code" : "code",
+    "class": "class",
+    "invitations": "invitations",
+    "createClass" : "create class",
+    "classname": "classname",
+    "EnterNameOfClass": "Enter a classname.",
+    "create": "create",
+    "sender": "sender",
+    "nameIsMandatory": "classname is mandatory",
+    "onlyUse" : "only use letters, numbers, dashes (-) and underscores (_)",
+    "close": "close",
+    "copied": "copied!",
+    "accept": "accept",
+    "deny": "deny",
+    "createClassInstructions": "Enter a name for your class and click on create. A window will appear with a code that you can copy. Give this code to your students and they will be able to join."
 }
diff --git a/frontend/src/i18n/locale/fr.json b/frontend/src/i18n/locale/fr.json
index 744d222d..30e9db07 100644
--- a/frontend/src/i18n/locale/fr.json
+++ b/frontend/src/i18n/locale/fr.json
@@ -56,5 +56,20 @@
         "high-school": "16-18 ans",
         "older": "18 et plus"
     },
-    "read-more": "En savoir plus"
+    "read-more": "En savoir plus",
+    "code": "code",
+    "class": "classe",
+    "invitations": "invitations",
+    "createClass" : "créer une classe",
+    "createClassInstructions": "Entrez un nom pour votre classe et cliquez sur créer. Une fenêtre apparaît avec un code que vous pouvez copier. Donnez ce code à vos élèves et ils pourront rejoindre votre classe.",
+    "classname": "nom de classe",
+    "EnterNameOfClass": "saisir un nom de classe.",
+    "create": "créer",
+    "sender": "expéditeur",
+    "nameIsMandatory": "le nom de classe est obligatoire",
+    "onlyUse" : "n'utiliser que des lettres, des chiffres, des tirets (-) et des traits de soulignement (_)",
+    "close": "fermer",
+    "copied": "copié!",
+    "accept": "accepter",
+    "deny": "refuser"
 }
diff --git a/frontend/src/i18n/locale/nl.json b/frontend/src/i18n/locale/nl.json
index c6ab7576..096065dc 100644
--- a/frontend/src/i18n/locale/nl.json
+++ b/frontend/src/i18n/locale/nl.json
@@ -56,5 +56,20 @@
         "high-school": "3e graad secundair",
         "older": "Hoger onderwijs"
     },
-    "read-more": "Lees meer"
+    "read-more": "Lees meer",
+    "code": "code",
+    "class": "klas",
+    "invitations": "uitnodigingen",
+    "createClass" : "klas aanmaken",
+    "createClassInstructions": "Voer een naam in voor je klas en klik op create. Er verschijnt een venster met een code die je kunt kopiëren. Geef deze code aan je leerlingen en ze kunnen deelnemen aan je klas.",
+    "classname": "klasnaam",
+    "EnterNameOfClass": "Geef een klasnaam op.",
+    "create": "aanmaken",
+    "sender": "afzender",
+    "nameIsMandatory": "klasnaam is verplicht",
+    "onlyUse" : "gebruik enkel letters, cijfers, dashes (-) en underscores (_)",
+    "close": "sluiten",
+    "copied": "gekopieerd!",
+    "accept": "accepteren",
+    "deny": "weigeren"
 }
diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index 406a5819..b2a85140 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -8,46 +8,11 @@
 
     const role: string = authState.authState.activeRole!;
 
-    // TODO : temp data until frontend controllers are ready
-    type Teacher = {
-        username: string;
-        firstName: string;
-        lastName: string;
-        classes: Array<Class>;
-    };
-
-    type Student = {
-        username: string;
-        firstName: string;
-        lastName: string;
-        classes: Array<Class>;
-    };
-
-    type Class = {
-        id: string;
-        displayName: string;
-        teachers: Array<Teacher>;
-        students: Array<Student>;
-    };
-
-    const student01: Student = { username: "id01", firstName: "Mark", lastName: "Knopfler", classes: [] };
-    const student02: Student = { username: "id01", firstName: "John", lastName: "Hiat", classes: [] };
-    const student03: Student = { username: "id01", firstName: "Aaron", lastName: "Lewis", classes: [] };
-
-    const class01: Class = { id: "class01", displayName: "class 01", teachers: [], students: [student01, student02] };
-    const class02: Class = { id: "class02", displayName: "class 02", teachers: [], students: [student01, student03] };
-    const class03: Class = { id: "class03", displayName: "class 03", teachers: [], students: [student02, student03] };
-
-    student01.classes = [class01, class02];
-    student02.classes = [class01, class03];
-    student03.classes = [class02, class03];
-
-    const classes: Array<Class> = [class01, class02, class03];
-
-    // Handle the class join requests
+    // For students: code that they give in when sending a class join request
+    // For teachers: code that they get when they create a new class
     const code = ref<string>("");
 
-    // The code needs to be formatted as v4 to be valid
+    // The code a student sends in to join a class needs to be formatted as v4 to be valid
     // These rules are used to display a message to the user if they use a code that has an invalid format
     const codeRules = [
         (value: string | undefined) => {
@@ -55,19 +20,28 @@
             return t("invalidFormat");
         },
     ];
-    // Submitting a code will send a request if the code is valid
+
+    // function called when a student submits a code to join a class
     function submitCode() {
+        // check if the code is valid
         if (code.value !== undefined && validate(code.value) && version(code.value) === 4) {
-            // TODO: temp function until frontend controllers are ready
+            // TODO: temp function that does not use the backend
             console.log("Code submitted:", code.value);
         }
     }
 
-    // Handle dialog for showing members of a class
+    // Boolean that handles visibility for dialogs
+    // For students: clicking on membercount will show a dialog with all members
+    // For teachers: creating a class will generate a popup with the generated code
     const dialog = ref(false);
+
+    // list of students in the selected class
     const students = ref<Array<string>>([]);
+
+    // selected class itself
     const selectedClass = ref<Class | null>(null);
 
+    // function to display all members of a class
     function openDialog(c: Class) {
         selectedClass.value = c;
         if (selectedClass.value !== undefined) {
@@ -75,33 +49,233 @@
             dialog.value = true;
         }
     }
+
+    // function to handle a accepted invitation request
+    function acceptRequest() {
+        //TODO
+        console.log("request accepted");
+    }
+
+    // function to handle a denied invitation request
+    function denyRequest() {
+        //TODO
+        console.log("request denied");
+    }
+
+    // catch the value a teacher inserts when making a class
+    const className = ref<string>("");
+
+    // The name can only contain dash, underscore letters and numbers
+    // These rules are used to display a message to the user if the name is not valid
+    const nameRules = [
+        (value: string | undefined) => {
+            if (value) return true;
+            return t("nameIsMandatory");
+        },
+        (value: string | undefined) => {
+            if (value && /^[a-zA-Z0-9_-]+$/.test(value)) return true;
+            return t("onlyUse");
+        },
+    ];
+
+    // function called when a teacher creates a class
+    function createClass() {
+        // check if the class name is valid
+        if (className && className.value.length > 0 && /^[a-zA-Z0-9_-]+$/.test(className.value)) {
+            //TODO
+            console.log("created class with name: " + className.value);
+
+            // show the generated code to share with the class
+            dialog.value = true;
+            code.value = "04c7c759-c41e-4ea9-968a-1e2a987ce0ed";
+        }
+    }
+
+    // if the unique code is copied, set this to true so it's being displayed for the user
+    const copied = ref(false);
+
+    // copy the generated code to the clipboard
+    function copyToClipboard() {
+        navigator.clipboard.writeText(code.value);
+        copied.value = true;
+    }
 </script>
 <template>
     <main>
         <h1 class="title">{{ t("classes") }}</h1>
+        <v-container
+            fluid
+            class="ma-4"
+        >
+            <v-row
+                no-gutters
+                fluid
+            >
+                <v-col
+                    cols="12"
+                    sm="6"
+                    md="6"
+                >
+                    <v-table class="table">
+                        <thead>
+                            <tr>
+                                <th class="header">{{ t("classes") }}</th>
+                                <th
+                                    class="header"
+                                    v-if="role === 'teacher'"
+                                >
+                                    {{ t("code") }}
+                                </th>
+                                <th class="header">{{ t("members") }}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr
+                                v-for="c in classes"
+                                :key="c.id"
+                            >
+                                <td v-if="role === 'student'">{{ c.displayName }}</td>
+                                <td v-else>
+                                    <v-btn
+                                        :to="`/user/class/${c.id}`"
+                                        variant="text"
+                                    >
+                                        {{ c.displayName }}
+                                        <v-icon end> mdi-menu-right </v-icon>
+                                    </v-btn>
+                                </td>
+                                <td v-if="role === 'teacher'">{{ c.id }}</td>
+                                <td
+                                    v-if="role === 'student'"
+                                    class="link"
+                                    @click="openDialog(c)"
+                                >
+                                    {{ c.students.length }}
+                                </td>
+                                <td v-else>{{ c.students.length }}</td>
+                            </tr>
+                        </tbody>
+                    </v-table>
+                </v-col>
+                <v-col
+                    cols="12"
+                    sm="6"
+                    md="6"
+                >
+                    <div v-if="role === 'teacher'">
+                        <h2>{{ t("createClass") }}</h2>
 
-        <v-table class="table">
+                        <v-sheet
+                            class="pa-4 sheet"
+                            max-width="600px"
+                        >
+                            <p>{{ t("createClassInstructions") }}</p>
+                            <v-form @submit.prevent>
+                                <v-text-field
+                                    class="mt-4"
+                                    :label="`${t('classname')}`"
+                                    v-model="className"
+                                    :placeholder="`${t('EnterNameOfClass')}`"
+                                    :rules="nameRules"
+                                    variant="outlined"
+                                ></v-text-field>
+                                <v-btn
+                                    class="mt-4"
+                                    color="#f6faf2"
+                                    type="submit"
+                                    @click="createClass"
+                                    block
+                                    >{{ t("create") }}</v-btn
+                                >
+                            </v-form>
+                        </v-sheet>
+                        <v-container>
+                            <v-dialog
+                                v-model="dialog"
+                                max-width="400px"
+                            >
+                                <v-card>
+                                    <v-card-title class="headline">code</v-card-title>
+                                    <v-card-text>
+                                        <v-text-field
+                                            v-model="code"
+                                            readonly
+                                            append-inner-icon="mdi-content-copy"
+                                            @click:append-inner="copyToClipboard"
+                                        ></v-text-field>
+                                        <v-slide-y-transition>
+                                            <div
+                                                v-if="copied"
+                                                class="text-center mt-2"
+                                            >
+                                                {{ t("copied") }}
+                                            </div>
+                                        </v-slide-y-transition>
+                                    </v-card-text>
+                                    <v-card-actions>
+                                        <v-spacer></v-spacer>
+                                        <v-btn
+                                            text
+                                            @click="
+                                                dialog = false;
+                                                copied = false;
+                                            "
+                                            > {{ t("close") }} </v-btn
+                                        >
+                                    </v-card-actions>
+                                </v-card>
+                            </v-dialog>
+                        </v-container>
+                    </div>
+                </v-col>
+            </v-row>
+        </v-container>
+
+        <h1
+            v-if="role === 'teacher'"
+            class="title"
+        >
+            {{ t("invitations") }}
+        </h1>
+        <v-table
+            v-if="role === 'teacher'"
+            class="table"
+        >
             <thead>
                 <tr>
-                    <th class="header">{{ t("classes") }}</th>
-                    <th class="header">{{ t("members") }}</th>
+                    <th class="header">{{ t("class") }}</th>
+                    <th class="header">{{ t("sender") }}</th>
+                    <th class="header"></th>
                 </tr>
             </thead>
             <tbody>
                 <tr
-                    v-for="c in classes"
-                    :key="c.id"
+                    v-for="i in invitations"
+                    :key="i.id"
                 >
-                    <td>{{ c.displayName }}</td>
-                    <td
-                        class="link"
-                        @click="openDialog(c)"
-                    >
-                        {{ c.students.length }}
+                    <td>
+                        {{ i.class.displayName }}
+                    </td>
+                    <td>{{ i.sender.firstName + " " + i.sender.lastName }}</td>
+                    <td class="text-right">
+                        <div>
+                            <v-btn
+                                color="green"
+                                @click="acceptRequest"
+                                class="mr-2"
+                                > {{ t("accept") }} </v-btn
+                            >
+                            <v-btn
+                                color="red"
+                                @click="denyRequest"
+                                > {{ t("deny") }} </v-btn
+                            >
+                        </div>
                     </td>
                 </tr>
             </tbody>
         </v-table>
+
         <v-dialog
             v-model="dialog"
             width="400"
@@ -146,7 +320,7 @@
                         ></v-text-field>
                         <v-btn
                             class="mt-4"
-                            style="background-color: #f6faf2"
+                            color="#f6faf2"
                             type="submit"
                             @click="submitCode"
                             block
@@ -190,7 +364,7 @@
     }
 
     .table {
-        width: 60%;
+        width: 90%;
         padding-top: 10px;
         border-collapse: collapse;
     }
@@ -248,4 +422,4 @@
             margin: 5px;
         }
     }
-</style>
+</style>
\ No newline at end of file

From cfcddf0dabb89b143fcabc57d6b24daa5ff16544 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Fri, 4 Apr 2025 21:40:45 +0200
Subject: [PATCH 018/177] fix: zorg dat testleerling tussen database studenten
 komt en dat klassen een juist geformatteerde id hebben

---
 backend/tests/test_assets/classes/classes.testdata.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/tests/test_assets/classes/classes.testdata.ts b/backend/tests/test_assets/classes/classes.testdata.ts
index e4372015..fb2165a2 100644
--- a/backend/tests/test_assets/classes/classes.testdata.ts
+++ b/backend/tests/test_assets/classes/classes.testdata.ts
@@ -4,11 +4,11 @@ import { Student } from '../../../src/entities/users/student.entity';
 import { Teacher } from '../../../src/entities/users/teacher.entity';
 
 export function makeTestClasses(em: EntityManager, students: Student[], teachers: Teacher[]): Class[] {
-    const studentsClass01 = students.slice(0, 7);
+    const studentsClass01 = students.slice(0, 8);
     const teacherClass01: Teacher[] = teachers.slice(0, 1);
 
     const class01 = em.create(Class, {
-        classId: 'id01',
+        classId: '8764b861-90a6-42e5-9732-c0d9eb2f55f9',
         displayName: 'class01',
         teachers: teacherClass01,
         students: studentsClass01,
@@ -18,7 +18,7 @@ export function makeTestClasses(em: EntityManager, students: Student[], teachers
     const teacherClass02: Teacher[] = teachers.slice(1, 2);
 
     const class02 = em.create(Class, {
-        classId: 'id02',
+        classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89',
         displayName: 'class02',
         teachers: teacherClass02,
         students: studentsClass02,
@@ -28,7 +28,7 @@ export function makeTestClasses(em: EntityManager, students: Student[], teachers
     const teacherClass03: Teacher[] = teachers.slice(2, 3);
 
     const class03 = em.create(Class, {
-        classId: 'id03',
+        classId: '80dcc3e0-1811-4091-9361-42c0eee91cfa',
         displayName: 'class03',
         teachers: teacherClass03,
         students: studentsClass03,
@@ -38,7 +38,7 @@ export function makeTestClasses(em: EntityManager, students: Student[], teachers
     const teacherClass04: Teacher[] = teachers.slice(2, 3);
 
     const class04 = em.create(Class, {
-        classId: 'id04',
+        classId: '33d03536-83b8-4880-9982-9bbf2f908ddf',
         displayName: 'class04',
         teachers: teacherClass04,
         students: studentsClass04,

From 0a6a9566423a1f8a5b122d7e9651889ff3076f34 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Fri, 4 Apr 2025 21:42:01 +0200
Subject: [PATCH 019/177] feat: klassen van student worden opgehaald uit
 database

---
 frontend/src/views/classes/UserClasses.vue | 514 ++++++++++++---------
 1 file changed, 290 insertions(+), 224 deletions(-)

diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index b2a85140..80028469 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -1,13 +1,56 @@
 <script setup lang="ts">
     import { useI18n } from "vue-i18n";
     import authState from "@/services/auth/auth-service.ts";
-    import { ref } from "vue";
+    import { computed, onMounted, ref, type ComputedRef } from "vue";
     import { validate, version } from "uuid";
+    import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
+    import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
+    import { useStudentClassesQuery } from "@/queries/students";
 
     const { t } = useI18n();
 
+    type Invitation = {
+        id: string;
+        class: ClassDTO;
+        sender: TeacherDTO;
+        receiver: TeacherDTO;
+    };
+
+    const classes : ComputedRef<ClassDTO[]> = computed(() => {
+        const response = classesResponse.value;
+        let result : ClassDTO[] = []
+        if (!classesResponse.value){
+            return result
+        } else {
+            if (classesResponse.value.classes.length === 0) {
+                return result;
+            }
+            if (typeof classesResponse.value.classes[0] === 'string'){
+                for (const classid of classesResponse.value.classes) {
+                    // TODO when class queries are ready
+                }
+                return result;
+            }
+            return classesResponse.value.classes as ClassDTO[];
+        }
+    });
+        
+
+    const username = ref<string | undefined>(undefined);
+
+    const { data: classesResponse, isLoading, error } = useStudentClassesQuery(username);
+
+    onMounted(async () => {
+        const userObject = await authState.loadUser();
+        username.value = userObject?.profile?.preferred_username ?? undefined;
+    });
+
+    // get role of user
     const role: string = authState.authState.activeRole!;
 
+    // TODO: change to DTO
+    const invitations = ref<Array<Invitation>>([]);
+
     // For students: code that they give in when sending a class join request
     // For teachers: code that they get when they create a new class
     const code = ref<string>("");
@@ -39,13 +82,14 @@
     const students = ref<Array<string>>([]);
 
     // selected class itself
-    const selectedClass = ref<Class | null>(null);
+    const selectedClass = ref<ClassDTO | null>(null);
 
     // function to display all members of a class
-    function openDialog(c: Class) {
+    function openDialog(c: ClassDTO) {
         selectedClass.value = c;
         if (selectedClass.value !== undefined) {
-            students.value = selectedClass.value.students.map((student) => `${student.firstName} ${student.lastName}`);
+            // students.value = selectedClass.value.students.map((student) => `${student.firstName} ${student.lastName}`);
+            students.value = [];
             dialog.value = true;
         }
     }
@@ -102,237 +146,259 @@
 </script>
 <template>
     <main>
-        <h1 class="title">{{ t("classes") }}</h1>
-        <v-container
-            fluid
-            class="ma-4"
+        <div
+            v-if="isLoading"
+            class="text-center py-10"
         >
-            <v-row
-                no-gutters
+            <v-progress-circular
+                indeterminate
+                color="primary"
+            />
+            <p>Loading...</p>
+        </div>
+
+        <div
+            v-else-if="error"
+            class="text-center py-10 text-error"
+        >
+            <v-icon large>mdi-alert-circle</v-icon>
+            <p>Error loading: {{ error.message }}</p>
+        </div>
+        <div v-else>
+            <h1 class="title">{{ t("classes") }}</h1>
+            <v-container
                 fluid
+                class="ma-4"
             >
-                <v-col
-                    cols="12"
-                    sm="6"
-                    md="6"
+                <v-row
+                    no-gutters
+                    fluid
                 >
-                    <v-table class="table">
-                        <thead>
-                            <tr>
-                                <th class="header">{{ t("classes") }}</th>
-                                <th
-                                    class="header"
-                                    v-if="role === 'teacher'"
-                                >
-                                    {{ t("code") }}
-                                </th>
-                                <th class="header">{{ t("members") }}</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr
-                                v-for="c in classes"
-                                :key="c.id"
-                            >
-                                <td v-if="role === 'student'">{{ c.displayName }}</td>
-                                <td v-else>
-                                    <v-btn
-                                        :to="`/user/class/${c.id}`"
-                                        variant="text"
-                                    >
-                                        {{ c.displayName }}
-                                        <v-icon end> mdi-menu-right </v-icon>
-                                    </v-btn>
-                                </td>
-                                <td v-if="role === 'teacher'">{{ c.id }}</td>
-                                <td
-                                    v-if="role === 'student'"
-                                    class="link"
-                                    @click="openDialog(c)"
-                                >
-                                    {{ c.students.length }}
-                                </td>
-                                <td v-else>{{ c.students.length }}</td>
-                            </tr>
-                        </tbody>
-                    </v-table>
-                </v-col>
-                <v-col
-                    cols="12"
-                    sm="6"
-                    md="6"
-                >
-                    <div v-if="role === 'teacher'">
-                        <h2>{{ t("createClass") }}</h2>
-
-                        <v-sheet
-                            class="pa-4 sheet"
-                            max-width="600px"
-                        >
-                            <p>{{ t("createClassInstructions") }}</p>
-                            <v-form @submit.prevent>
-                                <v-text-field
-                                    class="mt-4"
-                                    :label="`${t('classname')}`"
-                                    v-model="className"
-                                    :placeholder="`${t('EnterNameOfClass')}`"
-                                    :rules="nameRules"
-                                    variant="outlined"
-                                ></v-text-field>
-                                <v-btn
-                                    class="mt-4"
-                                    color="#f6faf2"
-                                    type="submit"
-                                    @click="createClass"
-                                    block
-                                    >{{ t("create") }}</v-btn
-                                >
-                            </v-form>
-                        </v-sheet>
-                        <v-container>
-                            <v-dialog
-                                v-model="dialog"
-                                max-width="400px"
-                            >
-                                <v-card>
-                                    <v-card-title class="headline">code</v-card-title>
-                                    <v-card-text>
-                                        <v-text-field
-                                            v-model="code"
-                                            readonly
-                                            append-inner-icon="mdi-content-copy"
-                                            @click:append-inner="copyToClipboard"
-                                        ></v-text-field>
-                                        <v-slide-y-transition>
-                                            <div
-                                                v-if="copied"
-                                                class="text-center mt-2"
-                                            >
-                                                {{ t("copied") }}
-                                            </div>
-                                        </v-slide-y-transition>
-                                    </v-card-text>
-                                    <v-card-actions>
-                                        <v-spacer></v-spacer>
-                                        <v-btn
-                                            text
-                                            @click="
-                                                dialog = false;
-                                                copied = false;
-                                            "
-                                            > {{ t("close") }} </v-btn
-                                        >
-                                    </v-card-actions>
-                                </v-card>
-                            </v-dialog>
-                        </v-container>
-                    </div>
-                </v-col>
-            </v-row>
-        </v-container>
-
-        <h1
-            v-if="role === 'teacher'"
-            class="title"
-        >
-            {{ t("invitations") }}
-        </h1>
-        <v-table
-            v-if="role === 'teacher'"
-            class="table"
-        >
-            <thead>
-                <tr>
-                    <th class="header">{{ t("class") }}</th>
-                    <th class="header">{{ t("sender") }}</th>
-                    <th class="header"></th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr
-                    v-for="i in invitations"
-                    :key="i.id"
-                >
-                    <td>
-                        {{ i.class.displayName }}
-                    </td>
-                    <td>{{ i.sender.firstName + " " + i.sender.lastName }}</td>
-                    <td class="text-right">
-                        <div>
-                            <v-btn
-                                color="green"
-                                @click="acceptRequest"
-                                class="mr-2"
-                                > {{ t("accept") }} </v-btn
-                            >
-                            <v-btn
-                                color="red"
-                                @click="denyRequest"
-                                > {{ t("deny") }} </v-btn
-                            >
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </v-table>
-
-        <v-dialog
-            v-model="dialog"
-            width="400"
-        >
-            <v-card>
-                <v-card-title> {{ selectedClass?.displayName }} </v-card-title>
-                <v-card-text>
-                    <ul>
-                        <li
-                            v-for="student in students"
-                            :key="student"
-                        >
-                            {{ student }}
-                        </li>
-                    </ul>
-                </v-card-text>
-                <v-card-actions>
-                    <v-btn
-                        color="primary"
-                        @click="dialog = false"
-                        >Close</v-btn
+                    <v-col
+                        cols="12"
+                        sm="6"
+                        md="6"
                     >
-                </v-card-actions>
-            </v-card>
-        </v-dialog>
-        <div v-if="role === 'student'">
-            <div class="join">
-                <h2>{{ t("joinClass") }}</h2>
-                <p>{{ t("JoinClassExplanation") }}</p>
+                        <v-table class="table">
+                            <thead>
+                                <tr>
+                                    <th class="header">{{ t("classes") }}</th>
+                                    <th
+                                        class="header"
+                                        v-if="role === 'teacher'"
+                                    >
+                                        {{ t("code") }}
+                                    </th>
+                                    <th class="header">{{ t("members") }}</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr
+                                    v-for="c in classes"
+                                    :key="c.id"
+                                >
+                                    <td v-if="role === 'student'">{{ c.displayName }}</td>
+                                    <td v-else>
+                                        <v-btn
+                                            :to="`/user/class/${c.id}`"
+                                            variant="text"
+                                        >
+                                            {{ c.displayName }}
+                                            <v-icon end> mdi-menu-right </v-icon>
+                                        </v-btn>
+                                    </td>
+                                    <td v-if="role === 'teacher'">{{ c.id }}</td>
+                                    <td
+                                        v-if="role === 'student'"
+                                        class="link"
+                                        @click="openDialog(c)"
+                                    >
+                                        {{ c.students.length }}
+                                    </td>
+                                    <td v-else>{{ c.students.length }}</td>
+                                </tr>
+                            </tbody>
+                        </v-table>
+                    </v-col>
+                    <v-col
+                        cols="12"
+                        sm="6"
+                        md="6"
+                    >
+                        <div v-if="role === 'teacher'">
+                            <h2>{{ t("createClass") }}</h2>
 
-                <v-sheet
-                    class="pa-4 sheet"
-                    max-width="400"
-                >
-                    <v-form @submit.prevent>
-                        <v-text-field
-                            label="CODE"
-                            v-model="code"
-                            placeholder="XXXXXXXX-XXXX-4XXX-XXXX-XXXXXXXXXXXX"
-                            :rules="codeRules"
-                            variant="outlined"
-                        ></v-text-field>
+                            <v-sheet
+                                class="pa-4 sheet"
+                                max-width="600px"
+                            >
+                                <p>{{ t("createClassInstructions") }}</p>
+                                <v-form @submit.prevent>
+                                    <v-text-field
+                                        class="mt-4"
+                                        :label="`${t('classname')}`"
+                                        v-model="className"
+                                        :placeholder="`${t('EnterNameOfClass')}`"
+                                        :rules="nameRules"
+                                        variant="outlined"
+                                    ></v-text-field>
+                                    <v-btn
+                                        class="mt-4"
+                                        color="#f6faf2"
+                                        type="submit"
+                                        @click="createClass"
+                                        block
+                                        >{{ t("create") }}</v-btn
+                                    >
+                                </v-form>
+                            </v-sheet>
+                            <v-container>
+                                <v-dialog
+                                    v-model="dialog"
+                                    max-width="400px"
+                                >
+                                    <v-card>
+                                        <v-card-title class="headline">code</v-card-title>
+                                        <v-card-text>
+                                            <v-text-field
+                                                v-model="code"
+                                                readonly
+                                                append-inner-icon="mdi-content-copy"
+                                                @click:append-inner="copyToClipboard"
+                                            ></v-text-field>
+                                            <v-slide-y-transition>
+                                                <div
+                                                    v-if="copied"
+                                                    class="text-center mt-2"
+                                                >
+                                                    {{ t("copied") }}
+                                                </div>
+                                            </v-slide-y-transition>
+                                        </v-card-text>
+                                        <v-card-actions>
+                                            <v-spacer></v-spacer>
+                                            <v-btn
+                                                text
+                                                @click="
+                                                    dialog = false;
+                                                    copied = false;
+                                                "
+                                            >
+                                                {{ t("close") }}
+                                            </v-btn>
+                                        </v-card-actions>
+                                    </v-card>
+                                </v-dialog>
+                            </v-container>
+                        </div>
+                    </v-col>
+                </v-row>
+            </v-container>
+
+            <h1
+                v-if="role === 'teacher'"
+                class="title"
+            >
+                {{ t("invitations") }}
+            </h1>
+            <v-table
+                v-if="role === 'teacher'"
+                class="table"
+            >
+                <thead>
+                    <tr>
+                        <th class="header">{{ t("class") }}</th>
+                        <th class="header">{{ t("sender") }}</th>
+                        <th class="header"></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr
+                        v-for="i in invitations"
+                        :key="i.id"
+                    >
+                        <td>
+                            {{ i.class.displayName }}
+                        </td>
+                        <td>{{ i.sender.firstName + " " + i.sender.lastName }}</td>
+                        <td class="text-right">
+                            <div>
+                                <v-btn
+                                    color="green"
+                                    @click="acceptRequest"
+                                    class="mr-2"
+                                >
+                                    {{ t("accept") }}
+                                </v-btn>
+                                <v-btn
+                                    color="red"
+                                    @click="denyRequest"
+                                >
+                                    {{ t("deny") }}
+                                </v-btn>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </v-table>
+
+            <v-dialog
+                v-model="dialog"
+                width="400"
+            >
+                <v-card>
+                    <v-card-title> {{ selectedClass?.displayName }} </v-card-title>
+                    <v-card-text>
+                        <ul>
+                            <li
+                                v-for="student in students"
+                                :key="student"
+                            >
+                                {{ student }}
+                            </li>
+                        </ul>
+                    </v-card-text>
+                    <v-card-actions>
                         <v-btn
-                            class="mt-4"
-                            color="#f6faf2"
-                            type="submit"
-                            @click="submitCode"
-                            block
-                            >{{ t("submitCode") }}</v-btn
+                            color="primary"
+                            @click="dialog = false"
+                            >Close</v-btn
                         >
-                    </v-form>
-                </v-sheet>
+                    </v-card-actions>
+                </v-card>
+            </v-dialog>
+            <div v-if="role === 'student'">
+                <div class="join">
+                    <h2>{{ t("joinClass") }}</h2>
+                    <p>{{ t("JoinClassExplanation") }}</p>
+
+                    <v-sheet
+                        class="pa-4 sheet"
+                        max-width="400"
+                    >
+                        <v-form @submit.prevent>
+                            <v-text-field
+                                label="CODE"
+                                v-model="code"
+                                placeholder="XXXXXXXX-XXXX-4XXX-XXXX-XXXXXXXXXXXX"
+                                :rules="codeRules"
+                                variant="outlined"
+                            ></v-text-field>
+                            <v-btn
+                                class="mt-4"
+                                color="#f6faf2"
+                                type="submit"
+                                @click="submitCode"
+                                block
+                                >{{ t("submitCode") }}</v-btn
+                            >
+                        </v-form>
+                    </v-sheet>
+                </div>
             </div>
         </div>
     </main>
 </template>
-
 <style scoped>
     .header {
         font-weight: bold !important;
@@ -422,4 +488,4 @@
             margin: 5px;
         }
     }
-</style>
\ No newline at end of file
+</style>

From 75d74584aa526d5c26abc6fc31468818cf77e28f Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 14:58:35 +0200
Subject: [PATCH 020/177] feat: zie klasgenoten bij klikken op members

---
 frontend/src/views/classes/UserClasses.vue | 47 ++++++++++++++--------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index 80028469..0eb4e559 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -1,13 +1,16 @@
 <script setup lang="ts">
     import { useI18n } from "vue-i18n";
     import authState from "@/services/auth/auth-service.ts";
-    import { computed, onMounted, ref, type ComputedRef } from "vue";
+    import { computed, onMounted, ref, watch, watchEffect, type ComputedRef } from "vue";
     import { validate, version } from "uuid";
     import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
     import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
-    import { useStudentClassesQuery } from "@/queries/students";
+    import { useStudentClassesQuery, useStudentQuery } from "@/queries/students";
+    import type { StudentDTO } from "@dwengo-1/common/interfaces/student";
+    import { StudentController } from "@/controllers/students";
 
     const { t } = useI18n();
+    const studentController: StudentController = new StudentController();
 
     type Invitation = {
         id: string;
@@ -16,16 +19,16 @@
         receiver: TeacherDTO;
     };
 
-    const classes : ComputedRef<ClassDTO[]> = computed(() => {
+    const classes: ComputedRef<ClassDTO[]> = computed(() => {
         const response = classesResponse.value;
-        let result : ClassDTO[] = []
-        if (!classesResponse.value){
-            return result
+        let result: ClassDTO[] = [];
+        if (!classesResponse.value) {
+            return result;
         } else {
             if (classesResponse.value.classes.length === 0) {
                 return result;
             }
-            if (typeof classesResponse.value.classes[0] === 'string'){
+            if (typeof classesResponse.value.classes[0] === "string") {
                 for (const classid of classesResponse.value.classes) {
                     // TODO when class queries are ready
                 }
@@ -34,7 +37,6 @@
             return classesResponse.value.classes as ClassDTO[];
         }
     });
-        
 
     const username = ref<string | undefined>(undefined);
 
@@ -79,19 +81,30 @@
     const dialog = ref(false);
 
     // list of students in the selected class
-    const students = ref<Array<string>>([]);
+    const students = ref<Array<StudentDTO>>([]);
 
     // selected class itself
     const selectedClass = ref<ClassDTO | null>(null);
 
     // function to display all members of a class
-    function openDialog(c: ClassDTO) {
+    async function openDialog(c: ClassDTO) {
         selectedClass.value = c;
-        if (selectedClass.value !== undefined) {
-            // students.value = selectedClass.value.students.map((student) => `${student.firstName} ${student.lastName}`);
-            students.value = [];
-            dialog.value = true;
-        }
+
+        // clear previous value
+        students.value = [];
+        dialog.value = true;
+
+        const studentDTOs: (StudentDTO | null)[] = await Promise.all(
+            c.students.map(async (uid) => {
+                try {
+                    const res = await studentController.getByUsername(uid);
+                    return res.student;
+                } catch (e) {
+                    return null;
+                }
+            }),
+        );
+        students.value = studentDTOs.filter(Boolean) as StudentDTO[];
     }
 
     // function to handle a accepted invitation request
@@ -352,9 +365,9 @@
                         <ul>
                             <li
                                 v-for="student in students"
-                                :key="student"
+                                :key="student.username"
                             >
-                                {{ student }}
+                                {{ student.firstName + " " + student.lastName }}
                             </li>
                         </ul>
                     </v-card-text>

From 3eac5190c3d1ba436b8160f5042aa532e31ec0fd Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 15:00:01 +0200
Subject: [PATCH 021/177] style: format frontend

---
 frontend/src/i18n/locale/de.json |  8 ++++----
 frontend/src/i18n/locale/en.json | 10 +++++-----
 frontend/src/i18n/locale/fr.json |  8 ++++----
 frontend/src/i18n/locale/nl.json |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/frontend/src/i18n/locale/de.json b/frontend/src/i18n/locale/de.json
index 92efc5d0..2a6760e6 100644
--- a/frontend/src/i18n/locale/de.json
+++ b/frontend/src/i18n/locale/de.json
@@ -20,8 +20,8 @@
     "joinClass": "Klasse beitreten",
     "JoinClassExplanation": "Geben Sie den Code ein, den Ihnen die Lehrkraft mitgeteilt hat, um der Klasse beizutreten.",
     "invalidFormat": "Ungültiges Format",
-    "submitCode" : "senden",
-    "members" : "mitglieder",
+    "submitCode": "senden",
+    "members": "mitglieder",
     "themes": "Themen",
     "choose-theme": "Wähle ein thema",
     "choose-age": "Alter auswählen",
@@ -60,14 +60,14 @@
     "code": "code",
     "class": "klasse",
     "invitations": "einladungen",
-    "createClass" : "Klasse erstellen",
+    "createClass": "Klasse erstellen",
     "createClassInstructions": "Geben Sie einen Namen für Ihre Klasse ein und klicken Sie auf „Erstellen“. Es erscheint ein Fenster mit einem Code, den Sie kopieren können. Geben Sie diesen Code an Ihre Schüler weiter und sie können Ihrer Klasse beitreten.",
     "classname": "Klassenname",
     "EnterNameOfClass": "einen Klassennamen eingeben.",
     "create": "erstellen",
     "sender": "Absender",
     "nameIsMandatory": "classname ist obligatorisch",
-    "onlyUse" : "nur Buchstaben, Zahlen, Bindestriche (-) und Unterstriche (_) verwenden",
+    "onlyUse": "nur Buchstaben, Zahlen, Bindestriche (-) und Unterstriche (_) verwenden",
     "close": "schließen",
     "copied": "kopiert!",
     "accept": "akzeptieren",
diff --git a/frontend/src/i18n/locale/en.json b/frontend/src/i18n/locale/en.json
index aeeeb1a5..32ee4868 100644
--- a/frontend/src/i18n/locale/en.json
+++ b/frontend/src/i18n/locale/en.json
@@ -32,8 +32,8 @@
     "joinClass": "Join class",
     "JoinClassExplanation": "Enter the code the teacher has given you to join the class.",
     "invalidFormat": "Invalid format.",
-    "submitCode" : "submit",
-    "members" : "members",
+    "submitCode": "submit",
+    "members": "members",
     "themes": "Themes",
     "choose-theme": "Select a theme",
     "choose-age": "Select age",
@@ -57,16 +57,16 @@
         "older": "18 and older"
     },
     "read-more": "Read more",
-    "code" : "code",
+    "code": "code",
     "class": "class",
     "invitations": "invitations",
-    "createClass" : "create class",
+    "createClass": "create class",
     "classname": "classname",
     "EnterNameOfClass": "Enter a classname.",
     "create": "create",
     "sender": "sender",
     "nameIsMandatory": "classname is mandatory",
-    "onlyUse" : "only use letters, numbers, dashes (-) and underscores (_)",
+    "onlyUse": "only use letters, numbers, dashes (-) and underscores (_)",
     "close": "close",
     "copied": "copied!",
     "accept": "accept",
diff --git a/frontend/src/i18n/locale/fr.json b/frontend/src/i18n/locale/fr.json
index 30e9db07..b24d58e1 100644
--- a/frontend/src/i18n/locale/fr.json
+++ b/frontend/src/i18n/locale/fr.json
@@ -32,8 +32,8 @@
     "joinClass": "Rejoindre une classe",
     "JoinClassExplanation": "Entrez le code que l'enseignant vous a donné pour rejoindre la classe.",
     "invalidFormat": "Format non valide.",
-    "submitCode" : "envoyer",
-    "members" : "membres",
+    "submitCode": "envoyer",
+    "members": "membres",
     "themes": "Thèmes",
     "choose-theme": "Choisis un thème",
     "choose-age": "Choisis un âge",
@@ -60,14 +60,14 @@
     "code": "code",
     "class": "classe",
     "invitations": "invitations",
-    "createClass" : "créer une classe",
+    "createClass": "créer une classe",
     "createClassInstructions": "Entrez un nom pour votre classe et cliquez sur créer. Une fenêtre apparaît avec un code que vous pouvez copier. Donnez ce code à vos élèves et ils pourront rejoindre votre classe.",
     "classname": "nom de classe",
     "EnterNameOfClass": "saisir un nom de classe.",
     "create": "créer",
     "sender": "expéditeur",
     "nameIsMandatory": "le nom de classe est obligatoire",
-    "onlyUse" : "n'utiliser que des lettres, des chiffres, des tirets (-) et des traits de soulignement (_)",
+    "onlyUse": "n'utiliser que des lettres, des chiffres, des tirets (-) et des traits de soulignement (_)",
     "close": "fermer",
     "copied": "copié!",
     "accept": "accepter",
diff --git a/frontend/src/i18n/locale/nl.json b/frontend/src/i18n/locale/nl.json
index 096065dc..c459538b 100644
--- a/frontend/src/i18n/locale/nl.json
+++ b/frontend/src/i18n/locale/nl.json
@@ -32,8 +32,8 @@
     "joinClass": "Word lid van een klas",
     "JoinClassExplanation": "Voer de code in die je van de docent hebt gekregen om lid te worden van de klas.",
     "invalidFormat": "Ongeldig formaat.",
-    "submitCode" : "verzenden",
-    "members" : "leden",
+    "submitCode": "verzenden",
+    "members": "leden",
     "themes": "Lesthema's",
     "choose-theme": "Kies een thema",
     "choose-age": "Kies een leeftijd",
@@ -60,14 +60,14 @@
     "code": "code",
     "class": "klas",
     "invitations": "uitnodigingen",
-    "createClass" : "klas aanmaken",
+    "createClass": "klas aanmaken",
     "createClassInstructions": "Voer een naam in voor je klas en klik op create. Er verschijnt een venster met een code die je kunt kopiëren. Geef deze code aan je leerlingen en ze kunnen deelnemen aan je klas.",
     "classname": "klasnaam",
     "EnterNameOfClass": "Geef een klasnaam op.",
     "create": "aanmaken",
     "sender": "afzender",
     "nameIsMandatory": "klasnaam is verplicht",
-    "onlyUse" : "gebruik enkel letters, cijfers, dashes (-) en underscores (_)",
+    "onlyUse": "gebruik enkel letters, cijfers, dashes (-) en underscores (_)",
     "close": "sluiten",
     "copied": "gekopieerd!",
     "accept": "accepteren",

From d2a7eed4ad5d461d8d6427385a1ef39d062ee61d Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 15:04:44 +0200
Subject: [PATCH 022/177] style: run npm run lint

---
 frontend/src/views/classes/UserClasses.vue | 55 +++++++++++-----------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index 0eb4e559..eb1897be 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -1,30 +1,29 @@
 <script setup lang="ts">
     import { useI18n } from "vue-i18n";
     import authState from "@/services/auth/auth-service.ts";
-    import { computed, onMounted, ref, watch, watchEffect, type ComputedRef } from "vue";
+    import { computed, onMounted, ref, type ComputedRef } from "vue";
     import { validate, version } from "uuid";
     import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
     import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
-    import { useStudentClassesQuery, useStudentQuery } from "@/queries/students";
+    import { useStudentClassesQuery } from "@/queries/students";
     import type { StudentDTO } from "@dwengo-1/common/interfaces/student";
     import { StudentController } from "@/controllers/students";
 
     const { t } = useI18n();
     const studentController: StudentController = new StudentController();
 
-    type Invitation = {
+    interface Invitation {
         id: string;
         class: ClassDTO;
         sender: TeacherDTO;
         receiver: TeacherDTO;
-    };
+    }
 
     const classes: ComputedRef<ClassDTO[]> = computed(() => {
-        const response = classesResponse.value;
-        let result: ClassDTO[] = [];
+        const result: ClassDTO[] = [];
         if (!classesResponse.value) {
             return result;
-        } else {
+        } 
             if (classesResponse.value.classes.length === 0) {
                 return result;
             }
@@ -35,7 +34,7 @@
                 return result;
             }
             return classesResponse.value.classes as ClassDTO[];
-        }
+        
     });
 
     const username = ref<string | undefined>(undefined);
@@ -47,11 +46,11 @@
         username.value = userObject?.profile?.preferred_username ?? undefined;
     });
 
-    // get role of user
+    // Get role of user
     const role: string = authState.authState.activeRole!;
 
     // TODO: change to DTO
-    const invitations = ref<Array<Invitation>>([]);
+    const invitations = ref<Invitation[]>([]);
 
     // For students: code that they give in when sending a class join request
     // For teachers: code that they get when they create a new class
@@ -60,15 +59,15 @@
     // The code a student sends in to join a class needs to be formatted as v4 to be valid
     // These rules are used to display a message to the user if they use a code that has an invalid format
     const codeRules = [
-        (value: string | undefined) => {
+        (value: string | undefined) : string | boolean => {
             if (value !== undefined && validate(value) && version(value) === 4) return true;
             return t("invalidFormat");
         },
     ];
 
-    // function called when a student submits a code to join a class
+    // Function called when a student submits a code to join a class
     function submitCode() {
-        // check if the code is valid
+        // Check if the code is valid
         if (code.value !== undefined && validate(code.value) && version(code.value) === 4) {
             // TODO: temp function that does not use the backend
             console.log("Code submitted:", code.value);
@@ -80,17 +79,17 @@
     // For teachers: creating a class will generate a popup with the generated code
     const dialog = ref(false);
 
-    // list of students in the selected class
-    const students = ref<Array<StudentDTO>>([]);
+    // List of students in the selected class
+    const students = ref<StudentDTO[]>([]);
 
-    // selected class itself
+    // Selected class itself
     const selectedClass = ref<ClassDTO | null>(null);
 
-    // function to display all members of a class
+    // Function to display all members of a class
     async function openDialog(c: ClassDTO) {
         selectedClass.value = c;
 
-        // clear previous value
+        // Clear previous value
         students.value = [];
         dialog.value = true;
 
@@ -99,7 +98,7 @@
                 try {
                     const res = await studentController.getByUsername(uid);
                     return res.student;
-                } catch (e) {
+                } catch (_) {
                     return null;
                 }
             }),
@@ -107,19 +106,19 @@
         students.value = studentDTOs.filter(Boolean) as StudentDTO[];
     }
 
-    // function to handle a accepted invitation request
+    // Function to handle a accepted invitation request
     function acceptRequest() {
         //TODO
         console.log("request accepted");
     }
 
-    // function to handle a denied invitation request
+    // Function to handle a denied invitation request
     function denyRequest() {
         //TODO
         console.log("request denied");
     }
 
-    // catch the value a teacher inserts when making a class
+    // Catch the value a teacher inserts when making a class
     const className = ref<string>("");
 
     // The name can only contain dash, underscore letters and numbers
@@ -135,23 +134,23 @@
         },
     ];
 
-    // function called when a teacher creates a class
+    // Function called when a teacher creates a class
     function createClass() {
-        // check if the class name is valid
-        if (className && className.value.length > 0 && /^[a-zA-Z0-9_-]+$/.test(className.value)) {
+        // Check if the class name is valid
+        if (className.value && className.value.length > 0 && /^[a-zA-Z0-9_-]+$/.test(className.value)) {
             //TODO
             console.log("created class with name: " + className.value);
 
-            // show the generated code to share with the class
+            // Show the generated code to share with the class
             dialog.value = true;
             code.value = "04c7c759-c41e-4ea9-968a-1e2a987ce0ed";
         }
     }
 
-    // if the unique code is copied, set this to true so it's being displayed for the user
+    // If the unique code is copied, set this to true so it's being displayed for the user
     const copied = ref(false);
 
-    // copy the generated code to the clipboard
+    // Copy the generated code to the clipboard
     function copyToClipboard() {
         navigator.clipboard.writeText(code.value);
         copied.value = true;

From 524de10d7394b259640044c1036ccc553162a8b3 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 16:05:53 +0200
Subject: [PATCH 023/177] style: refactor het script om overzichtelijkere
 volgorde te creeeren

---
 frontend/src/views/classes/UserClasses.vue | 130 ++++++++++++---------
 1 file changed, 72 insertions(+), 58 deletions(-)

diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index eb1897be..2a4403c1 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -5,13 +5,14 @@
     import { validate, version } from "uuid";
     import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
     import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
-    import { useStudentClassesQuery } from "@/queries/students";
+    import { useCreateJoinRequestMutation, useStudentClassesQuery } from "@/queries/students";
     import type { StudentDTO } from "@dwengo-1/common/interfaces/student";
     import { StudentController } from "@/controllers/students";
 
     const { t } = useI18n();
     const studentController: StudentController = new StudentController();
 
+    // TODO: remove and use correct type
     interface Invitation {
         id: string;
         class: ClassDTO;
@@ -19,38 +20,76 @@
         receiver: TeacherDTO;
     }
 
-    const classes: ComputedRef<ClassDTO[]> = computed(() => {
-        const result: ClassDTO[] = [];
-        if (!classesResponse.value) {
-            return result;
-        } 
-            if (classesResponse.value.classes.length === 0) {
-                return result;
-            }
-            if (typeof classesResponse.value.classes[0] === "string") {
-                for (const classid of classesResponse.value.classes) {
-                    // TODO when class queries are ready
-                }
-                return result;
-            }
-            return classesResponse.value.classes as ClassDTO[];
-        
-    });
+    // determine if role is student or teacher to render correct view
+    const role: string = authState.authState.activeRole!;
 
+    // username of logged in student or teacher
     const username = ref<string | undefined>(undefined);
 
-    const { data: classesResponse, isLoading, error } = useStudentClassesQuery(username);
-
+    // find the username of the logged in user so it can be used to fetch other information
+    // when loading the page
     onMounted(async () => {
         const userObject = await authState.loadUser();
         username.value = userObject?.profile?.preferred_username ?? undefined;
     });
 
-    // Get role of user
-    const role: string = authState.authState.activeRole!;
+    // fetch all classes of the logged in student
+    const { data: classesResponse, isLoading, error } = useStudentClassesQuery(username);
 
-    // TODO: change to DTO
-    const invitations = ref<Invitation[]>([]);
+    // empty list when classes are not yet loaded, else the list of classes of the user
+    const classes: ComputedRef<ClassDTO[]> = computed(() => {
+
+        // the classes are not yet fetched
+        if (!classesResponse.value) {
+            return [];
+        }
+            // the user has no classes
+            if (classesResponse.value.classes.length === 0) {
+                return [];
+            }
+            if (typeof classesResponse.value.classes[0] === "string") {
+                // should not occur because value of *full* is true
+                // must be caught because typescript can't know the type
+                // i chose to return an empty list if this occurs
+                // it is also possible to fetch all classes from the id's returned
+                return [];
+            }
+            return classesResponse.value.classes as ClassDTO[];
+        
+    });
+
+    // students of selected class are shown when logged in student presses on the member count
+    const selectedClass = ref<ClassDTO | null>(null);
+    const students = ref<StudentDTO[]>([]);
+
+    // Boolean that handles visibility for dialogs
+    // For students: clicking on membercount will show a dialog with all members
+    // For teachers: creating a class will generate a popup with the generated code
+    const dialog = ref(false);
+
+    // Function to display all members of a class in a dialog
+    async function openDialog(c: ClassDTO) {
+        selectedClass.value = c;
+
+        // Clear previous value
+        students.value = [];
+        dialog.value = true;
+
+        // fetch students from their usernames to display their full names
+        const studentDTOs: (StudentDTO | null)[] = await Promise.all(
+            c.students.map(async (uid) => {
+                try {
+                    const res = await studentController.getByUsername(uid);
+                    return res.student;
+                } catch (_) {
+                    return null;
+                }
+            }),
+        );
+
+        // only show students that are not fetched ass *null*
+        students.value = studentDTOs.filter(Boolean) as StudentDTO[];
+    }
 
     // For students: code that they give in when sending a class join request
     // For teachers: code that they get when they create a new class
@@ -65,46 +104,21 @@
         },
     ];
 
+    const { mutate, isError } = useCreateJoinRequestMutation();
+
     // Function called when a student submits a code to join a class
     function submitCode() {
         // Check if the code is valid
         if (code.value !== undefined && validate(code.value) && version(code.value) === 4) {
-            // TODO: temp function that does not use the backend
+            // TODO: uncomment when fixed
+            // mutate( { username : username.value! , classId : code.value });
+            
             console.log("Code submitted:", code.value);
         }
     }
 
-    // Boolean that handles visibility for dialogs
-    // For students: clicking on membercount will show a dialog with all members
-    // For teachers: creating a class will generate a popup with the generated code
-    const dialog = ref(false);
-
-    // List of students in the selected class
-    const students = ref<StudentDTO[]>([]);
-
-    // Selected class itself
-    const selectedClass = ref<ClassDTO | null>(null);
-
-    // Function to display all members of a class
-    async function openDialog(c: ClassDTO) {
-        selectedClass.value = c;
-
-        // Clear previous value
-        students.value = [];
-        dialog.value = true;
-
-        const studentDTOs: (StudentDTO | null)[] = await Promise.all(
-            c.students.map(async (uid) => {
-                try {
-                    const res = await studentController.getByUsername(uid);
-                    return res.student;
-                } catch (_) {
-                    return null;
-                }
-            }),
-        );
-        students.value = studentDTOs.filter(Boolean) as StudentDTO[];
-    }
+    // TODO: implement correctly
+    const invitations = ref<Invitation[]>([]);
 
     // Function to handle a accepted invitation request
     function acceptRequest() {
@@ -118,7 +132,7 @@
         console.log("request denied");
     }
 
-    // Catch the value a teacher inserts when making a class
+    // teacher should be able to set a displayname when making a class
     const className = ref<string>("");
 
     // The name can only contain dash, underscore letters and numbers
@@ -147,7 +161,7 @@
         }
     }
 
-    // If the unique code is copied, set this to true so it's being displayed for the user
+    // show the teacher, copying of the code was a successs
     const copied = ref(false);
 
     // Copy the generated code to the clipboard

From 65144b8cb3b2324b345be3281ed43761a3807fa0 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 17:00:29 +0200
Subject: [PATCH 024/177] refactor: gebruik aparte vue files voor klassen van
 studenten en leerkrachten

---
 frontend/src/views/classes/StudentClasses.vue | 313 +++++++++++
 frontend/src/views/classes/TeacherClasses.vue | 396 ++++++++++++++
 frontend/src/views/classes/UserClasses.vue    | 512 +-----------------
 3 files changed, 715 insertions(+), 506 deletions(-)
 create mode 100644 frontend/src/views/classes/StudentClasses.vue
 create mode 100644 frontend/src/views/classes/TeacherClasses.vue

diff --git a/frontend/src/views/classes/StudentClasses.vue b/frontend/src/views/classes/StudentClasses.vue
new file mode 100644
index 00000000..018f1644
--- /dev/null
+++ b/frontend/src/views/classes/StudentClasses.vue
@@ -0,0 +1,313 @@
+<script setup lang="ts">
+    import { useI18n } from "vue-i18n";
+    import authState from "@/services/auth/auth-service.ts";
+    import { computed, onMounted, ref, type ComputedRef } from "vue";
+    import { validate, version } from "uuid";
+    import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
+    import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
+    import { useCreateJoinRequestMutation, useStudentClassesQuery } from "@/queries/students";
+    import type { StudentDTO } from "@dwengo-1/common/interfaces/student";
+    import { StudentController } from "@/controllers/students";
+
+    const { t } = useI18n();
+    const studentController: StudentController = new StudentController();
+
+    // username of logged in student
+    const username = ref<string | undefined>(undefined);
+
+    // find the username of the logged in user so it can be used to fetch other information
+    // when loading the page
+    onMounted(async () => {
+        const userObject = await authState.loadUser();
+        username.value = userObject?.profile?.preferred_username ?? undefined;
+    });
+
+    // fetch all classes of the logged in student
+    const { data: classesResponse, isLoading, error } = useStudentClassesQuery(username);
+
+    // empty list when classes are not yet loaded, else the list of classes of the user
+    const classes: ComputedRef<ClassDTO[]> = computed(() => {
+        // the classes are not yet fetched
+        if (!classesResponse.value) {
+            return [];
+        }
+        // the user has no classes
+        if (classesResponse.value.classes.length === 0) {
+            return [];
+        }
+        if (typeof classesResponse.value.classes[0] === "string") {
+            // should not occur because value of *full* is true
+            // must be caught because typescript can't know the type
+            // i chose to return an empty list if this occurs
+            // it is also possible to fetch all classes from the id's returned
+            return [];
+        }
+        return classesResponse.value.classes as ClassDTO[];
+    });
+
+    // students of selected class are shown when logged in student presses on the member count
+    const selectedClass = ref<ClassDTO | null>(null);
+    const students = ref<StudentDTO[]>([]);
+
+    // Boolean that handles visibility for dialogs
+    // clicking on membercount will show a dialog with all members
+    const dialog = ref(false);
+
+    // Function to display all members of a class in a dialog
+    async function openDialog(c: ClassDTO) {
+        selectedClass.value = c;
+
+        // Clear previous value
+        students.value = [];
+        dialog.value = true;
+
+        // fetch students from their usernames to display their full names
+        const studentDTOs: (StudentDTO | null)[] = await Promise.all(
+            c.students.map(async (uid) => {
+                try {
+                    const res = await studentController.getByUsername(uid);
+                    return res.student;
+                } catch (_) {
+                    return null;
+                }
+            }),
+        );
+
+        // only show students that are not fetched ass *null*
+        students.value = studentDTOs.filter(Boolean) as StudentDTO[];
+    }
+
+    // hold the code a student gives in to join a class
+    const code = ref<string>("");
+
+    // The code a student sends in to join a class needs to be formatted as v4 to be valid
+    // These rules are used to display a message to the user if they use a code that has an invalid format
+    const codeRules = [
+        (value: string | undefined): string | boolean => {
+            if (value !== undefined && validate(value) && version(value) === 4) return true;
+            return t("invalidFormat");
+        },
+    ];
+
+    // used to send the actual class join request
+    const { mutate, isError } = useCreateJoinRequestMutation();
+
+    // Function called when a student submits a code to join a class
+    function submitCode() {
+        // Check if the code is valid
+        if (code.value !== undefined && validate(code.value) && version(code.value) === 4) {
+            // TODO: uncomment when fixed
+            // mutate( { username : username.value! , classId : code.value });
+
+            console.log("Code submitted:", code.value);
+        }
+    }
+</script>
+<template>
+    <main>
+        <div
+            v-if="isLoading"
+            class="text-center py-10"
+        >
+            <v-progress-circular
+                indeterminate
+                color="primary"
+            />
+            <p>Loading...</p>
+        </div>
+
+        <div
+            v-else-if="error"
+            class="text-center py-10 text-error"
+        >
+            <v-icon large>mdi-alert-circle</v-icon>
+            <p>Error loading: {{ error.message }}</p>
+        </div>
+        <div v-else>
+            <h1 class="title">{{ t("classes") }}</h1>
+            <v-container
+                fluid
+                class="ma-4"
+            >
+                <v-row
+                    no-gutters
+                    fluid
+                >
+                    <v-col
+                        cols="12"
+                        sm="6"
+                        md="6"
+                    >
+                        <v-table class="table">
+                            <thead>
+                                <tr>
+                                    <th class="header">{{ t("classes") }}</th>
+                                    <th class="header">{{ t("members") }}</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr
+                                    v-for="c in classes"
+                                    :key="c.id"
+                                >
+                                    <td>{{ c.displayName }}</td>
+                                    <td
+                                        class="link"
+                                        @click="openDialog(c)"
+                                    >
+                                        {{ c.students.length }}
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </v-table>
+                    </v-col>
+                </v-row>
+            </v-container>
+
+            <v-dialog
+                v-model="dialog"
+                width="400"
+            >
+                <v-card>
+                    <v-card-title> {{ selectedClass?.displayName }} </v-card-title>
+                    <v-card-text>
+                        <ul>
+                            <li
+                                v-for="student in students"
+                                :key="student.username"
+                            >
+                                {{ student.firstName + " " + student.lastName }}
+                            </li>
+                        </ul>
+                    </v-card-text>
+                    <v-card-actions>
+                        <v-btn
+                            color="primary"
+                            @click="dialog = false"
+                            >Close</v-btn
+                        >
+                    </v-card-actions>
+                </v-card>
+            </v-dialog>
+            <div>
+                <div class="join">
+                    <h2>{{ t("joinClass") }}</h2>
+                    <p>{{ t("JoinClassExplanation") }}</p>
+
+                    <v-sheet
+                        class="pa-4 sheet"
+                        max-width="400"
+                    >
+                        <v-form @submit.prevent>
+                            <v-text-field
+                                label="CODE"
+                                v-model="code"
+                                placeholder="XXXXXXXX-XXXX-4XXX-XXXX-XXXXXXXXXXXX"
+                                :rules="codeRules"
+                                variant="outlined"
+                            ></v-text-field>
+                            <v-btn
+                                class="mt-4"
+                                color="#f6faf2"
+                                type="submit"
+                                @click="submitCode"
+                                block
+                                >{{ t("submitCode") }}</v-btn
+                            >
+                        </v-form>
+                    </v-sheet>
+                </div>
+            </div>
+        </div>
+    </main>
+</template>
+<style scoped>
+    .header {
+        font-weight: bold !important;
+        background-color: #0e6942;
+        color: white;
+        padding: 10px;
+    }
+
+    table thead th:first-child {
+        border-top-left-radius: 10px;
+    }
+
+    .table thead th:last-child {
+        border-top-right-radius: 10px;
+    }
+
+    .table tbody tr:nth-child(odd) {
+        background-color: white;
+    }
+
+    .table tbody tr:nth-child(even) {
+        background-color: #f6faf2;
+    }
+
+    td,
+    th {
+        border-bottom: 1px solid #0e6942;
+        border-top: 1px solid #0e6942;
+    }
+
+    .table {
+        width: 90%;
+        padding-top: 10px;
+        border-collapse: collapse;
+    }
+
+    h1 {
+        color: #0e6942;
+        text-transform: uppercase;
+        font-weight: bolder;
+        padding-top: 2%;
+        font-size: 50px;
+    }
+
+    h2 {
+        color: #0e6942;
+        font-size: 30px;
+    }
+
+    .join {
+        display: flex;
+        flex-direction: column;
+        gap: 20px;
+        margin-top: 50px;
+    }
+
+    .link {
+        color: #0b75bb;
+        text-decoration: underline;
+    }
+
+    main {
+        margin-left: 30px;
+    }
+
+    @media screen and (max-width: 800px) {
+        h1 {
+            text-align: center;
+            padding-left: 0;
+        }
+
+        .join {
+            text-align: center;
+            align-items: center;
+            margin-left: 0;
+        }
+
+        .sheet {
+            width: 100%;
+        }
+
+        main {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            margin: 5px;
+        }
+    }
+</style>
diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
new file mode 100644
index 00000000..d27bf40a
--- /dev/null
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -0,0 +1,396 @@
+<script setup lang="ts">
+    import { useI18n } from "vue-i18n";
+    import authState from "@/services/auth/auth-service.ts";
+    import { computed, onMounted, ref, type ComputedRef } from "vue";
+    import { validate, version } from "uuid";
+    import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
+    import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
+    import { useCreateJoinRequestMutation, useStudentClassesQuery } from "@/queries/students";
+    import type { StudentDTO } from "@dwengo-1/common/interfaces/student";
+    import { StudentController } from "@/controllers/students";
+
+    const { t } = useI18n();
+
+    // TODO: remove and use correct type
+    interface Invitation {
+        id: string;
+        class: ClassDTO;
+        sender: TeacherDTO;
+        receiver: TeacherDTO;
+    }
+
+    // username of logged in teacher
+    const username = ref<string | undefined>(undefined);
+
+    // find the username of the logged in user so it can be used to fetch other information
+    // when loading the page
+    onMounted(async () => {
+        const userObject = await authState.loadUser();
+        username.value = userObject?.profile?.preferred_username ?? undefined;
+    });
+
+    // TODO: fetch all classes of the logged in teacher
+    const isLoading = ref(false);
+    const error = ref<Error | null>(null);
+    // const { data: classesResponse, isLoading, error } = useStudentClassesQuery(username);
+
+    // empty list when classes are not yet loaded, else the list of classes of the user
+    const classes: ComputedRef<ClassDTO[]> = computed(() => {
+        return [];
+        // TODO
+        // // the classes are not yet fetched
+        // if (!classesResponse.value) {
+        //     return [];
+        // }
+        //     // the user has no classes
+        //     if (classesResponse.value.classes.length === 0) {
+        //         return [];
+        //     }
+        //     if (typeof classesResponse.value.classes[0] === "string") {
+        //         // should not occur because value of *full* is true
+        //         // must be caught because typescript can't know the type
+        //         // i chose to return an empty list if this occurs
+        //         // it is also possible to fetch all classes from the id's returned
+        //         return [];
+        //     }
+        //     return classesResponse.value.classes as ClassDTO[];
+    });
+
+    // Boolean that handles visibility for dialogs
+    // creating a class will generate a popup with the generated code
+    const dialog = ref(false);
+
+    // duntion to display the dialog showing generated code for created class
+    function openDialog() {
+        //TODO
+    }
+
+    // code generated when new class was created
+    const code = ref<string>("");
+
+    // TODO: implement correctly
+    const invitations = ref<Invitation[]>([]);
+
+    // Function to handle a accepted invitation request
+    function acceptRequest() {
+        //TODO
+        console.log("request accepted");
+    }
+
+    // Function to handle a denied invitation request
+    function denyRequest() {
+        //TODO
+        console.log("request denied");
+    }
+
+    // teacher should be able to set a displayname when making a class
+    const className = ref<string>("");
+
+    // The name can only contain dash, underscore letters and numbers
+    // These rules are used to display a message to the user if the name is not valid
+    const nameRules = [
+        (value: string | undefined) => {
+            if (value) return true;
+            return t("nameIsMandatory");
+        },
+        (value: string | undefined) => {
+            if (value && /^[a-zA-Z0-9_-]+$/.test(value)) return true;
+            return t("onlyUse");
+        },
+    ];
+
+    // Function called when a teacher creates a class
+    function createClass() {
+        // Check if the class name is valid
+        if (className.value && className.value.length > 0 && /^[a-zA-Z0-9_-]+$/.test(className.value)) {
+            //TODO
+            console.log("created class with name: " + className.value);
+
+            // Show the generated code to share with the class
+            dialog.value = true;
+            code.value = "04c7c759-c41e-4ea9-968a-1e2a987ce0ed";
+        }
+    }
+
+    // show the teacher, copying of the code was a successs
+    const copied = ref(false);
+
+    // Copy the generated code to the clipboard
+    function copyToClipboard() {
+        navigator.clipboard.writeText(code.value);
+        copied.value = true;
+    }
+</script>
+<template>
+    <main>
+        <div
+            v-if="isLoading"
+            class="text-center py-10"
+        >
+            <v-progress-circular
+                indeterminate
+                color="primary"
+            />
+            <p>Loading...</p>
+        </div>
+
+        <div
+            v-else-if="error"
+            class="text-center py-10 text-error"
+        >
+            <v-icon large>mdi-alert-circle</v-icon>
+            <p>Error loading: {{ error.message }}</p>
+        </div>
+        <div v-else>
+            <h1 class="title">{{ t("classes") }}</h1>
+            <v-container
+                fluid
+                class="ma-4"
+            >
+                <v-row
+                    no-gutters
+                    fluid
+                >
+                    <v-col
+                        cols="12"
+                        sm="6"
+                        md="6"
+                    >
+                        <v-table class="table">
+                            <thead>
+                                <tr>
+                                    <th class="header">{{ t("classes") }}</th>
+                                    <th class="header">
+                                        {{ t("code") }}
+                                    </th>
+                                    <th class="header">{{ t("members") }}</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr
+                                    v-for="c in classes"
+                                    :key="c.id"
+                                >
+                                    <td>
+                                        <v-btn
+                                            :to="`/user/class/${c.id}`"
+                                            variant="text"
+                                        >
+                                            {{ c.displayName }}
+                                            <v-icon end> mdi-menu-right </v-icon>
+                                        </v-btn>
+                                    </td>
+                                    <td>{{ c.id }}</td>
+                                    <td>{{ c.students.length }}</td>
+                                </tr>
+                            </tbody>
+                        </v-table>
+                    </v-col>
+                    <v-col
+                        cols="12"
+                        sm="6"
+                        md="6"
+                    >
+                        <div>
+                            <h2>{{ t("createClass") }}</h2>
+
+                            <v-sheet
+                                class="pa-4 sheet"
+                                max-width="600px"
+                            >
+                                <p>{{ t("createClassInstructions") }}</p>
+                                <v-form @submit.prevent>
+                                    <v-text-field
+                                        class="mt-4"
+                                        :label="`${t('classname')}`"
+                                        v-model="className"
+                                        :placeholder="`${t('EnterNameOfClass')}`"
+                                        :rules="nameRules"
+                                        variant="outlined"
+                                    ></v-text-field>
+                                    <v-btn
+                                        class="mt-4"
+                                        color="#f6faf2"
+                                        type="submit"
+                                        @click="createClass"
+                                        block
+                                        >{{ t("create") }}</v-btn
+                                    >
+                                </v-form>
+                            </v-sheet>
+                            <v-container>
+                                <v-dialog
+                                    v-model="dialog"
+                                    max-width="400px"
+                                >
+                                    <v-card>
+                                        <v-card-title class="headline">code</v-card-title>
+                                        <v-card-text>
+                                            <v-text-field
+                                                v-model="code"
+                                                readonly
+                                                append-inner-icon="mdi-content-copy"
+                                                @click:append-inner="copyToClipboard"
+                                            ></v-text-field>
+                                            <v-slide-y-transition>
+                                                <div
+                                                    v-if="copied"
+                                                    class="text-center mt-2"
+                                                >
+                                                    {{ t("copied") }}
+                                                </div>
+                                            </v-slide-y-transition>
+                                        </v-card-text>
+                                        <v-card-actions>
+                                            <v-spacer></v-spacer>
+                                            <v-btn
+                                                text
+                                                @click="
+                                                    dialog = false;
+                                                    copied = false;
+                                                "
+                                            >
+                                                {{ t("close") }}
+                                            </v-btn>
+                                        </v-card-actions>
+                                    </v-card>
+                                </v-dialog>
+                            </v-container>
+                        </div>
+                    </v-col>
+                </v-row>
+            </v-container>
+
+            <h1 class="title">
+                {{ t("invitations") }}
+            </h1>
+            <v-table class="table">
+                <thead>
+                    <tr>
+                        <th class="header">{{ t("class") }}</th>
+                        <th class="header">{{ t("sender") }}</th>
+                        <th class="header"></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr
+                        v-for="i in invitations"
+                        :key="i.id"
+                    >
+                        <td>
+                            {{ i.class.displayName }}
+                        </td>
+                        <td>{{ i.sender.firstName + " " + i.sender.lastName }}</td>
+                        <td class="text-right">
+                            <div>
+                                <v-btn
+                                    color="green"
+                                    @click="acceptRequest"
+                                    class="mr-2"
+                                >
+                                    {{ t("accept") }}
+                                </v-btn>
+                                <v-btn
+                                    color="red"
+                                    @click="denyRequest"
+                                >
+                                    {{ t("deny") }}
+                                </v-btn>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </v-table>
+        </div>
+    </main>
+</template>
+<style scoped>
+    .header {
+        font-weight: bold !important;
+        background-color: #0e6942;
+        color: white;
+        padding: 10px;
+    }
+
+    table thead th:first-child {
+        border-top-left-radius: 10px;
+    }
+
+    .table thead th:last-child {
+        border-top-right-radius: 10px;
+    }
+
+    .table tbody tr:nth-child(odd) {
+        background-color: white;
+    }
+
+    .table tbody tr:nth-child(even) {
+        background-color: #f6faf2;
+    }
+
+    td,
+    th {
+        border-bottom: 1px solid #0e6942;
+        border-top: 1px solid #0e6942;
+    }
+
+    .table {
+        width: 90%;
+        padding-top: 10px;
+        border-collapse: collapse;
+    }
+
+    h1 {
+        color: #0e6942;
+        text-transform: uppercase;
+        font-weight: bolder;
+        padding-top: 2%;
+        font-size: 50px;
+    }
+
+    h2 {
+        color: #0e6942;
+        font-size: 30px;
+    }
+
+    .join {
+        display: flex;
+        flex-direction: column;
+        gap: 20px;
+        margin-top: 50px;
+    }
+
+    .link {
+        color: #0b75bb;
+        text-decoration: underline;
+    }
+
+    main {
+        margin-left: 30px;
+    }
+
+    @media screen and (max-width: 800px) {
+        h1 {
+            text-align: center;
+            padding-left: 0;
+        }
+
+        .join {
+            text-align: center;
+            align-items: center;
+            margin-left: 0;
+        }
+
+        .sheet {
+            width: 100%;
+        }
+
+        main {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            margin: 5px;
+        }
+    }
+</style>
diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index 2a4403c1..2e2f8a46 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -1,517 +1,17 @@
 <script setup lang="ts">
-    import { useI18n } from "vue-i18n";
     import authState from "@/services/auth/auth-service.ts";
-    import { computed, onMounted, ref, type ComputedRef } from "vue";
-    import { validate, version } from "uuid";
-    import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
-    import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
-    import { useCreateJoinRequestMutation, useStudentClassesQuery } from "@/queries/students";
-    import type { StudentDTO } from "@dwengo-1/common/interfaces/student";
-    import { StudentController } from "@/controllers/students";
-
-    const { t } = useI18n();
-    const studentController: StudentController = new StudentController();
-
-    // TODO: remove and use correct type
-    interface Invitation {
-        id: string;
-        class: ClassDTO;
-        sender: TeacherDTO;
-        receiver: TeacherDTO;
-    }
+    import TeacherClasses from "./TeacherClasses.vue";
+    import StudentClasses from "./StudentClasses.vue";
 
     // determine if role is student or teacher to render correct view
     const role: string = authState.authState.activeRole!;
-
-    // username of logged in student or teacher
-    const username = ref<string | undefined>(undefined);
-
-    // find the username of the logged in user so it can be used to fetch other information
-    // when loading the page
-    onMounted(async () => {
-        const userObject = await authState.loadUser();
-        username.value = userObject?.profile?.preferred_username ?? undefined;
-    });
-
-    // fetch all classes of the logged in student
-    const { data: classesResponse, isLoading, error } = useStudentClassesQuery(username);
-
-    // empty list when classes are not yet loaded, else the list of classes of the user
-    const classes: ComputedRef<ClassDTO[]> = computed(() => {
-
-        // the classes are not yet fetched
-        if (!classesResponse.value) {
-            return [];
-        }
-            // the user has no classes
-            if (classesResponse.value.classes.length === 0) {
-                return [];
-            }
-            if (typeof classesResponse.value.classes[0] === "string") {
-                // should not occur because value of *full* is true
-                // must be caught because typescript can't know the type
-                // i chose to return an empty list if this occurs
-                // it is also possible to fetch all classes from the id's returned
-                return [];
-            }
-            return classesResponse.value.classes as ClassDTO[];
-        
-    });
-
-    // students of selected class are shown when logged in student presses on the member count
-    const selectedClass = ref<ClassDTO | null>(null);
-    const students = ref<StudentDTO[]>([]);
-
-    // Boolean that handles visibility for dialogs
-    // For students: clicking on membercount will show a dialog with all members
-    // For teachers: creating a class will generate a popup with the generated code
-    const dialog = ref(false);
-
-    // Function to display all members of a class in a dialog
-    async function openDialog(c: ClassDTO) {
-        selectedClass.value = c;
-
-        // Clear previous value
-        students.value = [];
-        dialog.value = true;
-
-        // fetch students from their usernames to display their full names
-        const studentDTOs: (StudentDTO | null)[] = await Promise.all(
-            c.students.map(async (uid) => {
-                try {
-                    const res = await studentController.getByUsername(uid);
-                    return res.student;
-                } catch (_) {
-                    return null;
-                }
-            }),
-        );
-
-        // only show students that are not fetched ass *null*
-        students.value = studentDTOs.filter(Boolean) as StudentDTO[];
-    }
-
-    // For students: code that they give in when sending a class join request
-    // For teachers: code that they get when they create a new class
-    const code = ref<string>("");
-
-    // The code a student sends in to join a class needs to be formatted as v4 to be valid
-    // These rules are used to display a message to the user if they use a code that has an invalid format
-    const codeRules = [
-        (value: string | undefined) : string | boolean => {
-            if (value !== undefined && validate(value) && version(value) === 4) return true;
-            return t("invalidFormat");
-        },
-    ];
-
-    const { mutate, isError } = useCreateJoinRequestMutation();
-
-    // Function called when a student submits a code to join a class
-    function submitCode() {
-        // Check if the code is valid
-        if (code.value !== undefined && validate(code.value) && version(code.value) === 4) {
-            // TODO: uncomment when fixed
-            // mutate( { username : username.value! , classId : code.value });
-            
-            console.log("Code submitted:", code.value);
-        }
-    }
-
-    // TODO: implement correctly
-    const invitations = ref<Invitation[]>([]);
-
-    // Function to handle a accepted invitation request
-    function acceptRequest() {
-        //TODO
-        console.log("request accepted");
-    }
-
-    // Function to handle a denied invitation request
-    function denyRequest() {
-        //TODO
-        console.log("request denied");
-    }
-
-    // teacher should be able to set a displayname when making a class
-    const className = ref<string>("");
-
-    // The name can only contain dash, underscore letters and numbers
-    // These rules are used to display a message to the user if the name is not valid
-    const nameRules = [
-        (value: string | undefined) => {
-            if (value) return true;
-            return t("nameIsMandatory");
-        },
-        (value: string | undefined) => {
-            if (value && /^[a-zA-Z0-9_-]+$/.test(value)) return true;
-            return t("onlyUse");
-        },
-    ];
-
-    // Function called when a teacher creates a class
-    function createClass() {
-        // Check if the class name is valid
-        if (className.value && className.value.length > 0 && /^[a-zA-Z0-9_-]+$/.test(className.value)) {
-            //TODO
-            console.log("created class with name: " + className.value);
-
-            // Show the generated code to share with the class
-            dialog.value = true;
-            code.value = "04c7c759-c41e-4ea9-968a-1e2a987ce0ed";
-        }
-    }
-
-    // show the teacher, copying of the code was a successs
-    const copied = ref(false);
-
-    // Copy the generated code to the clipboard
-    function copyToClipboard() {
-        navigator.clipboard.writeText(code.value);
-        copied.value = true;
-    }
 </script>
+
 <template>
     <main>
-        <div
-            v-if="isLoading"
-            class="text-center py-10"
-        >
-            <v-progress-circular
-                indeterminate
-                color="primary"
-            />
-            <p>Loading...</p>
-        </div>
-
-        <div
-            v-else-if="error"
-            class="text-center py-10 text-error"
-        >
-            <v-icon large>mdi-alert-circle</v-icon>
-            <p>Error loading: {{ error.message }}</p>
-        </div>
-        <div v-else>
-            <h1 class="title">{{ t("classes") }}</h1>
-            <v-container
-                fluid
-                class="ma-4"
-            >
-                <v-row
-                    no-gutters
-                    fluid
-                >
-                    <v-col
-                        cols="12"
-                        sm="6"
-                        md="6"
-                    >
-                        <v-table class="table">
-                            <thead>
-                                <tr>
-                                    <th class="header">{{ t("classes") }}</th>
-                                    <th
-                                        class="header"
-                                        v-if="role === 'teacher'"
-                                    >
-                                        {{ t("code") }}
-                                    </th>
-                                    <th class="header">{{ t("members") }}</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr
-                                    v-for="c in classes"
-                                    :key="c.id"
-                                >
-                                    <td v-if="role === 'student'">{{ c.displayName }}</td>
-                                    <td v-else>
-                                        <v-btn
-                                            :to="`/user/class/${c.id}`"
-                                            variant="text"
-                                        >
-                                            {{ c.displayName }}
-                                            <v-icon end> mdi-menu-right </v-icon>
-                                        </v-btn>
-                                    </td>
-                                    <td v-if="role === 'teacher'">{{ c.id }}</td>
-                                    <td
-                                        v-if="role === 'student'"
-                                        class="link"
-                                        @click="openDialog(c)"
-                                    >
-                                        {{ c.students.length }}
-                                    </td>
-                                    <td v-else>{{ c.students.length }}</td>
-                                </tr>
-                            </tbody>
-                        </v-table>
-                    </v-col>
-                    <v-col
-                        cols="12"
-                        sm="6"
-                        md="6"
-                    >
-                        <div v-if="role === 'teacher'">
-                            <h2>{{ t("createClass") }}</h2>
-
-                            <v-sheet
-                                class="pa-4 sheet"
-                                max-width="600px"
-                            >
-                                <p>{{ t("createClassInstructions") }}</p>
-                                <v-form @submit.prevent>
-                                    <v-text-field
-                                        class="mt-4"
-                                        :label="`${t('classname')}`"
-                                        v-model="className"
-                                        :placeholder="`${t('EnterNameOfClass')}`"
-                                        :rules="nameRules"
-                                        variant="outlined"
-                                    ></v-text-field>
-                                    <v-btn
-                                        class="mt-4"
-                                        color="#f6faf2"
-                                        type="submit"
-                                        @click="createClass"
-                                        block
-                                        >{{ t("create") }}</v-btn
-                                    >
-                                </v-form>
-                            </v-sheet>
-                            <v-container>
-                                <v-dialog
-                                    v-model="dialog"
-                                    max-width="400px"
-                                >
-                                    <v-card>
-                                        <v-card-title class="headline">code</v-card-title>
-                                        <v-card-text>
-                                            <v-text-field
-                                                v-model="code"
-                                                readonly
-                                                append-inner-icon="mdi-content-copy"
-                                                @click:append-inner="copyToClipboard"
-                                            ></v-text-field>
-                                            <v-slide-y-transition>
-                                                <div
-                                                    v-if="copied"
-                                                    class="text-center mt-2"
-                                                >
-                                                    {{ t("copied") }}
-                                                </div>
-                                            </v-slide-y-transition>
-                                        </v-card-text>
-                                        <v-card-actions>
-                                            <v-spacer></v-spacer>
-                                            <v-btn
-                                                text
-                                                @click="
-                                                    dialog = false;
-                                                    copied = false;
-                                                "
-                                            >
-                                                {{ t("close") }}
-                                            </v-btn>
-                                        </v-card-actions>
-                                    </v-card>
-                                </v-dialog>
-                            </v-container>
-                        </div>
-                    </v-col>
-                </v-row>
-            </v-container>
-
-            <h1
-                v-if="role === 'teacher'"
-                class="title"
-            >
-                {{ t("invitations") }}
-            </h1>
-            <v-table
-                v-if="role === 'teacher'"
-                class="table"
-            >
-                <thead>
-                    <tr>
-                        <th class="header">{{ t("class") }}</th>
-                        <th class="header">{{ t("sender") }}</th>
-                        <th class="header"></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr
-                        v-for="i in invitations"
-                        :key="i.id"
-                    >
-                        <td>
-                            {{ i.class.displayName }}
-                        </td>
-                        <td>{{ i.sender.firstName + " " + i.sender.lastName }}</td>
-                        <td class="text-right">
-                            <div>
-                                <v-btn
-                                    color="green"
-                                    @click="acceptRequest"
-                                    class="mr-2"
-                                >
-                                    {{ t("accept") }}
-                                </v-btn>
-                                <v-btn
-                                    color="red"
-                                    @click="denyRequest"
-                                >
-                                    {{ t("deny") }}
-                                </v-btn>
-                            </div>
-                        </td>
-                    </tr>
-                </tbody>
-            </v-table>
-
-            <v-dialog
-                v-model="dialog"
-                width="400"
-            >
-                <v-card>
-                    <v-card-title> {{ selectedClass?.displayName }} </v-card-title>
-                    <v-card-text>
-                        <ul>
-                            <li
-                                v-for="student in students"
-                                :key="student.username"
-                            >
-                                {{ student.firstName + " " + student.lastName }}
-                            </li>
-                        </ul>
-                    </v-card-text>
-                    <v-card-actions>
-                        <v-btn
-                            color="primary"
-                            @click="dialog = false"
-                            >Close</v-btn
-                        >
-                    </v-card-actions>
-                </v-card>
-            </v-dialog>
-            <div v-if="role === 'student'">
-                <div class="join">
-                    <h2>{{ t("joinClass") }}</h2>
-                    <p>{{ t("JoinClassExplanation") }}</p>
-
-                    <v-sheet
-                        class="pa-4 sheet"
-                        max-width="400"
-                    >
-                        <v-form @submit.prevent>
-                            <v-text-field
-                                label="CODE"
-                                v-model="code"
-                                placeholder="XXXXXXXX-XXXX-4XXX-XXXX-XXXXXXXXXXXX"
-                                :rules="codeRules"
-                                variant="outlined"
-                            ></v-text-field>
-                            <v-btn
-                                class="mt-4"
-                                color="#f6faf2"
-                                type="submit"
-                                @click="submitCode"
-                                block
-                                >{{ t("submitCode") }}</v-btn
-                            >
-                        </v-form>
-                    </v-sheet>
-                </div>
-            </div>
-        </div>
+        <TeacherClasses v-if="role === 'teacher'"></TeacherClasses>
+        <StudentClasses v-else></StudentClasses>
     </main>
 </template>
-<style scoped>
-    .header {
-        font-weight: bold !important;
-        background-color: #0e6942;
-        color: white;
-        padding: 10px;
-    }
 
-    table thead th:first-child {
-        border-top-left-radius: 10px;
-    }
-
-    .table thead th:last-child {
-        border-top-right-radius: 10px;
-    }
-
-    .table tbody tr:nth-child(odd) {
-        background-color: white;
-    }
-
-    .table tbody tr:nth-child(even) {
-        background-color: #f6faf2;
-    }
-
-    td,
-    th {
-        border-bottom: 1px solid #0e6942;
-        border-top: 1px solid #0e6942;
-    }
-
-    .table {
-        width: 90%;
-        padding-top: 10px;
-        border-collapse: collapse;
-    }
-
-    h1 {
-        color: #0e6942;
-        text-transform: uppercase;
-        font-weight: bolder;
-        padding-top: 2%;
-        font-size: 50px;
-    }
-
-    h2 {
-        color: #0e6942;
-        font-size: 30px;
-    }
-
-    .join {
-        display: flex;
-        flex-direction: column;
-        gap: 20px;
-        margin-top: 50px;
-    }
-
-    .link {
-        color: #0b75bb;
-        text-decoration: underline;
-    }
-
-    main {
-        margin-left: 30px;
-    }
-
-    @media screen and (max-width: 800px) {
-        h1 {
-            text-align: center;
-            padding-left: 0;
-        }
-
-        .join {
-            text-align: center;
-            align-items: center;
-            margin-left: 0;
-        }
-
-        .sheet {
-            width: 100%;
-        }
-
-        main {
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
-            margin: 5px;
-        }
-    }
-</style>
+<style scoped></style>

From b25901cbb71e335c9555b9e5cbd56b8f6a093d9c Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 17:06:15 +0200
Subject: [PATCH 025/177] style: lint

---
 frontend/src/views/classes/StudentClasses.vue | 40 ++++++++--------
 frontend/src/views/classes/TeacherClasses.vue | 46 +++++++++----------
 frontend/src/views/classes/UserClasses.vue    |  2 +-
 3 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/frontend/src/views/classes/StudentClasses.vue b/frontend/src/views/classes/StudentClasses.vue
index 018f1644..688c9132 100644
--- a/frontend/src/views/classes/StudentClasses.vue
+++ b/frontend/src/views/classes/StudentClasses.vue
@@ -3,7 +3,6 @@
     import authState from "@/services/auth/auth-service.ts";
     import { computed, onMounted, ref, type ComputedRef } from "vue";
     import { validate, version } from "uuid";
-    import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
     import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
     import { useCreateJoinRequestMutation, useStudentClassesQuery } from "@/queries/students";
     import type { StudentDTO } from "@dwengo-1/common/interfaces/student";
@@ -12,56 +11,56 @@
     const { t } = useI18n();
     const studentController: StudentController = new StudentController();
 
-    // username of logged in student
+    // Username of logged in student
     const username = ref<string | undefined>(undefined);
 
-    // find the username of the logged in user so it can be used to fetch other information
-    // when loading the page
+    // Find the username of the logged in user so it can be used to fetch other information
+    // When loading the page
     onMounted(async () => {
         const userObject = await authState.loadUser();
         username.value = userObject?.profile?.preferred_username ?? undefined;
     });
 
-    // fetch all classes of the logged in student
+    // Fetch all classes of the logged in student
     const { data: classesResponse, isLoading, error } = useStudentClassesQuery(username);
 
-    // empty list when classes are not yet loaded, else the list of classes of the user
+    // Empty list when classes are not yet loaded, else the list of classes of the user
     const classes: ComputedRef<ClassDTO[]> = computed(() => {
-        // the classes are not yet fetched
+        // The classes are not yet fetched
         if (!classesResponse.value) {
             return [];
         }
-        // the user has no classes
+        // The user has no classes
         if (classesResponse.value.classes.length === 0) {
             return [];
         }
         if (typeof classesResponse.value.classes[0] === "string") {
-            // should not occur because value of *full* is true
-            // must be caught because typescript can't know the type
-            // i chose to return an empty list if this occurs
-            // it is also possible to fetch all classes from the id's returned
+            // Should not occur because value of *full* is true
+            // Must be caught because typescript can't know the type
+            // I chose to return an empty list if this occurs
+            // It is also possible to fetch all classes from the id's returned
             return [];
         }
         return classesResponse.value.classes as ClassDTO[];
     });
 
-    // students of selected class are shown when logged in student presses on the member count
+    // Students of selected class are shown when logged in student presses on the member count
     const selectedClass = ref<ClassDTO | null>(null);
     const students = ref<StudentDTO[]>([]);
 
     // Boolean that handles visibility for dialogs
-    // clicking on membercount will show a dialog with all members
+    // Clicking on membercount will show a dialog with all members
     const dialog = ref(false);
 
     // Function to display all members of a class in a dialog
-    async function openDialog(c: ClassDTO) {
+    async function openDialog(c: ClassDTO) : Promise<void> {
         selectedClass.value = c;
 
         // Clear previous value
         students.value = [];
         dialog.value = true;
 
-        // fetch students from their usernames to display their full names
+        // Fetch students from their usernames to display their full names
         const studentDTOs: (StudentDTO | null)[] = await Promise.all(
             c.students.map(async (uid) => {
                 try {
@@ -73,11 +72,11 @@
             }),
         );
 
-        // only show students that are not fetched ass *null*
+        // Only show students that are not fetched ass *null*
         students.value = studentDTOs.filter(Boolean) as StudentDTO[];
     }
 
-    // hold the code a student gives in to join a class
+    // Hold the code a student gives in to join a class
     const code = ref<string>("");
 
     // The code a student sends in to join a class needs to be formatted as v4 to be valid
@@ -89,15 +88,14 @@
         },
     ];
 
-    // used to send the actual class join request
+    // Used to send the actual class join request
     const { mutate, isError } = useCreateJoinRequestMutation();
 
     // Function called when a student submits a code to join a class
     function submitCode() {
         // Check if the code is valid
         if (code.value !== undefined && validate(code.value) && version(code.value) === 4) {
-            // TODO: uncomment when fixed
-            // mutate( { username : username.value! , classId : code.value });
+            mutate( { username : username.value! , classId : code.value });
 
             console.log("Code submitted:", code.value);
         }
diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
index d27bf40a..86df1634 100644
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -2,12 +2,8 @@
     import { useI18n } from "vue-i18n";
     import authState from "@/services/auth/auth-service.ts";
     import { computed, onMounted, ref, type ComputedRef } from "vue";
-    import { validate, version } from "uuid";
     import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
     import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
-    import { useCreateJoinRequestMutation, useStudentClassesQuery } from "@/queries/students";
-    import type { StudentDTO } from "@dwengo-1/common/interfaces/student";
-    import { StudentController } from "@/controllers/students";
 
     const { t } = useI18n();
 
@@ -19,11 +15,11 @@
         receiver: TeacherDTO;
     }
 
-    // username of logged in teacher
+    // Username of logged in teacher
     const username = ref<string | undefined>(undefined);
 
-    // find the username of the logged in user so it can be used to fetch other information
-    // when loading the page
+    // Find the username of the logged in user so it can be used to fetch other information
+    // When loading the page
     onMounted(async () => {
         const userObject = await authState.loadUser();
         username.value = userObject?.profile?.preferred_username ?? undefined;
@@ -32,40 +28,40 @@
     // TODO: fetch all classes of the logged in teacher
     const isLoading = ref(false);
     const error = ref<Error | null>(null);
-    // const { data: classesResponse, isLoading, error } = useStudentClassesQuery(username);
+    // Const { data: classesResponse, isLoading, error } = useStudentClassesQuery(username);
 
-    // empty list when classes are not yet loaded, else the list of classes of the user
-    const classes: ComputedRef<ClassDTO[]> = computed(() => {
-        return [];
+    // Empty list when classes are not yet loaded, else the list of classes of the user
+    const classes: ComputedRef<ClassDTO[]> = computed(() => 
+         []
         // TODO
         // // the classes are not yet fetched
-        // if (!classesResponse.value) {
-        //     return [];
+        // If (!classesResponse.value) {
+        //     Return [];
         // }
         //     // the user has no classes
-        //     if (classesResponse.value.classes.length === 0) {
-        //         return [];
+        //     If (classesResponse.value.classes.length === 0) {
+        //         Return [];
         //     }
-        //     if (typeof classesResponse.value.classes[0] === "string") {
+        //     If (typeof classesResponse.value.classes[0] === "string") {
         //         // should not occur because value of *full* is true
         //         // must be caught because typescript can't know the type
         //         // i chose to return an empty list if this occurs
         //         // it is also possible to fetch all classes from the id's returned
-        //         return [];
+        //         Return [];
         //     }
-        //     return classesResponse.value.classes as ClassDTO[];
-    });
+        //     Return classesResponse.value.classes as ClassDTO[];
+    );
 
     // Boolean that handles visibility for dialogs
-    // creating a class will generate a popup with the generated code
+    // Creating a class will generate a popup with the generated code
     const dialog = ref(false);
 
-    // duntion to display the dialog showing generated code for created class
-    function openDialog() {
+    // Duntion to display the dialog showing generated code for created class
+    function openDialog() : void {
         //TODO
     }
 
-    // code generated when new class was created
+    // Code generated when new class was created
     const code = ref<string>("");
 
     // TODO: implement correctly
@@ -83,7 +79,7 @@
         console.log("request denied");
     }
 
-    // teacher should be able to set a displayname when making a class
+    // Teacher should be able to set a displayname when making a class
     const className = ref<string>("");
 
     // The name can only contain dash, underscore letters and numbers
@@ -112,7 +108,7 @@
         }
     }
 
-    // show the teacher, copying of the code was a successs
+    // Show the teacher, copying of the code was a successs
     const copied = ref(false);
 
     // Copy the generated code to the clipboard
diff --git a/frontend/src/views/classes/UserClasses.vue b/frontend/src/views/classes/UserClasses.vue
index 2e2f8a46..566bd02a 100644
--- a/frontend/src/views/classes/UserClasses.vue
+++ b/frontend/src/views/classes/UserClasses.vue
@@ -3,7 +3,7 @@
     import TeacherClasses from "./TeacherClasses.vue";
     import StudentClasses from "./StudentClasses.vue";
 
-    // determine if role is student or teacher to render correct view
+    // Determine if role is student or teacher to render correct view
     const role: string = authState.authState.activeRole!;
 </script>
 

From 6244093584479ebaa79591433dc911260c0be203 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 17:25:03 +0200
Subject: [PATCH 026/177] fix: juiste input wordt doorgegeven

---
 frontend/src/controllers/students.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/controllers/students.ts b/frontend/src/controllers/students.ts
index f74f02da..82fb2831 100644
--- a/frontend/src/controllers/students.ts
+++ b/frontend/src/controllers/students.ts
@@ -70,7 +70,7 @@ export class StudentController extends BaseController {
     }
 
     async createJoinRequest(username: string, classId: string): Promise<JoinRequestResponse> {
-        return this.post<JoinRequestResponse>(`/${username}/joinRequests}`, classId);
+        return this.post<JoinRequestResponse>(`/${username}/joinRequests}`, { classId });
     }
 
     async deleteJoinRequest(username: string, classId: string): Promise<JoinRequestResponse> {

From 7e6b225a9f90d1b04944256003f4f09e9540b4e3 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 17:25:15 +0200
Subject: [PATCH 027/177] fix: juiste import

---
 frontend/src/queries/students.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/queries/students.ts b/frontend/src/queries/students.ts
index 822083d9..d5edad7a 100644
--- a/frontend/src/queries/students.ts
+++ b/frontend/src/queries/students.ts
@@ -19,7 +19,7 @@ import type { AssignmentsResponse } from "@/controllers/assignments.ts";
 import type { GroupsResponse } from "@/controllers/groups.ts";
 import type { SubmissionsResponse } from "@/controllers/submissions.ts";
 import type { QuestionsResponse } from "@/controllers/questions.ts";
-import type { StudentDTO } from "@dwengo-1/interfaces/student";
+import type { StudentDTO } from "@dwengo-1/common/interfaces/student";
 
 const studentController = new StudentController();
 

From 575ec2a47d54bbee5959c8ba51ad95ef0124a0f7 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Sat, 5 Apr 2025 17:41:22 +0200
Subject: [PATCH 028/177] fix: json body controller + type errors query voor
 student

---
 frontend/src/controllers/students.ts | 2 +-
 frontend/src/queries/students.ts     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/controllers/students.ts b/frontend/src/controllers/students.ts
index f74f02da..e9da9c74 100644
--- a/frontend/src/controllers/students.ts
+++ b/frontend/src/controllers/students.ts
@@ -70,7 +70,7 @@ export class StudentController extends BaseController {
     }
 
     async createJoinRequest(username: string, classId: string): Promise<JoinRequestResponse> {
-        return this.post<JoinRequestResponse>(`/${username}/joinRequests}`, classId);
+        return this.post<JoinRequestResponse>(`/${username}/joinRequests`, { classId });
     }
 
     async deleteJoinRequest(username: string, classId: string): Promise<JoinRequestResponse> {
diff --git a/frontend/src/queries/students.ts b/frontend/src/queries/students.ts
index 822083d9..6e6bfe5b 100644
--- a/frontend/src/queries/students.ts
+++ b/frontend/src/queries/students.ts
@@ -179,7 +179,7 @@ export function useCreateJoinRequestMutation(): UseMutationReturnType<
         mutationFn: async ({ username, classId }) => studentController.createJoinRequest(username, classId),
         onSuccess: async (newJoinRequest) => {
             await queryClient.invalidateQueries({
-                queryKey: studentJoinRequestsQueryKey(newJoinRequest.request.requester),
+                queryKey: studentJoinRequestsQueryKey(newJoinRequest.request.requester.username),
             });
         },
     });
@@ -196,7 +196,7 @@ export function useDeleteJoinRequestMutation(): UseMutationReturnType<
     return useMutation({
         mutationFn: async ({ username, classId }) => studentController.deleteJoinRequest(username, classId),
         onSuccess: async (deletedJoinRequest) => {
-            const username = deletedJoinRequest.request.requester;
+            const username = deletedJoinRequest.request.requester.username;
             const classId = deletedJoinRequest.request.class;
             await queryClient.invalidateQueries({ queryKey: studentJoinRequestsQueryKey(username) });
             await queryClient.invalidateQueries({ queryKey: studentJoinRequestQueryKey(username, classId) });

From bc2ce7fee39ea555935c122b4ee8353fc6e6494c Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 18:16:28 +0200
Subject: [PATCH 029/177] feat: code om klas te joinen klaar

---
 frontend/src/views/classes/StudentClasses.vue | 47 ++++++++++++++++---
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/classes/StudentClasses.vue b/frontend/src/views/classes/StudentClasses.vue
index 688c9132..b376df46 100644
--- a/frontend/src/views/classes/StudentClasses.vue
+++ b/frontend/src/views/classes/StudentClasses.vue
@@ -53,7 +53,7 @@
     const dialog = ref(false);
 
     // Function to display all members of a class in a dialog
-    async function openDialog(c: ClassDTO) : Promise<void> {
+    async function openDialog(c: ClassDTO): Promise<void> {
         selectedClass.value = c;
 
         // Clear previous value
@@ -83,23 +83,49 @@
     // These rules are used to display a message to the user if they use a code that has an invalid format
     const codeRules = [
         (value: string | undefined): string | boolean => {
-            if (value !== undefined && validate(value) && version(value) === 4) return true;
-            return t("invalidFormat");
+            if (value === undefined || value === "") {
+                return true;
+            } else if (value !== undefined && validate(value) && version(value) === 4) {
+                return true;
+            } else {
+                return t("invalidFormat");
+            }
         },
     ];
 
     // Used to send the actual class join request
-    const { mutate, isError } = useCreateJoinRequestMutation();
+    const { mutate } = useCreateJoinRequestMutation();
 
     // Function called when a student submits a code to join a class
     function submitCode() {
         // Check if the code is valid
         if (code.value !== undefined && validate(code.value) && version(code.value) === 4) {
-            mutate( { username : username.value! , classId : code.value });
-
-            console.log("Code submitted:", code.value);
+            mutate(
+                { username: username.value!, classId: code.value },
+                {
+                    onSuccess: () => {
+                        showSnackbar(t("sent"), "success");
+                    },
+                    onError: (e) => {
+                        showSnackbar(t("failed") + ": " + e.message, "error");
+                    },
+                },
+            );
+            code.value = "";
         }
     }
+
+    const snackbar = ref({
+        visible: false,
+        message: "",
+        color: "success",
+    });
+
+    const showSnackbar = (message: string, color: string) => {
+        snackbar.value.message = message;
+        snackbar.value.color = color;
+        snackbar.value.visible = true;
+    };
 </script>
 <template>
     <main>
@@ -217,6 +243,13 @@
                 </div>
             </div>
         </div>
+        <v-snackbar
+            v-model="snackbar.visible"
+            :color="snackbar.color"
+            timeout="3000"
+        >
+            {{ snackbar.message }}
+        </v-snackbar>
     </main>
 </template>
 <style scoped>

From b84221aa367ff0fe9121b61465e91000938b113d Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 18:16:42 +0200
Subject: [PATCH 030/177] feat: vertalingen

---
 frontend/src/i18n/locale/de.json | 4 +++-
 frontend/src/i18n/locale/en.json | 4 +++-
 frontend/src/i18n/locale/fr.json | 4 +++-
 frontend/src/i18n/locale/nl.json | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/frontend/src/i18n/locale/de.json b/frontend/src/i18n/locale/de.json
index 2a6760e6..4e6d0190 100644
--- a/frontend/src/i18n/locale/de.json
+++ b/frontend/src/i18n/locale/de.json
@@ -71,5 +71,7 @@
     "close": "schließen",
     "copied": "kopiert!",
     "accept": "akzeptieren",
-    "deny": "verweigern"
+    "deny": "verweigern",
+    "sent": "sent",
+    "failed": "gescheitert"
 }
diff --git a/frontend/src/i18n/locale/en.json b/frontend/src/i18n/locale/en.json
index 32ee4868..06339d2a 100644
--- a/frontend/src/i18n/locale/en.json
+++ b/frontend/src/i18n/locale/en.json
@@ -71,5 +71,7 @@
     "copied": "copied!",
     "accept": "accept",
     "deny": "deny",
-    "createClassInstructions": "Enter a name for your class and click on create. A window will appear with a code that you can copy. Give this code to your students and they will be able to join."
+    "createClassInstructions": "Enter a name for your class and click on create. A window will appear with a code that you can copy. Give this code to your students and they will be able to join.",
+    "sent": "sent",
+    "failed": "failed"
 }
diff --git a/frontend/src/i18n/locale/fr.json b/frontend/src/i18n/locale/fr.json
index b24d58e1..3ce48318 100644
--- a/frontend/src/i18n/locale/fr.json
+++ b/frontend/src/i18n/locale/fr.json
@@ -71,5 +71,7 @@
     "close": "fermer",
     "copied": "copié!",
     "accept": "accepter",
-    "deny": "refuser"
+    "deny": "refuser",
+    "sent": "envoyé",
+    "failed": "échoué"
 }
diff --git a/frontend/src/i18n/locale/nl.json b/frontend/src/i18n/locale/nl.json
index c459538b..82a310a6 100644
--- a/frontend/src/i18n/locale/nl.json
+++ b/frontend/src/i18n/locale/nl.json
@@ -71,5 +71,7 @@
     "close": "sluiten",
     "copied": "gekopieerd!",
     "accept": "accepteren",
-    "deny": "weigeren"
+    "deny": "weigeren",
+    "sent": "verzonden",
+    "failed": "mislukt"
 }

From 7aa4863ed6c2752cfc5cadd85724551eb58e7c73 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 18:34:57 +0200
Subject: [PATCH 031/177] fix: leerkacht in database via seed.ts die
 overeenkomt met testleerkracht1

---
 backend/tests/test_assets/users/teachers.testdata.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/backend/tests/test_assets/users/teachers.testdata.ts b/backend/tests/test_assets/users/teachers.testdata.ts
index 8e791bb1..d2af704b 100644
--- a/backend/tests/test_assets/users/teachers.testdata.ts
+++ b/backend/tests/test_assets/users/teachers.testdata.ts
@@ -27,5 +27,12 @@ export function makeTestTeachers(em: EntityManager): Teacher[] {
         lastName: 'Cappelle',
     });
 
-    return [teacher01, teacher02, teacher03, teacher04];
+    // makes sure when logged in as testleerkracht1, there exists a corresponding user
+    const teacher05 = em.create(Teacher, {
+        username: 'testleerkracht1',
+        firstName: 'Bob',
+        lastName: 'Dylan'
+    });
+
+    return [teacher01, teacher02, teacher03, teacher04, teacher05];
 }

From 626af61e959f2de1337776d9a14266b421389b29 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 18:40:05 +0200
Subject: [PATCH 032/177] fix: zorg dat testleerkracht1 een klas heeft

---
 backend/tests/test_assets/classes/classes.testdata.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/tests/test_assets/classes/classes.testdata.ts b/backend/tests/test_assets/classes/classes.testdata.ts
index fb2165a2..db0a91b0 100644
--- a/backend/tests/test_assets/classes/classes.testdata.ts
+++ b/backend/tests/test_assets/classes/classes.testdata.ts
@@ -5,7 +5,7 @@ import { Teacher } from '../../../src/entities/users/teacher.entity';
 
 export function makeTestClasses(em: EntityManager, students: Student[], teachers: Teacher[]): Class[] {
     const studentsClass01 = students.slice(0, 8);
-    const teacherClass01: Teacher[] = teachers.slice(0, 1);
+    const teacherClass01: Teacher[] = teachers.slice(4,5);
 
     const class01 = em.create(Class, {
         classId: '8764b861-90a6-42e5-9732-c0d9eb2f55f9',

From 8d4dacba34669c9f0690d0519730c29daa211f52 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 18:40:47 +0200
Subject: [PATCH 033/177] feat: leerkracht tabel haalt klassen van leerkracht
 op

---
 frontend/src/views/classes/TeacherClasses.vue | 67 +++++++++----------
 1 file changed, 31 insertions(+), 36 deletions(-)

diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
index 86df1634..93735110 100644
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -4,17 +4,11 @@
     import { computed, onMounted, ref, type ComputedRef } from "vue";
     import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
     import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
+    import type { TeacherInvitationDTO } from "@dwengo-1/common/interfaces/teacher-invitation";
+    import { useTeacherClassesQuery } from "@/queries/teachers";
 
     const { t } = useI18n();
 
-    // TODO: remove and use correct type
-    interface Invitation {
-        id: string;
-        class: ClassDTO;
-        sender: TeacherDTO;
-        receiver: TeacherDTO;
-    }
-
     // Username of logged in teacher
     const username = ref<string | undefined>(undefined);
 
@@ -25,31 +19,32 @@
         username.value = userObject?.profile?.preferred_username ?? undefined;
     });
 
-    // TODO: fetch all classes of the logged in teacher
-    const isLoading = ref(false);
-    const error = ref<Error | null>(null);
-    // Const { data: classesResponse, isLoading, error } = useStudentClassesQuery(username);
+    // fetch all classes of the logged in teacher
+    const { data: classesResponse, isLoading, error } = useTeacherClassesQuery(username, true);
 
     // Empty list when classes are not yet loaded, else the list of classes of the user
-    const classes: ComputedRef<ClassDTO[]> = computed(() => 
-         []
-        // TODO
-        // // the classes are not yet fetched
-        // If (!classesResponse.value) {
-        //     Return [];
-        // }
-        //     // the user has no classes
-        //     If (classesResponse.value.classes.length === 0) {
-        //         Return [];
-        //     }
-        //     If (typeof classesResponse.value.classes[0] === "string") {
-        //         // should not occur because value of *full* is true
-        //         // must be caught because typescript can't know the type
-        //         // i chose to return an empty list if this occurs
-        //         // it is also possible to fetch all classes from the id's returned
-        //         Return [];
-        //     }
-        //     Return classesResponse.value.classes as ClassDTO[];
+    const classes: ComputedRef<ClassDTO[]> = computed(
+        () => {
+            // the classes are not yet fetched
+            if (!classesResponse.value) {
+                return [];
+            }
+            // the user has no classes
+            if (classesResponse.value.classes.length === 0) {
+                return [];
+            }
+            if (typeof classesResponse.value.classes[0] === "string") {
+                // should not occur because value of *full* is true
+                // must be caught because typescript can't know the type
+                // i chose to return an empty list if this occurs
+                // it is also possible to fetch all classes from the id's returned
+                return [];
+            }
+            return classesResponse.value.classes as ClassDTO[];
+        },
+
+            
+            
     );
 
     // Boolean that handles visibility for dialogs
@@ -57,7 +52,7 @@
     const dialog = ref(false);
 
     // Duntion to display the dialog showing generated code for created class
-    function openDialog() : void {
+    function openDialog(): void {
         //TODO
     }
 
@@ -65,7 +60,7 @@
     const code = ref<string>("");
 
     // TODO: implement correctly
-    const invitations = ref<Invitation[]>([]);
+    const invitations = ref<TeacherInvitationDTO[]>([]);
 
     // Function to handle a accepted invitation request
     function acceptRequest() {
@@ -271,12 +266,12 @@
                 <tbody>
                     <tr
                         v-for="i in invitations"
-                        :key="i.id"
+                        :key="(i.class as ClassDTO).id"
                     >
                         <td>
-                            {{ i.class.displayName }}
+                            {{ (i.class as ClassDTO).displayName }}
                         </td>
-                        <td>{{ i.sender.firstName + " " + i.sender.lastName }}</td>
+                        <td>{{ (i.sender as TeacherDTO).firstName + " " + (i.sender as TeacherDTO).lastName }}</td>
                         <td class="text-right">
                             <div>
                                 <v-btn

From db703b606620a4538963d9934536b485311b07e9 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 18:41:44 +0200
Subject: [PATCH 034/177] fix: imports fix

---
 frontend/src/queries/teachers.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/queries/teachers.ts b/frontend/src/queries/teachers.ts
index 778b2cba..eaa1f74f 100644
--- a/frontend/src/queries/teachers.ts
+++ b/frontend/src/queries/teachers.ts
@@ -1,11 +1,11 @@
 import { computed, toValue } from "vue";
 import type { MaybeRefOrGetter } from "vue";
-import { useMutation, useQuery, useQueryClient, UseMutationReturnType, UseQueryReturnType } from "@tanstack/vue-query";
+import { useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { TeacherController, type TeacherResponse, type TeachersResponse } from "@/controllers/teachers.ts";
 import type { ClassesResponse } from "@/controllers/classes.ts";
 import type { JoinRequestResponse, JoinRequestsResponse, StudentsResponse } from "@/controllers/students.ts";
 import type { QuestionsResponse } from "@/controllers/questions.ts";
-import type { TeacherDTO } from "@dwengo-1/interfaces/teacher";
+import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
 import { studentJoinRequestQueryKey, studentJoinRequestsQueryKey } from "@/queries/students.ts";
 
 const teacherController = new TeacherController();

From 8649725364cb788b857f651a7b82cd344ab387ec Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 19:06:24 +0200
Subject: [PATCH 035/177] style: lint en format

---
 frontend/src/queries/teachers.ts              |  8 +-
 frontend/src/views/classes/StudentClasses.vue |  8 +-
 frontend/src/views/classes/TeacherClasses.vue | 78 ++++++++-----------
 3 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/frontend/src/queries/teachers.ts b/frontend/src/queries/teachers.ts
index eaa1f74f..50d61f6c 100644
--- a/frontend/src/queries/teachers.ts
+++ b/frontend/src/queries/teachers.ts
@@ -1,6 +1,12 @@
 import { computed, toValue } from "vue";
 import type { MaybeRefOrGetter } from "vue";
-import { useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
+import {
+    useMutation,
+    useQuery,
+    useQueryClient,
+    type UseMutationReturnType,
+    type UseQueryReturnType,
+} from "@tanstack/vue-query";
 import { TeacherController, type TeacherResponse, type TeachersResponse } from "@/controllers/teachers.ts";
 import type { ClassesResponse } from "@/controllers/classes.ts";
 import type { JoinRequestResponse, JoinRequestsResponse, StudentsResponse } from "@/controllers/students.ts";
diff --git a/frontend/src/views/classes/StudentClasses.vue b/frontend/src/views/classes/StudentClasses.vue
index b376df46..06ff853d 100644
--- a/frontend/src/views/classes/StudentClasses.vue
+++ b/frontend/src/views/classes/StudentClasses.vue
@@ -87,9 +87,9 @@
                 return true;
             } else if (value !== undefined && validate(value) && version(value) === 4) {
                 return true;
-            } else {
+            } 
                 return t("invalidFormat");
-            }
+            
         },
     ];
 
@@ -97,7 +97,7 @@
     const { mutate } = useCreateJoinRequestMutation();
 
     // Function called when a student submits a code to join a class
-    function submitCode() {
+    function submitCode() : void {
         // Check if the code is valid
         if (code.value !== undefined && validate(code.value) && version(code.value) === 4) {
             mutate(
@@ -121,7 +121,7 @@
         color: "success",
     });
 
-    const showSnackbar = (message: string, color: string) => {
+    function showSnackbar(message: string, color: string) : void {
         snackbar.value.message = message;
         snackbar.value.color = color;
         snackbar.value.visible = true;
diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
index 93735110..be174003 100644
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -19,58 +19,48 @@
         username.value = userObject?.profile?.preferred_username ?? undefined;
     });
 
-    // fetch all classes of the logged in teacher
+    // Fetch all classes of the logged in teacher
     const { data: classesResponse, isLoading, error } = useTeacherClassesQuery(username, true);
 
     // Empty list when classes are not yet loaded, else the list of classes of the user
-    const classes: ComputedRef<ClassDTO[]> = computed(
-        () => {
-            // the classes are not yet fetched
-            if (!classesResponse.value) {
-                return [];
-            }
-            // the user has no classes
-            if (classesResponse.value.classes.length === 0) {
-                return [];
-            }
-            if (typeof classesResponse.value.classes[0] === "string") {
-                // should not occur because value of *full* is true
-                // must be caught because typescript can't know the type
-                // i chose to return an empty list if this occurs
-                // it is also possible to fetch all classes from the id's returned
-                return [];
-            }
-            return classesResponse.value.classes as ClassDTO[];
-        },
-
-            
-            
-    );
+    const classes: ComputedRef<ClassDTO[]> = computed(() => {
+        // The classes are not yet fetched
+        if (!classesResponse.value) {
+            return [];
+        }
+        // The user has no classes
+        if (classesResponse.value.classes.length === 0) {
+            return [];
+        }
+        if (typeof classesResponse.value.classes[0] === "string") {
+            // Should not occur because value of *full* is true
+            // Must be caught because typescript can't know the type
+            // I chose to return an empty list if this occurs
+            // It is also possible to fetch all classes from the id's returned
+            return [];
+        }
+        return classesResponse.value.classes as ClassDTO[];
+    });
 
     // Boolean that handles visibility for dialogs
     // Creating a class will generate a popup with the generated code
     const dialog = ref(false);
 
-    // Duntion to display the dialog showing generated code for created class
-    function openDialog(): void {
-        //TODO
-    }
-
     // Code generated when new class was created
     const code = ref<string>("");
 
-    // TODO: implement correctly
+    // TODO: waiting on frontend controllers
     const invitations = ref<TeacherInvitationDTO[]>([]);
 
     // Function to handle a accepted invitation request
-    function acceptRequest() {
-        //TODO
+    function acceptRequest(): void {
+        //TODO > waiting on updated frontend controllers
         console.log("request accepted");
     }
 
     // Function to handle a denied invitation request
-    function denyRequest() {
-        //TODO
+    function denyRequest(): void {
+        //TODO > waiting on frontend controllers
         console.log("request denied");
     }
 
@@ -80,35 +70,35 @@
     // The name can only contain dash, underscore letters and numbers
     // These rules are used to display a message to the user if the name is not valid
     const nameRules = [
-        (value: string | undefined) => {
-            if (value) return true;
-            return t("nameIsMandatory");
-        },
-        (value: string | undefined) => {
-            if (value && /^[a-zA-Z0-9_-]+$/.test(value)) return true;
+        (value: string | undefined): string | boolean => {
+            if (!value) return true;
+            if (value && (/^[a-zA-Z0-9_-]+$/.test(value))) return true;
             return t("onlyUse");
         },
     ];
 
     // Function called when a teacher creates a class
-    function createClass() {
+    function createClass(): void {
         // Check if the class name is valid
         if (className.value && className.value.length > 0 && /^[a-zA-Z0-9_-]+$/.test(className.value)) {
-            //TODO
+            //TODO > waiting on updated frontend controllers
             console.log("created class with name: " + className.value);
 
             // Show the generated code to share with the class
             dialog.value = true;
             code.value = "04c7c759-c41e-4ea9-968a-1e2a987ce0ed";
         }
+        if (!className.value || className.value === "") {
+            alert("classname should not be empty")
+        }
     }
 
     // Show the teacher, copying of the code was a successs
     const copied = ref(false);
 
     // Copy the generated code to the clipboard
-    function copyToClipboard() {
-        navigator.clipboard.writeText(code.value);
+    async function copyToClipboard(): Promise<void> {
+        await navigator.clipboard.writeText(code.value);
         copied.value = true;
     }
 </script>

From 438238f2bf286cdbb1636eed42dccfab5389dd03 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sat, 5 Apr 2025 19:21:01 +0200
Subject: [PATCH 036/177] style: lint op backend

---
 backend/seed.ts                                      | 11 +++++++----
 backend/src/orm.ts                                   |  4 ++--
 backend/tests/test_assets/users/students.testdata.ts |  3 +--
 backend/tests/test_assets/users/teachers.testdata.ts |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/backend/seed.ts b/backend/seed.ts
index f2ca1d32..1798af3a 100644
--- a/backend/seed.ts
+++ b/backend/seed.ts
@@ -13,15 +13,18 @@ import { makeTestAnswers } from "./tests/test_assets/questions/answers.testdata.
 import { makeTestQuestions } from "./tests/test_assets/questions/questions.testdata.js";
 import { makeTestStudents } from "./tests/test_assets/users/students.testdata.js";
 import { makeTestTeachers } from "./tests/test_assets/users/teachers.testdata.js";
+import { getLogger, Logger } from './src/logging/initalize.js';
 
-export async function seedDatabase() {
+const logger: Logger = getLogger();
+
+export async function seedDatabase() : Promise<void> {
     dotenv.config({ path: '.env.development.local' });
     const orm = await initORM();
     await orm.schema.clearDatabase();
 
     const em = forkEntityManager();
 
-    console.log("seeding database...")
+    logger.info("seeding database...")
 
     const students = makeTestStudents(em);
     const teachers = makeTestTeachers(em);
@@ -61,9 +64,9 @@ export async function seedDatabase() {
         ...submissions,
     ]);
 
-    console.log('Development database seeded successfully!');
+    logger.info('Development database seeded successfully!');
 
     await orm.close();
 }
 
-seedDatabase().catch(console.error);
\ No newline at end of file
+seedDatabase().catch(logger.error);
\ No newline at end of file
diff --git a/backend/src/orm.ts b/backend/src/orm.ts
index aa59f0c8..76cd0ee9 100644
--- a/backend/src/orm.ts
+++ b/backend/src/orm.ts
@@ -1,10 +1,10 @@
-import { Connection, EntityManager, IDatabaseDriver, MikroORM } from '@mikro-orm/core';
+import { EntityManager, IDatabaseDriver, MikroORM } from '@mikro-orm/core';
 import config from './mikro-orm.config.js';
 import { envVars, getEnvVar } from './util/envVars.js';
 import { getLogger, Logger } from './logging/initalize.js';
 
 let orm: MikroORM | undefined;
-export async function initORM(testingMode = false): Promise<MikroORM<IDatabaseDriver<Connection>, EntityManager<IDatabaseDriver<Connection>>>> {
+export async function initORM(testingMode = false): Promise<MikroORM<IDatabaseDriver, EntityManager>> {
     const logger: Logger = getLogger();
 
     logger.info('Initializing ORM');
diff --git a/backend/tests/test_assets/users/students.testdata.ts b/backend/tests/test_assets/users/students.testdata.ts
index e38ab25c..b2dc1899 100644
--- a/backend/tests/test_assets/users/students.testdata.ts
+++ b/backend/tests/test_assets/users/students.testdata.ts
@@ -1,6 +1,5 @@
 import { EntityManager } from '@mikro-orm/core';
 import { Student } from '../../../src/entities/users/student.entity';
-import { fixupRule } from '@eslint/compat';
 
 // 🔓 Ruwe testdata array — herbruikbaar in assertions
 export const TEST_STUDENTS = [
@@ -12,7 +11,7 @@ export const TEST_STUDENTS = [
     { username: 'TheDoors', firstName: 'Jim', lastName: 'Morisson' },
     // ⚠️ Deze mag niet gebruikt worden in elke test!
     { username: 'Nirvana', firstName: 'Kurt', lastName: 'Cobain' },
-    // makes sure when logged in as leerling1, there exists a corresponding user
+    // Makes sure when logged in as leerling1, there exists a corresponding user
     { username: 'testleerling1', firstName: 'Gerald', lastName: 'Schmittinger'},
 ];
 
diff --git a/backend/tests/test_assets/users/teachers.testdata.ts b/backend/tests/test_assets/users/teachers.testdata.ts
index d2af704b..4ecc3274 100644
--- a/backend/tests/test_assets/users/teachers.testdata.ts
+++ b/backend/tests/test_assets/users/teachers.testdata.ts
@@ -27,7 +27,7 @@ export function makeTestTeachers(em: EntityManager): Teacher[] {
         lastName: 'Cappelle',
     });
 
-    // makes sure when logged in as testleerkracht1, there exists a corresponding user
+    // Makes sure when logged in as testleerkracht1, there exists a corresponding user
     const teacher05 = em.create(Teacher, {
         username: 'testleerkracht1',
         firstName: 'Bob',

From bd75ab8af9f5ec5bd40f32c0161805b20cbe08ab Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Sun, 6 Apr 2025 09:45:01 +0200
Subject: [PATCH 037/177] fix: question service + refactor loID

---
 backend/src/controllers/learning-objects.ts   |  4 +-
 .../src/data/questions/question-repository.ts |  9 +++
 backend/src/interfaces/question.ts            | 14 +++-
 .../learning-objects/attachment-service.ts    |  4 +-
 .../database-learning-object-provider.ts      |  8 +-
 .../dwengo-api-learning-object-provider.ts    |  8 +-
 .../learning-object-provider.ts               |  6 +-
 .../learning-object-service.ts                |  8 +-
 .../markdown/dwengo-marked-renderer.ts        |  4 +-
 .../processing/processing-service.ts          |  4 +-
 backend/src/services/questions.ts             | 74 ++++++++-----------
 backend/src/util/links.ts                     |  6 +-
 .../learning-object-service.test.ts           |  4 +-
 common/src/interfaces/learning-content.ts     |  2 +-
 common/src/interfaces/question.ts             |  8 +-
 common/src/interfaces/submission.ts           |  4 +-
 16 files changed, 86 insertions(+), 81 deletions(-)

diff --git a/backend/src/controllers/learning-objects.ts b/backend/src/controllers/learning-objects.ts
index a2510631..83aa33f9 100644
--- a/backend/src/controllers/learning-objects.ts
+++ b/backend/src/controllers/learning-objects.ts
@@ -6,9 +6,9 @@ import attachmentService from '../services/learning-objects/attachment-service.j
 import { BadRequestException } from '../exceptions/bad-request-exception.js';
 import { NotFoundException } from '../exceptions/not-found-exception.js';
 import { envVars, getEnvVar } from '../util/envVars.js';
-import { FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import { FilteredLearningObject, LearningObjectIdentifierDTO, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
 
-function getLearningObjectIdentifierFromRequest(req: Request): LearningObjectIdentifier {
+function getLearningObjectIdentifierFromRequest(req: Request): LearningObjectIdentifierDTO {
     if (!req.params.hruid) {
         throw new BadRequestException('HRUID is required.');
     }
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 2d165abc..90c144d8 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -61,4 +61,13 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
             orderBy: { timestamp: 'DESC' }, // New to old
         });
     }
+
+    public async findByLearningObjectAndSequenceNumber(loId: LearningObjectIdentifier, sequenceNumber: number){
+        return this.findOne({
+            learningObjectHruid: loId.hruid,
+            learningObjectLanguage: loId.language,
+            learningObjectVersion: loId.version,
+            sequenceNumber
+        });
+    }
 }
diff --git a/backend/src/interfaces/question.ts b/backend/src/interfaces/question.ts
index 48d64f11..9005654f 100644
--- a/backend/src/interfaces/question.ts
+++ b/backend/src/interfaces/question.ts
@@ -1,9 +1,11 @@
 import { Question } from '../entities/questions/question.entity.js';
 import { mapToStudentDTO } from './student.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
-import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import { LearningObjectIdentifierDTO } from '@dwengo-1/common/interfaces/learning-content';
+import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 
-function getLearningObjectIdentifier(question: Question): LearningObjectIdentifier {
+
+function getLearningObjectIdentifier(question: Question): LearningObjectIdentifierDTO {
     return {
         hruid: question.learningObjectHruid,
         language: question.learningObjectLanguage,
@@ -11,6 +13,14 @@ function getLearningObjectIdentifier(question: Question): LearningObjectIdentifi
     };
 }
 
+export function mapToLearningObjectID(loID: LearningObjectIdentifierDTO): LearningObjectIdentifier {
+    return {
+        hruid: loID.hruid,
+        language: loID.language,
+        version: loID.version ?? 1
+    }
+}
+
 /**
  * Convert a Question entity to a DTO format.
  */
diff --git a/backend/src/services/learning-objects/attachment-service.ts b/backend/src/services/learning-objects/attachment-service.ts
index 46fc5e03..2a6298c1 100644
--- a/backend/src/services/learning-objects/attachment-service.ts
+++ b/backend/src/services/learning-objects/attachment-service.ts
@@ -1,10 +1,10 @@
 import { getAttachmentRepository } from '../../data/repositories.js';
 import { Attachment } from '../../entities/content/attachment.entity.js';
 
-import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import { LearningObjectIdentifierDTO } from '@dwengo-1/common/interfaces/learning-content';
 
 const attachmentService = {
-    async getAttachment(learningObjectId: LearningObjectIdentifier, attachmentName: string): Promise<Attachment | null> {
+    async getAttachment(learningObjectId: LearningObjectIdentifierDTO, attachmentName: string): Promise<Attachment | null> {
         const attachmentRepo = getAttachmentRepository();
 
         if (learningObjectId.version) {
diff --git a/backend/src/services/learning-objects/database-learning-object-provider.ts b/backend/src/services/learning-objects/database-learning-object-provider.ts
index 361153f5..fa278bba 100644
--- a/backend/src/services/learning-objects/database-learning-object-provider.ts
+++ b/backend/src/services/learning-objects/database-learning-object-provider.ts
@@ -6,7 +6,7 @@ import processingService from './processing/processing-service.js';
 import { NotFoundError } from '@mikro-orm/core';
 import learningObjectService from './learning-object-service.js';
 import { getLogger, Logger } from '../../logging/initalize.js';
-import { FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import { FilteredLearningObject, LearningObjectIdentifierDTO, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
 
 const logger: Logger = getLogger();
 
@@ -40,7 +40,7 @@ function convertLearningObject(learningObject: LearningObject | null): FilteredL
     };
 }
 
-async function findLearningObjectEntityById(id: LearningObjectIdentifier): Promise<LearningObject | null> {
+async function findLearningObjectEntityById(id: LearningObjectIdentifierDTO): Promise<LearningObject | null> {
     const learningObjectRepo = getLearningObjectRepository();
 
     return learningObjectRepo.findLatestByHruidAndLanguage(id.hruid, id.language);
@@ -53,7 +53,7 @@ const databaseLearningObjectProvider: LearningObjectProvider = {
     /**
      * Fetches a single learning object by its HRUID
      */
-    async getLearningObjectById(id: LearningObjectIdentifier): Promise<FilteredLearningObject | null> {
+    async getLearningObjectById(id: LearningObjectIdentifierDTO): Promise<FilteredLearningObject | null> {
         const learningObject = await findLearningObjectEntityById(id);
         return convertLearningObject(learningObject);
     },
@@ -61,7 +61,7 @@ const databaseLearningObjectProvider: LearningObjectProvider = {
     /**
      * Obtain a HTML-rendering of the learning object with the given identifier (as a string).
      */
-    async getLearningObjectHTML(id: LearningObjectIdentifier): Promise<string | null> {
+    async getLearningObjectHTML(id: LearningObjectIdentifierDTO): Promise<string | null> {
         const learningObjectRepo = getLearningObjectRepository();
 
         const learningObject = await learningObjectRepo.findLatestByHruidAndLanguage(id.hruid, id.language);
diff --git a/backend/src/services/learning-objects/dwengo-api-learning-object-provider.ts b/backend/src/services/learning-objects/dwengo-api-learning-object-provider.ts
index d67b69ae..e9898f62 100644
--- a/backend/src/services/learning-objects/dwengo-api-learning-object-provider.ts
+++ b/backend/src/services/learning-objects/dwengo-api-learning-object-provider.ts
@@ -5,7 +5,7 @@ import { LearningObjectProvider } from './learning-object-provider.js';
 import { getLogger, Logger } from '../../logging/initalize.js';
 import {
     FilteredLearningObject,
-    LearningObjectIdentifier,
+    LearningObjectIdentifierDTO,
     LearningObjectMetadata,
     LearningObjectNode,
     LearningPathIdentifier,
@@ -67,7 +67,7 @@ async function fetchLearningObjects(learningPathId: LearningPathIdentifier, full
 
         const objects = await Promise.all(
             nodes.map(async (node) => {
-                const learningObjectId: LearningObjectIdentifier = {
+                const learningObjectId: LearningObjectIdentifierDTO = {
                     hruid: node.learningobject_hruid,
                     language: learningPathId.language,
                 };
@@ -85,7 +85,7 @@ const dwengoApiLearningObjectProvider: LearningObjectProvider = {
     /**
      * Fetches a single learning object by its HRUID
      */
-    async getLearningObjectById(id: LearningObjectIdentifier): Promise<FilteredLearningObject | null> {
+    async getLearningObjectById(id: LearningObjectIdentifierDTO): Promise<FilteredLearningObject | null> {
         const metadataUrl = `${DWENGO_API_BASE}/learningObject/getMetadata`;
         const metadata = await fetchWithLogging<LearningObjectMetadata>(
             metadataUrl,
@@ -121,7 +121,7 @@ const dwengoApiLearningObjectProvider: LearningObjectProvider = {
      * Obtain a HTML-rendering of the learning object with the given identifier (as a string). For learning objects
      * from the Dwengo API, this means passing through the HTML rendering from there.
      */
-    async getLearningObjectHTML(id: LearningObjectIdentifier): Promise<string | null> {
+    async getLearningObjectHTML(id: LearningObjectIdentifierDTO): Promise<string | null> {
         const htmlUrl = `${DWENGO_API_BASE}/learningObject/getRaw`;
         const html = await fetchWithLogging<string>(htmlUrl, `Metadata for Learning Object HRUID "${id.hruid}" (language ${id.language})`, {
             params: { ...id },
diff --git a/backend/src/services/learning-objects/learning-object-provider.ts b/backend/src/services/learning-objects/learning-object-provider.ts
index a0fcb552..14848bc0 100644
--- a/backend/src/services/learning-objects/learning-object-provider.ts
+++ b/backend/src/services/learning-objects/learning-object-provider.ts
@@ -1,10 +1,10 @@
-import { FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import { FilteredLearningObject, LearningObjectIdentifierDTO, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
 
 export interface LearningObjectProvider {
     /**
      * Fetches a single learning object by its HRUID
      */
-    getLearningObjectById(id: LearningObjectIdentifier): Promise<FilteredLearningObject | null>;
+    getLearningObjectById(id: LearningObjectIdentifierDTO): Promise<FilteredLearningObject | null>;
 
     /**
      * Fetch full learning object data (metadata)
@@ -19,5 +19,5 @@ export interface LearningObjectProvider {
     /**
      * Obtain a HTML-rendering of the learning object with the given identifier (as a string).
      */
-    getLearningObjectHTML(id: LearningObjectIdentifier): Promise<string | null>;
+    getLearningObjectHTML(id: LearningObjectIdentifierDTO): Promise<string | null>;
 }
diff --git a/backend/src/services/learning-objects/learning-object-service.ts b/backend/src/services/learning-objects/learning-object-service.ts
index 5a06f0f2..7b4f47fc 100644
--- a/backend/src/services/learning-objects/learning-object-service.ts
+++ b/backend/src/services/learning-objects/learning-object-service.ts
@@ -2,9 +2,9 @@ import dwengoApiLearningObjectProvider from './dwengo-api-learning-object-provid
 import { LearningObjectProvider } from './learning-object-provider.js';
 import { envVars, getEnvVar } from '../../util/envVars.js';
 import databaseLearningObjectProvider from './database-learning-object-provider.js';
-import { FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import { FilteredLearningObject, LearningObjectIdentifierDTO, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
 
-function getProvider(id: LearningObjectIdentifier): LearningObjectProvider {
+function getProvider(id: LearningObjectIdentifierDTO): LearningObjectProvider {
     if (id.hruid.startsWith(getEnvVar(envVars.UserContentPrefix))) {
         return databaseLearningObjectProvider;
     }
@@ -18,7 +18,7 @@ const learningObjectService = {
     /**
      * Fetches a single learning object by its HRUID
      */
-    async getLearningObjectById(id: LearningObjectIdentifier): Promise<FilteredLearningObject | null> {
+    async getLearningObjectById(id: LearningObjectIdentifierDTO): Promise<FilteredLearningObject | null> {
         return getProvider(id).getLearningObjectById(id);
     },
 
@@ -39,7 +39,7 @@ const learningObjectService = {
     /**
      * Obtain a HTML-rendering of the learning object with the given identifier (as a string).
      */
-    async getLearningObjectHTML(id: LearningObjectIdentifier): Promise<string | null> {
+    async getLearningObjectHTML(id: LearningObjectIdentifierDTO): Promise<string | null> {
         return getProvider(id).getLearningObjectHTML(id);
     },
 };
diff --git a/backend/src/services/learning-objects/processing/markdown/dwengo-marked-renderer.ts b/backend/src/services/learning-objects/processing/markdown/dwengo-marked-renderer.ts
index 87ba13b7..e01d8ed6 100644
--- a/backend/src/services/learning-objects/processing/markdown/dwengo-marked-renderer.ts
+++ b/backend/src/services/learning-objects/processing/markdown/dwengo-marked-renderer.ts
@@ -12,7 +12,7 @@ import Image = marked.Tokens.Image;
 import Heading = marked.Tokens.Heading;
 import Link = marked.Tokens.Link;
 import RendererObject = marked.RendererObject;
-import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import { LearningObjectIdentifierDTO } from '@dwengo-1/common/interfaces/learning-content';
 import { Language } from '@dwengo-1/common/util/language';
 
 const prefixes = {
@@ -25,7 +25,7 @@ const prefixes = {
     blockly: '@blockly',
 };
 
-function extractLearningObjectIdFromHref(href: string): LearningObjectIdentifier {
+function extractLearningObjectIdFromHref(href: string): LearningObjectIdentifierDTO {
     const [hruid, language, version] = href.split(/\/(.+)/, 2)[1].split('/');
     return {
         hruid,
diff --git a/backend/src/services/learning-objects/processing/processing-service.ts b/backend/src/services/learning-objects/processing/processing-service.ts
index e9147e31..61821d80 100644
--- a/backend/src/services/learning-objects/processing/processing-service.ts
+++ b/backend/src/services/learning-objects/processing/processing-service.ts
@@ -14,7 +14,7 @@ import { LearningObject } from '../../../entities/content/learning-object.entity
 import Processor from './processor.js';
 import { DwengoContentType } from './content-type.js';
 import { replaceAsync } from '../../../util/async.js';
-import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import { LearningObjectIdentifierDTO } from '@dwengo-1/common/interfaces/learning-content';
 import { Language } from '@dwengo-1/common/util/language';
 
 const EMBEDDED_LEARNING_OBJECT_PLACEHOLDER = /<learning-object hruid="([^"]+)" language="([^"]+)" version="([^"]+)"\/>/g;
@@ -50,7 +50,7 @@ class ProcessingService {
      */
     async render(
         learningObject: LearningObject,
-        fetchEmbeddedLearningObjects?: (loId: LearningObjectIdentifier) => Promise<LearningObject | null>
+        fetchEmbeddedLearningObjects?: (loId: LearningObjectIdentifierDTO) => Promise<LearningObject | null>
     ): Promise<string> {
         const html = this.processors.get(learningObject.contentType)!.renderLearningObject(learningObject);
         if (fetchEmbeddedLearningObjects) {
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index 319061c5..d983c3be 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -1,22 +1,21 @@
 import { getAnswerRepository, getQuestionRepository } from '../data/repositories.js';
-import { mapToQuestionDTO, mapToQuestionDTOId } from '../interfaces/question.js';
+import {mapToLearningObjectID, mapToQuestionDTO, mapToQuestionDTOId} from '../interfaces/question.js';
 import { Question } from '../entities/questions/question.entity.js';
 import { Answer } from '../entities/questions/answer.entity.js';
 import { mapToAnswerDTO, mapToAnswerDTOId } from '../interfaces/answer.js';
 import { QuestionRepository } from '../data/questions/question-repository.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
-import { mapToStudent } from '../interfaces/student.js';
+import {mapToStudent, mapToStudentDTO} from '../interfaces/student.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
+import {NotFoundException} from "../exceptions/not-found-exception";
+import {fetchStudent} from "./students";
+import {Student} from "../entities/users/student.entity";
 
 export async function getAllQuestions(id: LearningObjectIdentifier, full: boolean): Promise<QuestionDTO[] | QuestionId[]> {
     const questionRepository: QuestionRepository = getQuestionRepository();
     const questions = await questionRepository.findAllQuestionsAboutLearningObject(id);
 
-    if (!questions) {
-        return [];
-    }
-
     if (full) {
         return questions.map(mapToQuestionDTO);
     }
@@ -24,24 +23,22 @@ export async function getAllQuestions(id: LearningObjectIdentifier, full: boolea
     return questions.map(mapToQuestionDTOId);
 }
 
-async function fetchQuestion(questionId: QuestionId): Promise<Question | null> {
+async function fetchQuestion(questionId: QuestionId): Promise<Question> {
     const questionRepository = getQuestionRepository();
+    const question = await questionRepository.findByLearningObjectAndSequenceNumber(
+        mapToLearningObjectID(questionId.learningObjectIdentifier),
+        questionId.sequenceNumber
+    );
 
-    return await questionRepository.findOne({
-        learningObjectHruid: questionId.learningObjectIdentifier.hruid,
-        learningObjectLanguage: questionId.learningObjectIdentifier.language,
-        learningObjectVersion: questionId.learningObjectIdentifier.version,
-        sequenceNumber: questionId.sequenceNumber,
-    });
-}
-
-export async function getQuestion(questionId: QuestionId): Promise<QuestionDTO | null> {
-    const question = await fetchQuestion(questionId);
-
-    if (!question) {
-        return null;
+    if (!question){
+        throw new NotFoundException('Question with loID and sequence number not found');
     }
 
+    return question;
+}
+
+export async function getQuestion(questionId: QuestionId): Promise<QuestionDTO> {
+    const question = await fetchQuestion(questionId);
     return mapToQuestionDTO(question);
 }
 
@@ -49,16 +46,8 @@ export async function getAnswersByQuestion(questionId: QuestionId, full: boolean
     const answerRepository = getAnswerRepository();
     const question = await fetchQuestion(questionId);
 
-    if (!question) {
-        return [];
-    }
-
     const answers: Answer[] = await answerRepository.findAllAnswersToQuestion(question);
 
-    if (!answers) {
-        return [];
-    }
-
     if (full) {
         return answers.map(mapToAnswerDTO);
     }
@@ -68,24 +57,21 @@ export async function getAnswersByQuestion(questionId: QuestionId, full: boolean
 
 export async function createQuestion(questionDTO: QuestionDTO): Promise<QuestionDTO | null> {
     const questionRepository = getQuestionRepository();
-
-    const author = mapToStudent(questionDTO.author);
-
-    const loId: LearningObjectIdentifier = {
-        ...questionDTO.learningObjectIdentifier,
-        version: questionDTO.learningObjectIdentifier.version ?? 1,
-    };
-
-    try {
-        await questionRepository.createQuestion({
-            loId,
-            author,
-            content: questionDTO.content,
-        });
-    } catch (_) {
-        return null;
+    let author: Student;
+    if (typeof questionDTO.author === "string" ){
+        author = await fetchStudent(questionDTO.author);
+    } else {
+        author = mapToStudent(questionDTO.author)
     }
 
+
+    await questionRepository.createQuestion({
+        loId: mapToLearningObjectID(questionDTO.learningObjectIdentifier),
+        author,
+        content: questionDTO.content,
+    });
+
+
     return questionDTO;
 }
 
diff --git a/backend/src/util/links.ts b/backend/src/util/links.ts
index 9ede7d12..106613a4 100644
--- a/backend/src/util/links.ts
+++ b/backend/src/util/links.ts
@@ -1,4 +1,4 @@
-import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import { LearningObjectIdentifierDTO } from '@dwengo-1/common/interfaces/learning-content';
 
 export function isValidHttpUrl(url: string): boolean {
     try {
@@ -9,7 +9,7 @@ export function isValidHttpUrl(url: string): boolean {
     }
 }
 
-export function getUrlStringForLearningObject(learningObjectId: LearningObjectIdentifier): string {
+export function getUrlStringForLearningObject(learningObjectId: LearningObjectIdentifierDTO): string {
     let url = `/learningObject/${learningObjectId.hruid}/html?language=${learningObjectId.language}`;
     if (learningObjectId.version) {
         url += `&version=${learningObjectId.version}`;
@@ -17,7 +17,7 @@ export function getUrlStringForLearningObject(learningObjectId: LearningObjectId
     return url;
 }
 
-export function getUrlStringForLearningObjectHTML(learningObjectIdentifier: LearningObjectIdentifier): string {
+export function getUrlStringForLearningObjectHTML(learningObjectIdentifier: LearningObjectIdentifierDTO): string {
     let url = `/learningObject/${learningObjectIdentifier.hruid}/html?language=${learningObjectIdentifier.language}`;
     if (learningObjectIdentifier.version) {
         url += `&version=${learningObjectIdentifier.version}`;
diff --git a/backend/tests/services/learning-objects/learning-object-service.test.ts b/backend/tests/services/learning-objects/learning-object-service.test.ts
index a0fea849..3ea4143d 100644
--- a/backend/tests/services/learning-objects/learning-object-service.test.ts
+++ b/backend/tests/services/learning-objects/learning-object-service.test.ts
@@ -7,11 +7,11 @@ import learningObjectService from '../../../src/services/learning-objects/learni
 import { envVars, getEnvVar } from '../../../src/util/envVars';
 import { LearningPath } from '../../../src/entities/content/learning-path.entity';
 import learningPathExample from '../../test-assets/learning-paths/pn-werking-example';
-import { LearningObjectIdentifier, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import { LearningObjectIdentifierDTO, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
 import { Language } from '@dwengo-1/common/util/language';
 
 const EXPECTED_DWENGO_LEARNING_OBJECT_TITLE = 'Werken met notebooks';
-const DWENGO_TEST_LEARNING_OBJECT_ID: LearningObjectIdentifier = {
+const DWENGO_TEST_LEARNING_OBJECT_ID: LearningObjectIdentifierDTO = {
     hruid: 'pn_werkingnotebooks',
     language: Language.Dutch,
     version: 3,
diff --git a/common/src/interfaces/learning-content.ts b/common/src/interfaces/learning-content.ts
index 02e49648..435e7001 100644
--- a/common/src/interfaces/learning-content.ts
+++ b/common/src/interfaces/learning-content.ts
@@ -11,7 +11,7 @@ export interface Transition {
     };
 }
 
-export interface LearningObjectIdentifier {
+export interface LearningObjectIdentifierDTO {
     hruid: string;
     language: Language;
     version?: number;
diff --git a/common/src/interfaces/question.ts b/common/src/interfaces/question.ts
index b80ff0af..3f24480a 100644
--- a/common/src/interfaces/question.ts
+++ b/common/src/interfaces/question.ts
@@ -1,15 +1,15 @@
-import { LearningObjectIdentifier } from './learning-content';
+import { LearningObjectIdentifierDTO } from './learning-content';
 import { StudentDTO } from './student';
 
 export interface QuestionDTO {
-    learningObjectIdentifier: LearningObjectIdentifier;
+    learningObjectIdentifier: LearningObjectIdentifierDTO;
     sequenceNumber?: number;
-    author: StudentDTO;
+    author: StudentDTO | string;
     timestamp?: string;
     content: string;
 }
 
 export interface QuestionId {
-    learningObjectIdentifier: LearningObjectIdentifier;
+    learningObjectIdentifier: LearningObjectIdentifierDTO;
     sequenceNumber: number;
 }
diff --git a/common/src/interfaces/submission.ts b/common/src/interfaces/submission.ts
index 6b250616..9101df79 100644
--- a/common/src/interfaces/submission.ts
+++ b/common/src/interfaces/submission.ts
@@ -1,10 +1,10 @@
 import { GroupDTO } from './group';
-import { LearningObjectIdentifier } from './learning-content';
+import { LearningObjectIdentifierDTO } from './learning-content';
 import { StudentDTO } from './student';
 import { Language } from '../util/language';
 
 export interface SubmissionDTO {
-    learningObjectIdentifier: LearningObjectIdentifier;
+    learningObjectIdentifier: LearningObjectIdentifierDTO;
 
     submissionNumber?: number;
     submitter: StudentDTO;

From 2c4bc644fd673689d8d5ca00f52bc8f74b22ba32 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Sun, 6 Apr 2025 10:40:34 +0200
Subject: [PATCH 038/177] fix: assignment errors en return json

---
 backend/src/controllers/assignments.ts | 50 +++++++------------
 backend/src/services/assignments.ts    | 68 +++++++++-----------------
 2 files changed, 43 insertions(+), 75 deletions(-)

diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts
index 1520fc10..2750e3d8 100644
--- a/backend/src/controllers/assignments.ts
+++ b/backend/src/controllers/assignments.ts
@@ -1,6 +1,8 @@
 import { Request, Response } from 'express';
 import { createAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions } from '../services/assignments.js';
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
+import {requireFields} from "./error-helper";
+import {BadRequestException} from "../exceptions/bad-request-exception";
 
 // Typescript is annoying with parameter forwarding from class.ts
 interface AssignmentParams {
@@ -9,69 +11,55 @@ interface AssignmentParams {
 }
 
 export async function getAllAssignmentsHandler(req: Request<AssignmentParams>, res: Response): Promise<void> {
-    const classid = req.params.classid;
+    const classId = req.params.classid;
     const full = req.query.full === 'true';
+    requireFields({ classId });
 
-    const assignments = await getAllAssignments(classid, full);
+    const assignments = await getAllAssignments(classId, full);
 
-    res.json({
-        assignments: assignments,
-    });
+    res.json({ assignments });
 }
 
 export async function createAssignmentHandler(req: Request<AssignmentParams>, res: Response): Promise<void> {
     const classid = req.params.classid;
-    const assignmentData = req.body as AssignmentDTO;
+    const description = req.body.description;
+    const language = req.body.language;
+    const learningPath = req.body.learningPath;
+    const title = req.body.title;
 
-    if (!assignmentData.description || !assignmentData.language || !assignmentData.learningPath || !assignmentData.title) {
-        res.status(400).json({
-            error: 'Missing one or more required fields: title, description, learningPath, language',
-        });
-        return;
-    }
+    requireFields({ description, language, learningPath, title });
+    const assignmentData = req.body as AssignmentDTO;
 
     const assignment = await createAssignment(classid, assignmentData);
 
-    if (!assignment) {
-        res.status(500).json({ error: 'Could not create assignment ' });
-        return;
-    }
-
-    res.status(201).json(assignment);
+    res.json({ assignment });
 }
 
 export async function getAssignmentHandler(req: Request<AssignmentParams>, res: Response): Promise<void> {
     const id = Number(req.params.id);
     const classid = req.params.classid;
+    requireFields({ id, classid });
 
     if (isNaN(id)) {
-        res.status(400).json({ error: 'Assignment id must be a number' });
-        return;
+        throw new BadRequestException("Assignment id should be a number")
     }
 
     const assignment = await getAssignment(classid, id);
 
-    if (!assignment) {
-        res.status(404).json({ error: 'Assignment not found' });
-        return;
-    }
-
-    res.json(assignment);
+    res.json({ assignment });
 }
 
 export async function getAssignmentsSubmissionsHandler(req: Request<AssignmentParams>, res: Response): Promise<void> {
     const classid = req.params.classid;
     const assignmentNumber = Number(req.params.id);
     const full = req.query.full === 'true';
+    requireFields({ assignmentNumber, classid });
 
     if (isNaN(assignmentNumber)) {
-        res.status(400).json({ error: 'Assignment id must be a number' });
-        return;
+        throw new BadRequestException("Assignment id should be a number")
     }
 
     const submissions = await getAssignmentsSubmissions(classid, assignmentNumber, full);
 
-    res.json({
-        submissions: submissions,
-    });
+    res.json({ submissions });
 }
diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts
index e86b69b2..fa8e2380 100644
--- a/backend/src/services/assignments.ts
+++ b/backend/src/services/assignments.ts
@@ -3,15 +3,12 @@ import { mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId } from '../in
 import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submission.js';
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
-import { getLogger } from '../logging/initalize.js';
+import {fetchClass} from "./classes";
+import {Assignment} from "../entities/assignments/assignment.entity";
+import {NotFoundException} from "../exceptions/not-found-exception";
 
 export async function getAllAssignments(classid: string, full: boolean): Promise<AssignmentDTO[]> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classid);
-
-    if (!cls) {
-        return [];
-    }
+    const cls = await fetchClass(classid);
 
     const assignmentRepository = getAssignmentRepository();
     const assignments = await assignmentRepository.findAllAssignmentsInClass(cls);
@@ -23,43 +20,34 @@ export async function getAllAssignments(classid: string, full: boolean): Promise
     return assignments.map(mapToAssignmentDTOId);
 }
 
-export async function createAssignment(classid: string, assignmentData: AssignmentDTO): Promise<AssignmentDTO | null> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classid);
-
-    if (!cls) {
-        return null;
-    }
+export async function createAssignment(classid: string, assignmentData: AssignmentDTO): Promise<AssignmentDTO> {
+    const cls = await fetchClass(classid);
 
     const assignment = mapToAssignment(assignmentData, cls);
     const assignmentRepository = getAssignmentRepository();
 
-    try {
-        const newAssignment = assignmentRepository.create(assignment);
-        await assignmentRepository.save(newAssignment);
+    const newAssignment = assignmentRepository.create(assignment);
+    await assignmentRepository.save(newAssignment, {preventOverwrite: true});
+
+    return mapToAssignmentDTO(newAssignment);
 
-        return mapToAssignmentDTO(newAssignment);
-    } catch (e) {
-        getLogger().error(e);
-        return null;
-    }
 }
 
-export async function getAssignment(classid: string, id: number): Promise<AssignmentDTO | null> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classid);
-
-    if (!cls) {
-        return null;
-    }
+export async function fetchAssignment(classid: string, id: number): Promise<Assignment> {
+    const cls = await fetchClass(classid);
 
     const assignmentRepository = getAssignmentRepository();
     const assignment = await assignmentRepository.findByClassAndId(cls, id);
 
-    if (!assignment) {
-        return null;
+    if (!assignment){
+        throw new NotFoundException('Assignment with id not found');
     }
 
+    return assignment;
+}
+
+export async function getAssignment(classid: string, id: number): Promise<AssignmentDTO> {
+    const assignment = await fetchAssignment(classid, id);
     return mapToAssignmentDTO(assignment);
 }
 
@@ -68,23 +56,15 @@ export async function getAssignmentsSubmissions(
     assignmentNumber: number,
     full: boolean
 ): Promise<SubmissionDTO[] | SubmissionDTOId[]> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classid);
-
-    if (!cls) {
-        return [];
-    }
-
-    const assignmentRepository = getAssignmentRepository();
-    const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber);
-
-    if (!assignment) {
-        return [];
-    }
+    const assignment = await fetchAssignment(classid, assignmentNumber);
 
     const groupRepository = getGroupRepository();
     const groups = await groupRepository.findAllGroupsForAssignment(assignment);
 
+    if (groups.length === 0){
+        throw new NotFoundException('No groups for assignment found');
+    }
+
     const submissionRepository = getSubmissionRepository();
     const submissions = (await Promise.all(groups.map(async (group) => submissionRepository.findAllSubmissionsForGroup(group)))).flat();
 

From 609073cfbafb091253fa62e3504aed3a905fb728 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sun, 6 Apr 2025 12:48:02 +0200
Subject: [PATCH 039/177] fix: juiste router llink meegeven

---
 frontend/src/views/classes/TeacherClasses.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
index be174003..7cbe6cca 100644
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -154,7 +154,7 @@
                                 >
                                     <td>
                                         <v-btn
-                                            :to="`/user/class/${c.id}`"
+                                            :to="`/class/${c.id}`"
                                             variant="text"
                                         >
                                             {{ c.displayName }}

From fe17d92cd23b48bbe8d4308438d8c3d48764a0f4 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sun, 6 Apr 2025 14:33:17 +0200
Subject: [PATCH 040/177] fix: laat andere succes codes toe dan enkel 200
 (nodig voor 201 created)

---
 frontend/src/controllers/base-controller.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/controllers/base-controller.ts b/frontend/src/controllers/base-controller.ts
index 72d71819..0262d352 100644
--- a/frontend/src/controllers/base-controller.ts
+++ b/frontend/src/controllers/base-controller.ts
@@ -10,7 +10,7 @@ export abstract class BaseController {
     }
 
     private static assertSuccessResponse(response: AxiosResponse<unknown, unknown>): void {
-        if (response.status / 100 !== 2) {
+        if (response.status < 200 || response.status >= 300) {
             throw new HttpErrorResponseException(response);
         }
     }

From ae816a4ccb47b587d16e7836a166b78a6a271e9b Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sun, 6 Apr 2025 14:39:55 +0200
Subject: [PATCH 041/177] fix: geef classresponse terug in backend zodat
 frontend controllers werken

---
 backend/src/controllers/classes.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts
index a041bf22..b9c14ca9 100644
--- a/backend/src/controllers/classes.ts
+++ b/backend/src/controllers/classes.ts
@@ -28,7 +28,7 @@ export async function createClassHandler(req: Request, res: Response): Promise<v
         return;
     }
 
-    res.status(201).json(cls);
+    res.status(201).json({cls});
 }
 
 export async function getClassHandler(req: Request, res: Response): Promise<void> {

From ebead11db38a93af0840acf1aa6417dff4f0bfc2 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sun, 6 Apr 2025 14:45:56 +0200
Subject: [PATCH 042/177] fix: class bestond niet op antwoord uit backend omdat
 dit niet als variabele  gebruikt kan worden, alles veranderd naar cls

---
 backend/src/controllers/classes.ts  | 2 +-
 frontend/src/controllers/classes.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts
index b9c14ca9..7fa5e0c0 100644
--- a/backend/src/controllers/classes.ts
+++ b/backend/src/controllers/classes.ts
@@ -28,7 +28,7 @@ export async function createClassHandler(req: Request, res: Response): Promise<v
         return;
     }
 
-    res.status(201).json({cls});
+    res.status(201).json({ cls });
 }
 
 export async function getClassHandler(req: Request, res: Response): Promise<void> {
diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts
index dadf6dec..41e53c0c 100644
--- a/frontend/src/controllers/classes.ts
+++ b/frontend/src/controllers/classes.ts
@@ -9,7 +9,7 @@ export interface ClassesResponse {
 }
 
 export interface ClassResponse {
-    class: ClassDTO;
+    cls: ClassDTO;
 }
 
 export interface TeacherInvitationsResponse {

From 51b1940d2a9e8cf371c138827d5fc7c1e7d8f6f0 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sun, 6 Apr 2025 15:04:21 +0200
Subject: [PATCH 043/177] feat: klas aanmaken

---
 frontend/src/views/classes/TeacherClasses.vue | 53 +++++++++++++++----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
index 7cbe6cca..4b6fddbf 100644
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -6,8 +6,10 @@
     import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
     import type { TeacherInvitationDTO } from "@dwengo-1/common/interfaces/teacher-invitation";
     import { useTeacherClassesQuery } from "@/queries/teachers";
+    import { ClassController, type ClassResponse } from "@/controllers/classes";
 
     const { t } = useI18n();
+    const classController = new ClassController();
 
     // Username of logged in teacher
     const username = ref<string | undefined>(undefined);
@@ -20,7 +22,7 @@
     });
 
     // Fetch all classes of the logged in teacher
-    const { data: classesResponse, isLoading, error } = useTeacherClassesQuery(username, true);
+    const { data: classesResponse, isLoading, error, refetch } = useTeacherClassesQuery(username, true);
 
     // Empty list when classes are not yet loaded, else the list of classes of the user
     const classes: ComputedRef<ClassDTO[]> = computed(() => {
@@ -72,27 +74,53 @@
     const nameRules = [
         (value: string | undefined): string | boolean => {
             if (!value) return true;
-            if (value && (/^[a-zA-Z0-9_-]+$/.test(value))) return true;
+            if (value && /^[a-zA-Z0-9_-]+$/.test(value)) return true;
             return t("onlyUse");
         },
     ];
 
     // Function called when a teacher creates a class
-    function createClass(): void {
+    async function createClass(): Promise<void> {
         // Check if the class name is valid
         if (className.value && className.value.length > 0 && /^[a-zA-Z0-9_-]+$/.test(className.value)) {
-            //TODO > waiting on updated frontend controllers
-            console.log("created class with name: " + className.value);
+            try {
+                const classDto: ClassDTO = {
+                    id: "",
+                    displayName: className.value,
+                    teachers: [username.value!],
+                    students: [],
+                    joinRequests: [],
+                };
+                const classResponse : ClassResponse = await classController.createClass(classDto);
+                const createdClass : ClassDTO = classResponse.cls;
+                code.value = createdClass.id;
+                dialog.value = true;
+                showSnackbar(t("created"), "success");
 
-            // Show the generated code to share with the class
-            dialog.value = true;
-            code.value = "04c7c759-c41e-4ea9-968a-1e2a987ce0ed";
+                // reload the table with classes
+                await refetch();
+
+            } catch (e: any) {
+                showSnackbar(t("wrong"), "error");
+            }
         }
         if (!className.value || className.value === "") {
-            alert("classname should not be empty")
+            alert("classname should not be empty");
         }
     }
 
+    const snackbar = ref({
+        visible: false,
+        message: "",
+        color: "success",
+    });
+
+    function showSnackbar(message: string, color: string): void {
+        snackbar.value.message = message;
+        snackbar.value.color = color;
+        snackbar.value.visible = true;
+    }
+
     // Show the teacher, copying of the code was a successs
     const copied = ref(false);
 
@@ -283,6 +311,13 @@
                 </tbody>
             </v-table>
         </div>
+        <v-snackbar
+            v-model="snackbar.visible"
+            :color="snackbar.color"
+            timeout="3000"
+        >
+            {{ snackbar.message }}
+        </v-snackbar>
     </main>
 </template>
 <style scoped>

From 7f2eeff25e81c167296fca3cf8d3061c39e47b65 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sun, 6 Apr 2025 15:04:36 +0200
Subject: [PATCH 044/177] feat: vertalingen

---
 frontend/src/i18n/locale/de.json | 4 +++-
 frontend/src/i18n/locale/en.json | 4 +++-
 frontend/src/i18n/locale/fr.json | 4 +++-
 frontend/src/i18n/locale/nl.json | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/frontend/src/i18n/locale/de.json b/frontend/src/i18n/locale/de.json
index 4e6d0190..f9412ca6 100644
--- a/frontend/src/i18n/locale/de.json
+++ b/frontend/src/i18n/locale/de.json
@@ -73,5 +73,7 @@
     "accept": "akzeptieren",
     "deny": "verweigern",
     "sent": "sent",
-    "failed": "gescheitert"
+    "failed": "gescheitert",
+    "wrong": "etwas ist schief gelaufen",
+    "created": "erstellt"
 }
diff --git a/frontend/src/i18n/locale/en.json b/frontend/src/i18n/locale/en.json
index 06339d2a..171eb1f8 100644
--- a/frontend/src/i18n/locale/en.json
+++ b/frontend/src/i18n/locale/en.json
@@ -73,5 +73,7 @@
     "deny": "deny",
     "createClassInstructions": "Enter a name for your class and click on create. A window will appear with a code that you can copy. Give this code to your students and they will be able to join.",
     "sent": "sent",
-    "failed": "failed"
+    "failed": "failed",
+    "wrong": "something went wrong",
+    "created": "created"
 }
diff --git a/frontend/src/i18n/locale/fr.json b/frontend/src/i18n/locale/fr.json
index 3ce48318..a3d3d89b 100644
--- a/frontend/src/i18n/locale/fr.json
+++ b/frontend/src/i18n/locale/fr.json
@@ -73,5 +73,7 @@
     "accept": "accepter",
     "deny": "refuser",
     "sent": "envoyé",
-    "failed": "échoué"
+    "failed": "échoué",
+    "wrong": "quelque chose n'a pas fonctionné",
+    "created": "créé"
 }
diff --git a/frontend/src/i18n/locale/nl.json b/frontend/src/i18n/locale/nl.json
index 82a310a6..1fbed08d 100644
--- a/frontend/src/i18n/locale/nl.json
+++ b/frontend/src/i18n/locale/nl.json
@@ -73,5 +73,7 @@
     "accept": "accepteren",
     "deny": "weigeren",
     "sent": "verzonden",
-    "failed": "mislukt"
+    "failed": "mislukt",
+    "wrong": "er ging iets verkeerd",
+    "created": "gecreëerd"
 }

From c47f84ed70bc1eebe8a9767bdb0a992daca650ed Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sun, 6 Apr 2025 15:14:25 +0200
Subject: [PATCH 045/177] style: elegantere code

---
 frontend/src/views/classes/StudentClasses.vue | 7 -------
 frontend/src/views/classes/TeacherClasses.vue | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/frontend/src/views/classes/StudentClasses.vue b/frontend/src/views/classes/StudentClasses.vue
index 06ff853d..c201a9a9 100644
--- a/frontend/src/views/classes/StudentClasses.vue
+++ b/frontend/src/views/classes/StudentClasses.vue
@@ -34,13 +34,6 @@
         if (classesResponse.value.classes.length === 0) {
             return [];
         }
-        if (typeof classesResponse.value.classes[0] === "string") {
-            // Should not occur because value of *full* is true
-            // Must be caught because typescript can't know the type
-            // I chose to return an empty list if this occurs
-            // It is also possible to fetch all classes from the id's returned
-            return [];
-        }
         return classesResponse.value.classes as ClassDTO[];
     });
 
diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
index 4b6fddbf..5477e468 100644
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -34,13 +34,6 @@
         if (classesResponse.value.classes.length === 0) {
             return [];
         }
-        if (typeof classesResponse.value.classes[0] === "string") {
-            // Should not occur because value of *full* is true
-            // Must be caught because typescript can't know the type
-            // I chose to return an empty list if this occurs
-            // It is also possible to fetch all classes from the id's returned
-            return [];
-        }
         return classesResponse.value.classes as ClassDTO[];
     });
 

From dd08738f99e83e3b7f0c4099f034f4f4f1afd0db Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sun, 6 Apr 2025 15:28:09 +0200
Subject: [PATCH 046/177] style: format

---
 frontend/src/views/classes/StudentClasses.vue | 11 +++++------
 frontend/src/views/classes/TeacherClasses.vue |  5 ++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/classes/StudentClasses.vue b/frontend/src/views/classes/StudentClasses.vue
index c201a9a9..1ff60cb1 100644
--- a/frontend/src/views/classes/StudentClasses.vue
+++ b/frontend/src/views/classes/StudentClasses.vue
@@ -80,9 +80,8 @@
                 return true;
             } else if (value !== undefined && validate(value) && version(value) === 4) {
                 return true;
-            } 
-                return t("invalidFormat");
-            
+            }
+            return t("invalidFormat");
         },
     ];
 
@@ -90,7 +89,7 @@
     const { mutate } = useCreateJoinRequestMutation();
 
     // Function called when a student submits a code to join a class
-    function submitCode() : void {
+    function submitCode(): void {
         // Check if the code is valid
         if (code.value !== undefined && validate(code.value) && version(code.value) === 4) {
             mutate(
@@ -114,11 +113,11 @@
         color: "success",
     });
 
-    function showSnackbar(message: string, color: string) : void {
+    function showSnackbar(message: string, color: string): void {
         snackbar.value.message = message;
         snackbar.value.color = color;
         snackbar.value.visible = true;
-    };
+    }
 </script>
 <template>
     <main>
diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
index 5477e468..f96439a8 100644
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -84,15 +84,14 @@
                     students: [],
                     joinRequests: [],
                 };
-                const classResponse : ClassResponse = await classController.createClass(classDto);
-                const createdClass : ClassDTO = classResponse.cls;
+                const classResponse: ClassResponse = await classController.createClass(classDto);
+                const createdClass: ClassDTO = classResponse.cls;
                 code.value = createdClass.id;
                 dialog.value = true;
                 showSnackbar(t("created"), "success");
 
                 // reload the table with classes
                 await refetch();
-
             } catch (e: any) {
                 showSnackbar(t("wrong"), "error");
             }

From e5bdb9f621612f3e3272c3944934b7b3a277d550 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sun, 6 Apr 2025 15:43:19 +0200
Subject: [PATCH 047/177] feat: zie alle studenten van een klas

---
 backend/src/controllers/classes.ts            |   4 +-
 frontend/src/controllers/classes.ts           |   2 +-
 frontend/src/views/classes/SingleClass.vue    | 257 +++++++++++++++++-
 frontend/src/views/classes/TeacherClasses.vue |   2 +-
 4 files changed, 257 insertions(+), 8 deletions(-)

diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts
index 7fa5e0c0..03e88a52 100644
--- a/backend/src/controllers/classes.ts
+++ b/backend/src/controllers/classes.ts
@@ -28,7 +28,7 @@ export async function createClassHandler(req: Request, res: Response): Promise<v
         return;
     }
 
-    res.status(201).json({ cls });
+    res.status(201).json({ class: cls });
 }
 
 export async function getClassHandler(req: Request, res: Response): Promise<void> {
@@ -40,7 +40,7 @@ export async function getClassHandler(req: Request, res: Response): Promise<void
         return;
     }
 
-    res.json(cls);
+    res.json({ class: cls });
 }
 
 export async function getClassStudentsHandler(req: Request, res: Response): Promise<void> {
diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts
index 41e53c0c..dadf6dec 100644
--- a/frontend/src/controllers/classes.ts
+++ b/frontend/src/controllers/classes.ts
@@ -9,7 +9,7 @@ export interface ClassesResponse {
 }
 
 export interface ClassResponse {
-    cls: ClassDTO;
+    class: ClassDTO;
 }
 
 export interface TeacherInvitationsResponse {
diff --git a/frontend/src/views/classes/SingleClass.vue b/frontend/src/views/classes/SingleClass.vue
index 1a35a59f..0956f5c4 100644
--- a/frontend/src/views/classes/SingleClass.vue
+++ b/frontend/src/views/classes/SingleClass.vue
@@ -1,7 +1,256 @@
-<script setup lang="ts"></script>
+<script setup lang="ts">
+    import { useI18n } from "vue-i18n";
+    import authState from "@/services/auth/auth-service.ts";
+    import { computed, onMounted, ref, type ComputedRef } from "vue";
+    import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
+    import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
+    import type { TeacherInvitationDTO } from "@dwengo-1/common/interfaces/teacher-invitation";
+    import { useTeacherClassesQuery } from "@/queries/teachers";
+    import { useRoute } from "vue-router";
+    import { ClassController, type ClassResponse } from "@/controllers/classes";
+    import type { StudentsResponse } from "@/controllers/students";
+    import { type StudentDTO } from "@dwengo-1/common/interfaces/student";
 
+    const { t } = useI18n();
+
+    // Username of logged in teacher
+    const username = ref<string | undefined>(undefined);
+    const classController: ClassController = new ClassController();
+
+    // find class id from route
+    const route = useRoute();
+    const classId: string = route.params.id as string;
+
+    const isLoading = ref(true);
+    const currentClass = ref<ClassDTO | undefined>(undefined);
+    const students = ref<StudentDTO[]>([]);
+
+    // Find the username of the logged in user so it can be used to fetch other information
+    // When loading the page
+    onMounted(async () => {
+        const userObject = await authState.loadUser();
+        username.value = userObject?.profile?.preferred_username ?? undefined;
+
+        // get class of which information should be shown
+        const classResponse: ClassResponse = await classController.getById(classId);
+        console.log(classResponse);
+        if (classResponse && classResponse.class) {
+            currentClass.value = classResponse.class;
+            isLoading.value = false;
+        }
+
+        // Fetch all students of the class
+        const studentsResponse: StudentsResponse = await classController.getStudents(classId);
+        if (studentsResponse && studentsResponse.students) students.value = studentsResponse.students as StudentDTO[];
+
+    });
+
+    // TODO: Boolean that handles visibility for dialogs
+    // Creating a class will generate a popup with the generated code
+    const dialog = ref(false);
+
+    // TODO: waiting on frontend controllers
+    const invitations = ref<TeacherInvitationDTO[]>([]);
+
+    // Function to handle a accepted invitation request
+    function acceptRequest(): void {
+        //TODO > waiting on updated frontend controllers
+        console.log("request accepted");
+    }
+
+    // Function to handle a denied invitation request
+    function denyRequest(): void {
+        //TODO > waiting on frontend controllers
+        console.log("request denied");
+    }
+
+    // remove student from class
+    function removeStudentFromclass(s: StudentDTO): void {
+        //TODO
+    }
+</script>
 <template>
-    <main></main>
-</template>
+    <main>
+        <div
+            v-if="isLoading"
+            class="text-center py-10"
+        >
+            <v-progress-circular
+                indeterminate
+                color="primary"
+            />
+            <p>Loading...</p>
+        </div>
+        <div v-else>
+            <h1 class="title">{{ currentClass!.displayName }}</h1>
+            <v-container
+                fluid
+                class="ma-4"
+            >
+                <v-row
+                    no-gutters
+                    fluid
+                >
+                    <v-col
+                        cols="12"
+                        sm="6"
+                        md="6"
+                    >
+                        <v-table class="table">
+                            <thead>
+                                <tr>
+                                    <th class="header">{{ t("students") }}</th>
+                                    <th class="header"></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr
+                                    v-for="s in students"
+                                    :key="s.id"
+                                >
+                                    <td>
+                                        {{ s.firstName + " " + s.lastName }}
+                                    </td>
+                                    <td>
+                                        <v-btn @click="removeStudentFromclass(s)"> remove </v-btn>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </v-table>
+                    </v-col>
+                </v-row>
+            </v-container>
 
-<style scoped></style>
+            <h1 class="title">
+                {{ t("invitations") }}
+            </h1>
+            <v-table class="table">
+                <thead>
+                    <tr>
+                        <th class="header">{{ t("class") }}</th>
+                        <th class="header">{{ t("sender") }}</th>
+                        <th class="header"></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr
+                        v-for="i in invitations"
+                        :key="(i.class as ClassDTO).id"
+                    >
+                        <td>
+                            {{ (i.class as ClassDTO).displayName }}
+                        </td>
+                        <td>{{ (i.sender as TeacherDTO).firstName + " " + (i.sender as TeacherDTO).lastName }}</td>
+                        <td class="text-right">
+                            <div>
+                                <v-btn
+                                    color="green"
+                                    @click="acceptRequest"
+                                    class="mr-2"
+                                >
+                                    {{ t("accept") }}
+                                </v-btn>
+                                <v-btn
+                                    color="red"
+                                    @click="denyRequest"
+                                >
+                                    {{ t("deny") }}
+                                </v-btn>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </v-table>
+        </div>
+    </main>
+</template>
+<style scoped>
+    .header {
+        font-weight: bold !important;
+        background-color: #0e6942;
+        color: white;
+        padding: 10px;
+    }
+
+    table thead th:first-child {
+        border-top-left-radius: 10px;
+    }
+
+    .table thead th:last-child {
+        border-top-right-radius: 10px;
+    }
+
+    .table tbody tr:nth-child(odd) {
+        background-color: white;
+    }
+
+    .table tbody tr:nth-child(even) {
+        background-color: #f6faf2;
+    }
+
+    td,
+    th {
+        border-bottom: 1px solid #0e6942;
+        border-top: 1px solid #0e6942;
+    }
+
+    .table {
+        width: 90%;
+        padding-top: 10px;
+        border-collapse: collapse;
+    }
+
+    h1 {
+        color: #0e6942;
+        text-transform: uppercase;
+        font-weight: bolder;
+        padding-top: 2%;
+        font-size: 50px;
+    }
+
+    h2 {
+        color: #0e6942;
+        font-size: 30px;
+    }
+
+    .join {
+        display: flex;
+        flex-direction: column;
+        gap: 20px;
+        margin-top: 50px;
+    }
+
+    .link {
+        color: #0b75bb;
+        text-decoration: underline;
+    }
+
+    main {
+        margin-left: 30px;
+    }
+
+    @media screen and (max-width: 800px) {
+        h1 {
+            text-align: center;
+            padding-left: 0;
+        }
+
+        .join {
+            text-align: center;
+            align-items: center;
+            margin-left: 0;
+        }
+
+        .sheet {
+            width: 100%;
+        }
+
+        main {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            margin: 5px;
+        }
+    }
+</style>
diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
index f96439a8..0f35901b 100644
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -85,7 +85,7 @@
                     joinRequests: [],
                 };
                 const classResponse: ClassResponse = await classController.createClass(classDto);
-                const createdClass: ClassDTO = classResponse.cls;
+                const createdClass: ClassDTO = classResponse.class;
                 code.value = createdClass.id;
                 dialog.value = true;
                 showSnackbar(t("created"), "success");

From 4074ae9ba4bd4d262cfedfd9cda0a29af3c4df65 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sun, 6 Apr 2025 15:58:50 +0200
Subject: [PATCH 048/177] feat: remove button zonder functionaliteit

---
 frontend/src/views/classes/SingleClass.vue | 81 +++++++++-------------
 1 file changed, 34 insertions(+), 47 deletions(-)

diff --git a/frontend/src/views/classes/SingleClass.vue b/frontend/src/views/classes/SingleClass.vue
index 0956f5c4..57ac65b7 100644
--- a/frontend/src/views/classes/SingleClass.vue
+++ b/frontend/src/views/classes/SingleClass.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
     import { useI18n } from "vue-i18n";
     import authState from "@/services/auth/auth-service.ts";
-    import { computed, onMounted, ref, type ComputedRef } from "vue";
+    import { onMounted, ref } from "vue";
     import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
     import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
     import type { TeacherInvitationDTO } from "@dwengo-1/common/interfaces/teacher-invitation";
@@ -42,12 +42,12 @@
         // Fetch all students of the class
         const studentsResponse: StudentsResponse = await classController.getStudents(classId);
         if (studentsResponse && studentsResponse.students) students.value = studentsResponse.students as StudentDTO[];
-
     });
 
     // TODO: Boolean that handles visibility for dialogs
-    // Creating a class will generate a popup with the generated code
+    // popup to verify removing student
     const dialog = ref(false);
+    const selectedStudent = ref<StudentDTO | null>(null);
 
     // TODO: waiting on frontend controllers
     const invitations = ref<TeacherInvitationDTO[]>([]);
@@ -64,9 +64,14 @@
         console.log("request denied");
     }
 
+    function showPopup(s: StudentDTO): void {
+        selectedStudent.value = s;
+        dialog.value = true;
+    }
+
     // remove student from class
-    function removeStudentFromclass(s: StudentDTO): void {
-        //TODO
+    function removeStudentFromclass(): void {
+        
     }
 </script>
 <template>
@@ -112,7 +117,7 @@
                                         {{ s.firstName + " " + s.lastName }}
                                     </td>
                                     <td>
-                                        <v-btn @click="removeStudentFromclass(s)"> remove </v-btn>
+                                        <v-btn @click="showPopup"> {{ t("remove") }} </v-btn>
                                     </td>
                                 </tr>
                             </tbody>
@@ -120,48 +125,30 @@
                     </v-col>
                 </v-row>
             </v-container>
-
-            <h1 class="title">
-                {{ t("invitations") }}
-            </h1>
-            <v-table class="table">
-                <thead>
-                    <tr>
-                        <th class="header">{{ t("class") }}</th>
-                        <th class="header">{{ t("sender") }}</th>
-                        <th class="header"></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr
-                        v-for="i in invitations"
-                        :key="(i.class as ClassDTO).id"
-                    >
-                        <td>
-                            {{ (i.class as ClassDTO).displayName }}
-                        </td>
-                        <td>{{ (i.sender as TeacherDTO).firstName + " " + (i.sender as TeacherDTO).lastName }}</td>
-                        <td class="text-right">
-                            <div>
-                                <v-btn
-                                    color="green"
-                                    @click="acceptRequest"
-                                    class="mr-2"
-                                >
-                                    {{ t("accept") }}
-                                </v-btn>
-                                <v-btn
-                                    color="red"
-                                    @click="denyRequest"
-                                >
-                                    {{ t("deny") }}
-                                </v-btn>
-                            </div>
-                        </td>
-                    </tr>
-                </tbody>
-            </v-table>
         </div>
+        <v-dialog
+            v-model="dialog"
+            max-width="400px"
+        >
+            <v-card>
+                <v-card-title class="headline">{{ t("areusure") }}</v-card-title>
+
+                <v-card-actions>
+                    <v-spacer></v-spacer>
+                    <v-btn
+                        text
+                        @click="dialog = false"
+                    >
+                        {{ t("cancel") }}
+                    </v-btn>
+                    <v-btn
+                        text
+                        @click="removeStudentFromclass"
+                        >{{ t("yes") }}</v-btn
+                    >
+                </v-card-actions>
+            </v-card>
+        </v-dialog>
     </main>
 </template>
 <style scoped>

From 3de6a77843b66afc9597f3f6a9b204d283cfe502 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Sun, 6 Apr 2025 16:05:32 +0200
Subject: [PATCH 049/177] style: format and lint

---
 frontend/src/views/classes/SingleClass.vue    | 15 ++++++---------
 frontend/src/views/classes/TeacherClasses.vue |  6 +++---
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/frontend/src/views/classes/SingleClass.vue b/frontend/src/views/classes/SingleClass.vue
index 57ac65b7..83eb6f37 100644
--- a/frontend/src/views/classes/SingleClass.vue
+++ b/frontend/src/views/classes/SingleClass.vue
@@ -2,14 +2,12 @@
     import { useI18n } from "vue-i18n";
     import authState from "@/services/auth/auth-service.ts";
     import { onMounted, ref } from "vue";
-    import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
     import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
     import type { TeacherInvitationDTO } from "@dwengo-1/common/interfaces/teacher-invitation";
-    import { useTeacherClassesQuery } from "@/queries/teachers";
     import { useRoute } from "vue-router";
     import { ClassController, type ClassResponse } from "@/controllers/classes";
     import type { StudentsResponse } from "@/controllers/students";
-    import { type StudentDTO } from "@dwengo-1/common/interfaces/student";
+    import type { StudentDTO } from "@dwengo-1/common/interfaces/student";
 
     const { t } = useI18n();
 
@@ -17,7 +15,7 @@
     const username = ref<string | undefined>(undefined);
     const classController: ClassController = new ClassController();
 
-    // find class id from route
+    // Find class id from route
     const route = useRoute();
     const classId: string = route.params.id as string;
 
@@ -31,9 +29,8 @@
         const userObject = await authState.loadUser();
         username.value = userObject?.profile?.preferred_username ?? undefined;
 
-        // get class of which information should be shown
+        // Get class of which information should be shown
         const classResponse: ClassResponse = await classController.getById(classId);
-        console.log(classResponse);
         if (classResponse && classResponse.class) {
             currentClass.value = classResponse.class;
             isLoading.value = false;
@@ -45,7 +42,7 @@
     });
 
     // TODO: Boolean that handles visibility for dialogs
-    // popup to verify removing student
+    // Popup to verify removing student
     const dialog = ref(false);
     const selectedStudent = ref<StudentDTO | null>(null);
 
@@ -69,9 +66,9 @@
         dialog.value = true;
     }
 
-    // remove student from class
+    // Remove student from class
     function removeStudentFromclass(): void {
-        
+        console.log("student removed");
     }
 </script>
 <template>
diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
index 0f35901b..fdac2e25 100644
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -90,14 +90,14 @@
                 dialog.value = true;
                 showSnackbar(t("created"), "success");
 
-                // reload the table with classes
+                // Reload the table with classes
                 await refetch();
-            } catch (e: any) {
+            } catch (_) {
                 showSnackbar(t("wrong"), "error");
             }
         }
         if (!className.value || className.value === "") {
-            alert("classname should not be empty");
+            showSnackbar(t("name is mandatory"), "error");
         }
     }
 

From 29824c549ed90da314a8f1c29b985e3f3fd0b021 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Sun, 6 Apr 2025 16:26:28 +0200
Subject: [PATCH 050/177] fix: classes error handeling en return json

---
 backend/src/controllers/classes.ts | 61 +++++++++++-----------
 backend/src/services/classes.ts    | 82 ++++++++++--------------------
 2 files changed, 59 insertions(+), 84 deletions(-)

diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts
index a041bf22..8e9efdcb 100644
--- a/backend/src/controllers/classes.ts
+++ b/backend/src/controllers/classes.ts
@@ -1,44 +1,37 @@
 import { Request, Response } from 'express';
-import { createClass, getAllClasses, getClass, getClassStudents, getClassStudentsIds, getClassTeacherInvitations } from '../services/classes.js';
+import {
+    createClass,
+    getAllClasses,
+    getClass,
+    getClassStudents,
+    getClassTeacherInvitations,
+    getClassTeachers
+} from '../services/classes.js';
 import { ClassDTO } from '@dwengo-1/common/interfaces/class';
+import {requireFields} from "./error-helper";
 
 export async function getAllClassesHandler(req: Request, res: Response): Promise<void> {
     const full = req.query.full === 'true';
     const classes = await getAllClasses(full);
 
-    res.json({
-        classes: classes,
-    });
+    res.json({ classes });
 }
 
 export async function createClassHandler(req: Request, res: Response): Promise<void> {
+    const displayName= req.body.displayName;
+    requireFields({ displayName });
+
     const classData = req.body as ClassDTO;
-
-    if (!classData.displayName) {
-        res.status(400).json({
-            error: 'Missing one or more required fields: displayName',
-        });
-        return;
-    }
-
     const cls = await createClass(classData);
 
-    if (!cls) {
-        res.status(500).json({ error: 'Something went wrong while creating class' });
-        return;
-    }
-
-    res.status(201).json(cls);
+    res.json({ cls });
 }
 
 export async function getClassHandler(req: Request, res: Response): Promise<void> {
     const classId = req.params.id;
-    const cls = await getClass(classId);
+    requireFields({ classId });
 
-    if (!cls) {
-        res.status(404).json({ error: 'Class not found' });
-        return;
-    }
+    const cls = await getClass(classId);
 
     res.json(cls);
 }
@@ -46,21 +39,29 @@ export async function getClassHandler(req: Request, res: Response): Promise<void
 export async function getClassStudentsHandler(req: Request, res: Response): Promise<void> {
     const classId = req.params.id;
     const full = req.query.full === 'true';
+    requireFields({ classId });
 
-    const students = full ? await getClassStudents(classId) : await getClassStudentsIds(classId);
+    const students = await getClassStudents(classId, full);
 
-    res.json({
-        students: students,
-    });
+    res.json({ students });
+}
+
+export async function getClassTeachersHandler(req: Request, res: Response): Promise<void> {
+    const classId = req.params.id;
+    const full = req.query.full === 'true';
+    requireFields({ classId });
+
+    const teachers = await getClassTeachers(classId, full);
+
+    res.json({ teachers });
 }
 
 export async function getTeacherInvitationsHandler(req: Request, res: Response): Promise<void> {
     const classId = req.params.id;
     const full = req.query.full === 'true';
+    requireFields({ classId });
 
     const invitations = await getClassTeacherInvitations(classId, full);
 
-    res.json({
-        invitations: invitations,
-    });
+    res.json({ invitations });
 }
diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index 754277cf..d4e4defa 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -8,8 +8,10 @@ import { Class } from '../entities/classes/class.entity.js';
 import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
 import { StudentDTO } from '@dwengo-1/common/interfaces/student';
-
-const logger = getLogger();
+import {fetchTeacher} from "./teachers";
+import {fetchStudent} from "./students";
+import {TeacherDTO} from "@dwengo-1/common/interfaces/teacher";
+import {mapToTeacherDTO} from "../interfaces/teacher";
 
 export async function fetchClass(classId: string): Promise<Class> {
     const classRepository = getClassRepository();
@@ -26,84 +28,56 @@ export async function getAllClasses(full: boolean): Promise<ClassDTO[] | string[
     const classRepository = getClassRepository();
     const classes = await classRepository.find({}, { populate: ['students', 'teachers'] });
 
-    if (!classes) {
-        return [];
-    }
-
     if (full) {
         return classes.map(mapToClassDTO);
     }
     return classes.map((cls) => cls.classId!);
 }
 
-export async function createClass(classData: ClassDTO): Promise<ClassDTO | null> {
-    const teacherRepository = getTeacherRepository();
+export async function createClass(classData: ClassDTO): Promise<ClassDTO> {
     const teacherUsernames = classData.teachers || [];
-    const teachers = (await Promise.all(teacherUsernames.map(async (id) => teacherRepository.findByUsername(id)))).filter(
-        (teacher) => teacher !== null
-    );
+    const teachers = (await Promise.all(teacherUsernames.map(async (id) => fetchTeacher(id) )));
 
-    const studentRepository = getStudentRepository();
     const studentUsernames = classData.students || [];
-    const students = (await Promise.all(studentUsernames.map(async (id) => studentRepository.findByUsername(id)))).filter(
-        (student) => student !== null
-    );
+    const students = (await Promise.all(studentUsernames.map(async (id) => fetchStudent(id) )));
 
     const classRepository = getClassRepository();
 
-    try {
-        const newClass = classRepository.create({
-            displayName: classData.displayName,
-            teachers: teachers,
-            students: students,
-        });
-        await classRepository.save(newClass);
+    const newClass = classRepository.create({
+        displayName: classData.displayName,
+        teachers: teachers,
+        students: students,
+    });
+    await classRepository.save(newClass, {preventOverwrite: true});
 
-        return mapToClassDTO(newClass);
-    } catch (e) {
-        logger.error(e);
-        return null;
-    }
+    return mapToClassDTO(newClass);
 }
 
-export async function getClass(classId: string): Promise<ClassDTO | null> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classId);
-
-    if (!cls) {
-        return null;
-    }
-
+export async function getClass(classId: string): Promise<ClassDTO> {
+    const cls = await fetchClass(classId);
     return mapToClassDTO(cls);
 }
 
-async function fetchClassStudents(classId: string): Promise<StudentDTO[]> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classId);
+export async function getClassStudents(classId: string, full: boolean): Promise<StudentDTO[] | string[]> {
+    const cls = await fetchClass(classId);
 
-    if (!cls) {
-        return [];
+    if (full){
+        return cls.students.map(mapToStudentDTO);
     }
-
-    return cls.students.map(mapToStudentDTO);
+    return cls.students.map((student) => student.username);
 }
 
-export async function getClassStudents(classId: string): Promise<StudentDTO[]> {
-    return await fetchClassStudents(classId);
-}
+export async function getClassTeachers(classId: string, full: boolean): Promise<TeacherDTO[] | string[]> {
+    const cls = await fetchClass(classId);
 
-export async function getClassStudentsIds(classId: string): Promise<string[]> {
-    const students: StudentDTO[] = await fetchClassStudents(classId);
-    return students.map((student) => student.username);
+    if (full){
+        return cls.teachers.map(mapToTeacherDTO);
+    }
+    return cls.teachers.map((student) => student.username);
 }
 
 export async function getClassTeacherInvitations(classId: string, full: boolean): Promise<TeacherInvitationDTO[]> {
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classId);
-
-    if (!cls) {
-        return [];
-    }
+    const cls = await fetchClass(classId);
 
     const teacherInvitationRepository = getTeacherInvitationRepository();
     const invitations = await teacherInvitationRepository.findAllInvitationsForClass(cls);

From db3c531038dc6a5dba67d76db943b9a195b8d683 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Sun, 6 Apr 2025 16:26:52 +0200
Subject: [PATCH 051/177] feat: get teachers van class

---
 backend/src/routes/classes.ts       | 4 +++-
 frontend/src/controllers/classes.ts | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/backend/src/routes/classes.ts b/backend/src/routes/classes.ts
index e0972988..6b6d4f5d 100644
--- a/backend/src/routes/classes.ts
+++ b/backend/src/routes/classes.ts
@@ -3,7 +3,7 @@ import {
     createClassHandler,
     getAllClassesHandler,
     getClassHandler,
-    getClassStudentsHandler,
+    getClassStudentsHandler, getClassTeachersHandler,
     getTeacherInvitationsHandler,
 } from '../controllers/classes.js';
 import assignmentRouter from './assignments.js';
@@ -22,6 +22,8 @@ router.get('/:id/teacher-invitations', getTeacherInvitationsHandler);
 
 router.get('/:id/students', getClassStudentsHandler);
 
+router.get('/:id/teachers', getClassTeachersHandler);
+
 router.use('/:classid/assignments', assignmentRouter);
 
 export default router;
diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts
index dadf6dec..9c8a667f 100644
--- a/frontend/src/controllers/classes.ts
+++ b/frontend/src/controllers/classes.ts
@@ -3,6 +3,7 @@ import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
 import type { StudentsResponse } from "./students";
 import type { AssignmentsResponse } from "./assignments";
 import type { TeacherInvitationDTO } from "@dwengo-1/common/interfaces/teacher-invitation";
+import type {TeachersResponse} from "@/controllers/teachers.ts";
 
 export interface ClassesResponse {
     classes: ClassDTO[] | string[];
@@ -45,6 +46,10 @@ export class ClassController extends BaseController {
         return this.get<StudentsResponse>(`/${id}/students`, { full });
     }
 
+    async getTeachers(id: string, full = true): Promise<TeachersResponse> {
+        return this.get<TeachersResponse>(`/${id}/teachers`, { full });
+    }
+
     // TODO
     async getTeacherInvitations(id: string, full = true): Promise<TeacherInvitationsResponse> {
         return this.get<TeacherInvitationsResponse>(`/${id}/teacher-invitations`, { full });

From 6c3dbc99bb1afb79fa867505e52656c49bada1b6 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Sun, 6 Apr 2025 17:18:13 +0200
Subject: [PATCH 052/177] refactor: joinrequests uit classdto

---
 backend/src/interfaces/class.ts  | 1 -
 backend/src/services/classes.ts  | 5 +++++
 backend/src/services/teachers.ts | 4 ++--
 common/src/interfaces/class.ts   | 1 -
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/backend/src/interfaces/class.ts b/backend/src/interfaces/class.ts
index 7b07fcf2..76fa5fd5 100644
--- a/backend/src/interfaces/class.ts
+++ b/backend/src/interfaces/class.ts
@@ -10,7 +10,6 @@ export function mapToClassDTO(cls: Class): ClassDTO {
         displayName: cls.displayName,
         teachers: cls.teachers.map((teacher) => teacher.username),
         students: cls.students.map((student) => student.username),
-        joinRequests: [], // TODO
     };
 }
 
diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index d4e4defa..826c0f16 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -67,6 +67,11 @@ export async function getClassStudents(classId: string, full: boolean): Promise<
     return cls.students.map((student) => student.username);
 }
 
+export async function getClassStudentsDTO(classId: string): Promise<StudentDTO[]> {
+    const cls = await fetchClass(classId);
+    return cls.students.map(mapToStudentDTO);
+}
+
 export async function getClassTeachers(classId: string, full: boolean): Promise<TeacherDTO[] | string[]> {
     const cls = await fetchClass(classId);
 
diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts
index 1b7643fb..6449f16f 100644
--- a/backend/src/services/teachers.ts
+++ b/backend/src/services/teachers.ts
@@ -22,7 +22,7 @@ import { Question } from '../entities/questions/question.entity.js';
 import { ClassJoinRequestRepository } from '../data/classes/class-join-request-repository.js';
 import { Student } from '../entities/users/student.entity.js';
 import { NotFoundException } from '../exceptions/not-found-exception.js';
-import { getClassStudents } from './classes.js';
+import {getClassStudents, getClassStudentsDTO} from './classes.js';
 import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher';
 import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 import { StudentDTO } from '@dwengo-1/common/interfaces/student';
@@ -99,7 +99,7 @@ export async function getStudentsByTeacher(username: string, full: boolean): Pro
 
     const classIds: string[] = classes.map((cls) => cls.id);
 
-    const students: StudentDTO[] = (await Promise.all(classIds.map(async (id) => getClassStudents(id)))).flat();
+    const students: StudentDTO[] = (await Promise.all(classIds.map(async (id) => await getClassStudentsDTO(id)))).flat();
     if (full) {
         return students;
     }
diff --git a/common/src/interfaces/class.ts b/common/src/interfaces/class.ts
index c35c2dfc..d71e15e6 100644
--- a/common/src/interfaces/class.ts
+++ b/common/src/interfaces/class.ts
@@ -3,5 +3,4 @@ export interface ClassDTO {
     displayName: string;
     teachers: string[];
     students: string[];
-    joinRequests: string[];
 }

From 7e250e26494ff8ca1a7fd414e4038b51bd4df98b Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 17:55:01 +0200
Subject: [PATCH 053/177] fix: fixed merge errors

---
 backend/src/data/assignments/submission-repository.ts |  4 ----
 backend/src/data/questions/question-repository.ts     |  6 +++---
 backend/src/routes/groups.ts                          | 10 ----------
 backend/src/routes/submissions.ts                     |  8 --------
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts
index d904e77f..371dd4ef 100644
--- a/backend/src/data/assignments/submission-repository.ts
+++ b/backend/src/data/assignments/submission-repository.ts
@@ -17,7 +17,6 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
         });
     }
 
-<<<<<<< HEAD
     public findByLearningObject(loId: LearningObjectIdentifier): Promise<Submission[]> {
         return this.find({
             learningObjectHruid: loId.hruid,
@@ -27,9 +26,6 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
     }
 
     public findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise<Submission | null> {
-=======
-    public async findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise<Submission | null> {
->>>>>>> 6c3dbc99bb1afb79fa867505e52656c49bada1b6
         return this.findOne(
             {
                 learningObjectHruid: loId.hruid,
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 0055ac78..246b0484 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -56,18 +56,18 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
         });
     }
 
-<<<<<<< HEAD
     public findAllByAssignment(assignment: Assignment): Promise<Question[]> {
         return this.find({
             author: assignment.groups.flatMap(group => group.members),
             learningObjectHruid: assignment.learningPathHruid,
             learningObjectLanguage: assignment.learningPathLanguage,
-=======
+        });
+    }
+    
     public async findAllByAuthor(author: Student): Promise<Question[]> {
         return this.findAll({
             where: { author },
             orderBy: { timestamp: 'DESC' }, // New to old
->>>>>>> 6c3dbc99bb1afb79fa867505e52656c49bada1b6
         });
     }
 }
diff --git a/backend/src/routes/groups.ts b/backend/src/routes/groups.ts
index 231dec2e..81532a90 100644
--- a/backend/src/routes/groups.ts
+++ b/backend/src/routes/groups.ts
@@ -12,15 +12,5 @@ router.post('/', createGroupHandler);
 router.get('/:groupid', getGroupHandler);
 
 router.get('/:groupid/submissions', getGroupSubmissionsHandler);
-<<<<<<< HEAD
-=======
-
-// The list of questions a group has made
-router.get('/:id/questions', (_req, res) => {
-    res.json({
-        questions: ['0'],
-    });
-});
->>>>>>> 6c3dbc99bb1afb79fa867505e52656c49bada1b6
 
 export default router;
diff --git a/backend/src/routes/submissions.ts b/backend/src/routes/submissions.ts
index fac0b834..7c91de52 100644
--- a/backend/src/routes/submissions.ts
+++ b/backend/src/routes/submissions.ts
@@ -3,15 +3,7 @@ import { createSubmissionHandler, deleteSubmissionHandler, getAllSubmissionsHand
 const router = express.Router({ mergeParams: true });
 
 // Root endpoint used to search objects
-<<<<<<< HEAD
 router.get('/', getAllSubmissionsHandler);
-=======
-router.get('/', (_req, res) => {
-    res.json({
-        submissions: ['0', '1'],
-    });
-});
->>>>>>> 6c3dbc99bb1afb79fa867505e52656c49bada1b6
 
 router.post('/:id', createSubmissionHandler);
 

From 8d99b4f7059a48e95d26b57debfdcfc4c9af0dc3 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 17:59:38 +0200
Subject: [PATCH 054/177] fix: missende import in routes/classes.ts gefixt

---
 backend/src/routes/classes.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/routes/classes.ts b/backend/src/routes/classes.ts
index ace7085b..4ca8b0b9 100644
--- a/backend/src/routes/classes.ts
+++ b/backend/src/routes/classes.ts
@@ -1,6 +1,7 @@
 import express from 'express';
 import {
     createClassHandler,
+    deleteClassHandler,
     getAllClassesHandler,
     getClassHandler,
     getClassStudentsHandler, getClassTeachersHandler,

From d2f5219b696723ac6e10efa6e751812f5ef79589 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 18:17:17 +0200
Subject: [PATCH 055/177] fix: foute benaming in res.json gefixt

---
 backend/src/controllers/classes.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts
index 743ed001..a0ceff17 100644
--- a/backend/src/controllers/classes.ts
+++ b/backend/src/controllers/classes.ts
@@ -25,7 +25,7 @@ export async function createClassHandler(req: Request, res: Response): Promise<v
     const classData = req.body as ClassDTO;
     const cls = await createClass(classData);
 
-    res.json({ cls });
+    res.json({ class: cls });
 }
 
 export async function getClassHandler(req: Request, res: Response): Promise<void> {
@@ -34,14 +34,14 @@ export async function getClassHandler(req: Request, res: Response): Promise<void
 
     const cls = await getClass(classId);
 
-    res.json({ cls });
+    res.json({ class: cls });
 }
 
 export async function deleteClassHandler(req: Request, res: Response): Promise<void> {
     const classId = req.params.id;
     const cls = await deleteClass(classId);
 
-    res.json({ cls });
+    res.json({ class: cls });
 }
 
 export async function getClassStudentsHandler(req: Request, res: Response): Promise<void> {

From c52bcde3ae10768880205f733a02a2e622e10a3b Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 18:21:37 +0200
Subject: [PATCH 056/177] feat: requirefields in backend controllers (class,
 assignment, submission, group)

---
 backend/src/controllers/assignments.ts |  2 +-
 backend/src/controllers/groups.ts      | 66 ++++++++++----------------
 backend/src/controllers/submissions.ts | 33 +++++--------
 3 files changed, 38 insertions(+), 63 deletions(-)

diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts
index 7c94e2a7..42c822f0 100644
--- a/backend/src/controllers/assignments.ts
+++ b/backend/src/controllers/assignments.ts
@@ -22,8 +22,8 @@ export async function createAssignmentHandler(req: Request, res: Response): Prom
     const title = req.body.title;
 
     requireFields({ description, language, learningPath, title });
-    const assignmentData = req.body as AssignmentDTO;
 
+    const assignmentData = req.body as AssignmentDTO;
     const assignment = await createAssignment(classid, assignmentData);
 
     res.json({ assignment });
diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts
index 989066a6..3faf4ff0 100644
--- a/backend/src/controllers/groups.ts
+++ b/backend/src/controllers/groups.ts
@@ -1,29 +1,22 @@
 import { Request, Response } from 'express';
 import { createGroup, getAllGroups, getGroup, getGroupSubmissions } from '../services/groups.js';
 import { GroupDTO } from '@dwengo-1/common/interfaces/group';
+import { requireFields } from './error-helper.js';
+import { BadRequestException } from '../exceptions/bad-request-exception.js';
 
-// Typescript is annoywith with parameter forwarding from class.ts
-interface GroupParams {
-    classid: string;
-    assignmentid: string;
-    groupid?: string;
-}
-
-export async function getGroupHandler(req: Request<GroupParams>, res: Response): Promise<void> {
+export async function getGroupHandler(req: Request, res: Response): Promise<void> {
     const classId = req.params.classid;
+    const assignmentId = parseInt(req.params.assignmentid);
+    const groupId = parseInt(req.params.groupid);
     const full = req.query.full === 'true';
-    const assignmentId = Number(req.params.assignmentid);
+    requireFields({ classId, assignmentId, groupId });
 
     if (isNaN(assignmentId)) {
-        res.status(400).json({ error: 'Assignment id must be a number' });
-        return;
+        throw new BadRequestException('Assignment id must be a number');
     }
 
-    const groupId = Number(req.params.groupid!); // Can't be undefined
-
     if (isNaN(groupId)) {
-        res.status(400).json({ error: 'Group id must be a number' });
-        return;
+        throw new BadRequestException('Group id must be a number');
     }
 
     const group = await getGroup(classId, assignmentId, groupId, full);
@@ -33,68 +26,57 @@ export async function getGroupHandler(req: Request<GroupParams>, res: Response):
         return;
     }
 
-    res.json(group);
+    res.json({ group });
 }
 
 export async function getAllGroupsHandler(req: Request, res: Response): Promise<void> {
     const classId = req.params.classid;
-    const full = req.query.full === 'true';
-
     const assignmentId = Number(req.params.assignmentid);
+    const full = req.query.full === 'true';
+    requireFields({ classId, assignmentId });
 
     if (isNaN(assignmentId)) {
-        res.status(400).json({ error: 'Assignment id must be a number' });
-        return;
+        throw new BadRequestException('Assignment id must be a number');
     }
 
     const groups = await getAllGroups(classId, assignmentId, full);
 
-    res.json({
-        groups: groups,
-    });
+    res.json({ groups });
 }
 
 export async function createGroupHandler(req: Request, res: Response): Promise<void> {
     const classid = req.params.classid;
     const assignmentId = Number(req.params.assignmentid);
 
+    requireFields({ classid, assignmentId });
+
     if (isNaN(assignmentId)) {
-        res.status(400).json({ error: 'Assignment id must be a number' });
-        return;
+        throw new BadRequestException('Assignment id must be a number');
     }
 
     const groupData = req.body as GroupDTO;
     const group = await createGroup(groupData, classid, assignmentId);
 
-    if (!group) {
-        res.status(500).json({ error: 'Something went wrong while creating group' });
-        return;
-    }
-
-    res.status(201).json(group);
+    res.status(201).json({ group });
 }
 
 export async function getGroupSubmissionsHandler(req: Request, res: Response): Promise<void> {
     const classId = req.params.classid;
-    const full = req.query.full === 'true';
-
     const assignmentId = Number(req.params.assignmentid);
+    const groupId = Number(req.params.groupid);
+    const full = req.query.full === 'true';
+    
+    requireFields({ classId, assignmentId, groupId });
 
     if (isNaN(assignmentId)) {
-        res.status(400).json({ error: 'Assignment id must be a number' });
-        return;
+        throw new BadRequestException('Assignment id must be a number');
     }
 
-    const groupId = Number(req.params.groupid); // Can't be undefined
-
     if (isNaN(groupId)) {
-        res.status(400).json({ error: 'Group id must be a number' });
-        return;
+        throw new BadRequestException('Group id must be a number');
     }
 
     const submissions = await getGroupSubmissions(classId, assignmentId, groupId, full);
 
-    res.json({
-        submissions: submissions,
-    });
+    res.json({ submissions });
 }
diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts
index 499cbacc..a49992bb 100644
--- a/backend/src/controllers/submissions.ts
+++ b/backend/src/controllers/submissions.ts
@@ -5,22 +5,22 @@ import { NotFoundException } from '../exceptions/not-found-exception.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { Language, languageMap } from '@dwengo-1/common/util/language';
 import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
+import { requireFields } from './error-helper.js';
 
 
 
 export async function getSubmissionHandler(req: Request, res: Response): Promise<void> {
-    const submissionNumber = +req.params.id;
+    const lohruid = req.params.hruid;
+    const lang = languageMap[req.query.language as string] || Language.Dutch;
+    const version = (req.query.version || 1) as number;
+    const submissionNumber = Number(req.params.id);
+    requireFields({ lohruid, submissionNumber });
     
     if (isNaN(submissionNumber)) {
         throw new BadRequestException('Submission number must be a number');
     }
     
-    const lohruid = req.params.hruid;
-    const lang = languageMap[req.query.language as string] || Language.Dutch;
-    const version = (req.query.version || 1) as number;
-
     const loId = new LearningObjectIdentifier(lohruid, lang, version);
-
     const submission = await getSubmission(loId, submissionNumber);
 
     res.json({ submission });
@@ -30,9 +30,9 @@ export async function getAllSubmissionsHandler(req: Request, res: Response): Pro
     const lohruid = req.params.hruid;
     const lang = languageMap[req.query.language as string] || Language.Dutch;
     const version = (req.query.version || 1) as number;
+    requireFields({ lohruid });
 
     const loId = new LearningObjectIdentifier(lohruid, lang, version);
-
     const submissions = await getAllSubmissions(loId);
 
     res.json({ submissions });
@@ -40,31 +40,24 @@ export async function getAllSubmissionsHandler(req: Request, res: Response): Pro
 
 export async function createSubmissionHandler(req: Request, res: Response): Promise<void> {
     const submissionDTO = req.body as SubmissionDTO;
-
     const submission = await createSubmission(submissionDTO);
 
-    if (!submission) {
-        res.status(400).json({ error: 'Failed to create submission' });
-        return;
-    }
-
     res.json({ submission });
 }
 
 export async function deleteSubmissionHandler(req: Request, res: Response): Promise<void> {
     const hruid = req.params.hruid;
-    const submissionNumber = Number(req.params.id);
-
     const lang = languageMap[req.query.language as string] || Language.Dutch;
     const version = (req.query.version || 1) as number;
+    const submissionNumber = Number(req.params.id);
+    requireFields({ hruid, submissionNumber });
+
+    if (isNaN(submissionNumber)) {
+        throw new BadRequestException('Submission number must be a number'); 
+    }
 
     const loId = new LearningObjectIdentifier(hruid, lang, version);
-
     const submission = await deleteSubmission(loId, submissionNumber);
 
-    if (!submission) {
-        throw new NotFoundException('Could not delete submission');
-    }
-
     res.json({ submission });
 }

From 6a1adb0ee3736f64d22127d6d7b13853d36d5f83 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Sun, 6 Apr 2025 18:30:43 +0200
Subject: [PATCH 057/177] fix: question controller

---
 backend/src/config.ts                |   1 +
 backend/src/controllers/questions.ts | 112 +++++++++++----------------
 backend/src/services/questions.ts    |  22 +-----
 common/src/interfaces/question.ts    |   2 +-
 4 files changed, 49 insertions(+), 88 deletions(-)

diff --git a/backend/src/config.ts b/backend/src/config.ts
index 9b4702b5..9b209ada 100644
--- a/backend/src/config.ts
+++ b/backend/src/config.ts
@@ -5,3 +5,4 @@ export const DWENGO_API_BASE = getEnvVar(envVars.LearningContentRepoApiBaseUrl);
 export const FALLBACK_LANG = getEnvVar(envVars.FallbackLanguage);
 
 export const FALLBACK_SEQ_NUM = 1;
+export const FALLBACK_VERSION_NUM = 1;
diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts
index b5b764ac..a4a6a76d 100644
--- a/backend/src/controllers/questions.ts
+++ b/backend/src/controllers/questions.ts
@@ -1,34 +1,20 @@
 import { Request, Response } from 'express';
 import { createQuestion, deleteQuestion, getAllQuestions, getAnswersByQuestion, getQuestion } from '../services/questions.js';
-import { FALLBACK_LANG, FALLBACK_SEQ_NUM } from '../config.js';
+import {FALLBACK_LANG, FALLBACK_SEQ_NUM, FALLBACK_VERSION_NUM} from '../config.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { Language } from '@dwengo-1/common/util/language';
+import {requireFields} from "./error-helper";
 
-function getObjectId(req: Request, res: Response): LearningObjectIdentifier | null {
-    const { hruid, version } = req.params;
-    const lang = req.query.lang;
-
-    if (!hruid || !version) {
-        res.status(400).json({ error: 'Missing required parameters.' });
-        return null;
-    }
-
+function getLearningObjectId(hruid: string, version: string, lang: string): LearningObjectIdentifier {
     return {
         hruid,
-        language: (lang as Language) || FALLBACK_LANG,
-        version: Number(version),
+        language: (lang || FALLBACK_LANG) as Language,
+        version: Number(version) || FALLBACK_VERSION_NUM,
     };
 }
 
-function getQuestionId(req: Request, res: Response): QuestionId | null {
-    const seq = req.params.seq;
-    const learningObjectIdentifier = getObjectId(req, res);
-
-    if (!learningObjectIdentifier) {
-        return null;
-    }
-
+function getQuestionId(learningObjectIdentifier: LearningObjectIdentifier, seq: string): QuestionId {
     return {
         learningObjectIdentifier,
         sequenceNumber: seq ? Number(seq) : FALLBACK_SEQ_NUM,
@@ -36,84 +22,76 @@ function getQuestionId(req: Request, res: Response): QuestionId | null {
 }
 
 export async function getAllQuestionsHandler(req: Request, res: Response): Promise<void> {
-    const objectId = getObjectId(req, res);
+    const hruid = req.params.hruid;
+    const version = req.params.version;
+    const language = req.query.lang as string;
     const full = req.query.full === 'true';
+    requireFields({ hruid })
 
-    if (!objectId) {
-        return;
-    }
+    const learningObjectId = getLearningObjectId(hruid, version, language);
 
-    const questions = await getAllQuestions(objectId, full);
+    const questions = await getAllQuestions(learningObjectId, full);
 
-    if (!questions) {
-        res.status(404).json({ error: `Questions not found.` });
-    } else {
-        res.json({ questions: questions });
-    }
+    res.json({ questions });
 }
 
 export async function getQuestionHandler(req: Request, res: Response): Promise<void> {
-    const questionId = getQuestionId(req, res);
+    const hruid = req.params.hruid;
+    const version = req.params.version;
+    const language = req.query.lang as string;
+    const seq = req.params.seq;
+    requireFields({ hruid })
 
-    if (!questionId) {
-        return;
-    }
+    const learningObjectId = getLearningObjectId(hruid, version, language);
+    const questionId = getQuestionId(learningObjectId, seq);
 
     const question = await getQuestion(questionId);
 
-    if (!question) {
-        res.status(404).json({ error: `Question not found.` });
-    } else {
-        res.json(question);
-    }
+    res.json({ question });
+
 }
 
 export async function getQuestionAnswersHandler(req: Request, res: Response): Promise<void> {
-    const questionId = getQuestionId(req, res);
+    const hruid = req.params.hruid;
+    const version = req.params.version;
+    const language = req.query.lang as string;
+    const seq = req.params.seq;
     const full = req.query.full === 'true';
+    requireFields({ hruid })
 
-    if (!questionId) {
-        return;
-    }
+    const learningObjectId = getLearningObjectId(hruid, version, language);
+    const questionId = getQuestionId(learningObjectId, seq);
 
     const answers = await getAnswersByQuestion(questionId, full);
 
-    if (!answers) {
-        res.status(404).json({ error: `Questions not found` });
-    } else {
-        res.json({ answers: answers });
-    }
+    res.json({ answers });
 }
 
 export async function createQuestionHandler(req: Request, res: Response): Promise<void> {
-    const questionDTO = req.body as QuestionDTO;
+    const learningObjectIdentifier = req.body.learningObjectIdentifier;
+    const author = req.body.author;
+    const content = req.body.content;
+    requireFields({ learningObjectIdentifier, author, content });
 
-    if (!questionDTO.learningObjectIdentifier || !questionDTO.author || !questionDTO.content) {
-        res.status(400).json({ error: 'Missing required fields: identifier and content' });
-        return;
-    }
+    const questionDTO = req.body as QuestionDTO;
 
     const question = await createQuestion(questionDTO);
 
-    if (!question) {
-        res.status(400).json({ error: 'Could not create question' });
-    } else {
-        res.json(question);
-    }
+    res.json({ question });
+
 }
 
 export async function deleteQuestionHandler(req: Request, res: Response): Promise<void> {
-    const questionId = getQuestionId(req, res);
+    const hruid = req.params.hruid;
+    const version = req.params.version;
+    const language = req.query.lang as string;
+    const seq = req.params.seq;
+    requireFields({ hruid })
 
-    if (!questionId) {
-        return;
-    }
+    const learningObjectId = getLearningObjectId(hruid, version, language);
+    const questionId = getQuestionId(learningObjectId, seq);
 
     const question = await deleteQuestion(questionId);
 
-    if (!question) {
-        res.status(400).json({ error: 'Could not find nor delete question' });
-    } else {
-        res.json(question);
-    }
+    res.json({ question });
 }
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index d983c3be..be361085 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -5,12 +5,10 @@ import { Answer } from '../entities/questions/answer.entity.js';
 import { mapToAnswerDTO, mapToAnswerDTOId } from '../interfaces/answer.js';
 import { QuestionRepository } from '../data/questions/question-repository.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
-import {mapToStudent, mapToStudentDTO} from '../interfaces/student.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
 import {NotFoundException} from "../exceptions/not-found-exception";
 import {fetchStudent} from "./students";
-import {Student} from "../entities/users/student.entity";
 
 export async function getAllQuestions(id: LearningObjectIdentifier, full: boolean): Promise<QuestionDTO[] | QuestionId[]> {
     const questionRepository: QuestionRepository = getQuestionRepository();
@@ -57,13 +55,7 @@ export async function getAnswersByQuestion(questionId: QuestionId, full: boolean
 
 export async function createQuestion(questionDTO: QuestionDTO): Promise<QuestionDTO | null> {
     const questionRepository = getQuestionRepository();
-    let author: Student;
-    if (typeof questionDTO.author === "string" ){
-        author = await fetchStudent(questionDTO.author);
-    } else {
-        author = mapToStudent(questionDTO.author)
-    }
-
+    const author = await fetchStudent(questionDTO.author);
 
     await questionRepository.createQuestion({
         loId: mapToLearningObjectID(questionDTO.learningObjectIdentifier),
@@ -71,7 +63,6 @@ export async function createQuestion(questionDTO: QuestionDTO): Promise<Question
         content: questionDTO.content,
     });
 
-
     return questionDTO;
 }
 
@@ -80,20 +71,11 @@ export async function deleteQuestion(questionId: QuestionId): Promise<QuestionDT
 
     const question = await fetchQuestion(questionId);
 
-    if (!question) {
-        return null;
-    }
-
     const loId: LearningObjectIdentifier = {
         ...questionId.learningObjectIdentifier,
         version: questionId.learningObjectIdentifier.version ?? 1,
     };
 
-    try {
-        await questionRepository.removeQuestionByLearningObjectAndSequenceNumber(loId, questionId.sequenceNumber);
-    } catch (_) {
-        return null;
-    }
-
+    await questionRepository.removeQuestionByLearningObjectAndSequenceNumber(loId, questionId.sequenceNumber);
     return mapToQuestionDTO(question);
 }
diff --git a/common/src/interfaces/question.ts b/common/src/interfaces/question.ts
index 3f24480a..88e9c7b8 100644
--- a/common/src/interfaces/question.ts
+++ b/common/src/interfaces/question.ts
@@ -4,7 +4,7 @@ import { StudentDTO } from './student';
 export interface QuestionDTO {
     learningObjectIdentifier: LearningObjectIdentifierDTO;
     sequenceNumber?: number;
-    author: StudentDTO | string;
+    author: string;
     timestamp?: string;
     content: string;
 }

From e562fad385cc745eb7d29718a716d8482fbfbbc1 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 18:32:54 +0200
Subject: [PATCH 058/177] fix: return types enz gefixt services/assignments.ts

---
 backend/src/services/assignments.ts | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts
index 49cc4819..05ebb1d1 100644
--- a/backend/src/services/assignments.ts
+++ b/backend/src/services/assignments.ts
@@ -44,13 +44,12 @@ export async function createAssignment(classid: string, assignmentData: Assignme
     const cls = await fetchClass(classid);
 
     const assignment = mapToAssignment(assignmentData, cls);
+    
     const assignmentRepository = getAssignmentRepository();
-
     const newAssignment = assignmentRepository.create(assignment);
     await assignmentRepository.save(newAssignment, {preventOverwrite: true});
 
     return mapToAssignmentDTO(newAssignment);
-
 }
 
 export async function getAssignment(classid: string, id: number): Promise<AssignmentDTO> {
@@ -68,12 +67,10 @@ export async function getAssignmentsSubmissions(
     const groupRepository = getGroupRepository();
     const groups = await groupRepository.findAllGroupsForAssignment(assignment);
 
-    if (groups.length === 0){
-        throw new NotFoundException('No groups for assignment found');
-    }
-
     const submissionRepository = getSubmissionRepository();
-    const submissions = (await Promise.all(groups.map(async (group) => submissionRepository.findAllSubmissionsForGroup(group)))).flat();
+    const submissions = (await Promise.all(
+        groups.map(async (group) => submissionRepository.findAllSubmissionsForGroup(group))
+    )).flat();
 
     if (full) {
         return submissions.map(mapToSubmissionDTO);
@@ -96,5 +93,5 @@ export async function getAssignmentsQuestions(
         return questions.map(mapToQuestionDTO);
     }
 
-    return questions.map(mapToQuestionDTO); // mapToQuestionId should be updated
+    return questions.map(mapToQuestionDTO);
 }
\ No newline at end of file

From dde672befd15a2e0517be056728f0ceb637ee63c Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 19:17:04 +0200
Subject: [PATCH 059/177] feat: submission full backend stack opgekuist

---
 backend/src/controllers/groups.ts    |  5 +-
 backend/src/interfaces/group.ts      |  5 +-
 backend/src/interfaces/submission.ts | 28 +++++-----
 backend/src/services/classes.ts      |  8 ++-
 backend/src/services/groups.ts       | 78 ++++++++++------------------
 backend/src/services/submissions.ts  | 43 ++++++++-------
 common/src/interfaces/group.ts       |  2 +
 7 files changed, 74 insertions(+), 95 deletions(-)

diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts
index 3faf4ff0..446a6a7e 100644
--- a/backend/src/controllers/groups.ts
+++ b/backend/src/controllers/groups.ts
@@ -8,7 +8,6 @@ export async function getGroupHandler(req: Request, res: Response): Promise<void
     const classId = req.params.classid;
     const assignmentId = parseInt(req.params.assignmentid);
     const groupId = parseInt(req.params.groupid);
-    const full = req.query.full === 'true';
     requireFields({ classId, assignmentId, groupId });
 
     if (isNaN(assignmentId)) {
@@ -19,7 +18,7 @@ export async function getGroupHandler(req: Request, res: Response): Promise<void
         throw new BadRequestException('Group id must be a number');
     }
 
-    const group = await getGroup(classId, assignmentId, groupId, full);
+    const group = await getGroup(classId, assignmentId, groupId);
 
     if (!group) {
         res.status(404).json({ error: 'Group not found' });
@@ -65,7 +64,7 @@ export async function getGroupSubmissionsHandler(req: Request, res: Response): P
     const assignmentId = Number(req.params.assignmentid);
     const groupId = Number(req.params.groupid);
     const full = req.query.full === 'true';
-    
+
     requireFields({ classId, assignmentId, groupId });
 
     if (isNaN(assignmentId)) {
diff --git a/backend/src/interfaces/group.ts b/backend/src/interfaces/group.ts
index 1a169b2b..ac0efa64 100644
--- a/backend/src/interfaces/group.ts
+++ b/backend/src/interfaces/group.ts
@@ -1,11 +1,13 @@
 import { Group } from '../entities/assignments/group.entity.js';
 import { mapToAssignmentDTO } from './assignment.js';
+import { mapToClassDTO } from './class.js';
 import { mapToStudentDTO } from './student.js';
 import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 
 export function mapToGroupDTO(group: Group): GroupDTO {
     return {
-        assignment: mapToAssignmentDTO(group.assignment), // ERROR: , group.assignment.within),
+        class: mapToClassDTO(group.assignment.within),
+        assignment: mapToAssignmentDTO(group.assignment),
         groupNumber: group.groupNumber!,
         members: group.members.map(mapToStudentDTO),
     };
@@ -13,6 +15,7 @@ export function mapToGroupDTO(group: Group): GroupDTO {
 
 export function mapToGroupDTOId(group: Group): GroupDTO {
     return {
+        class: group.assignment.within.classId!,
         assignment: group.assignment.id!,
         groupNumber: group.groupNumber!,
         members: group.members.map((member) => member.username),
diff --git a/backend/src/interfaces/submission.ts b/backend/src/interfaces/submission.ts
index b4ed4a2b..91882c35 100644
--- a/backend/src/interfaces/submission.ts
+++ b/backend/src/interfaces/submission.ts
@@ -1,6 +1,9 @@
+import { getSubmissionRepository } from '../data/repositories.js';
+import { Group } from '../entities/assignments/group.entity.js';
 import { Submission } from '../entities/assignments/submission.entity.js';
+import { Student } from '../entities/users/student.entity.js';
 import { mapToGroupDTO } from './group.js';
-import { mapToStudent, mapToStudentDTO } from './student.js';
+import { mapToStudentDTO } from './student.js';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
 
 export function mapToSubmissionDTO(submission: Submission): SubmissionDTO {
@@ -29,17 +32,14 @@ export function mapToSubmissionDTOId(submission: Submission): SubmissionDTOId {
     };
 }
 
-export function mapToSubmission(submissionDTO: SubmissionDTO): Submission {
-    const submission = new Submission();
-    submission.learningObjectHruid = submissionDTO.learningObjectIdentifier.hruid;
-    submission.learningObjectLanguage = submissionDTO.learningObjectIdentifier.language;
-    submission.learningObjectVersion = submissionDTO.learningObjectIdentifier.version!;
-    // Submission.submissionNumber = submissionDTO.submissionNumber;
-    submission.submitter = mapToStudent(submissionDTO.submitter);
-    // Submission.submissionTime = submissionDTO.time;
-    // Submission.onBehalfOf =  submissionDTO.group!;
-    // TODO fix group
-    submission.content = submissionDTO.content;
-
-    return submission;
+export function mapToSubmission(submissionDTO: SubmissionDTO, submitter: Student, onBehalfOf: Group | undefined): Submission {
+    return getSubmissionRepository().create({
+        learningObjectHruid: submissionDTO.learningObjectIdentifier.hruid,
+        learningObjectLanguage: submissionDTO.learningObjectIdentifier.language,
+        learningObjectVersion: submissionDTO.learningObjectIdentifier.version || 1,
+        submitter: submitter,
+        submissionTime: new Date(),
+        content: submissionDTO.content,
+        onBehalfOf: onBehalfOf,
+    });
 }
diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index 92fd158d..4c8d4caf 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -26,7 +26,7 @@ export async function fetchClass(classid: string): Promise<Class> {
 
 export async function getAllClasses(full: boolean): Promise<ClassDTO[] | string[]> {
     const classRepository = getClassRepository();
-    const classes = await classRepository.find({}, { populate: ['students', 'teachers'] });
+    const classes = await classRepository.findAll({ populate: ['students', 'teachers'] });
 
     if (full) {
         return classes.map(mapToClassDTO);
@@ -34,13 +34,12 @@ export async function getAllClasses(full: boolean): Promise<ClassDTO[] | string[
     return classes.map((cls) => cls.classId!);
 }
 
-export async function getClass(classId: string): Promise<ClassDTO | null> {
+export async function getClass(classId: string): Promise<ClassDTO> {
     const cls = await fetchClass(classId);
-
     return mapToClassDTO(cls);
 }
 
-export async function createClass(classData: ClassDTO): Promise<ClassDTO | null> {
+export async function createClass(classData: ClassDTO): Promise<ClassDTO> {
     const teacherUsernames = classData.teachers || [];
     const teachers = (await Promise.all(teacherUsernames.map(async (id) => fetchTeacher(id) )));
 
@@ -48,7 +47,6 @@ export async function createClass(classData: ClassDTO): Promise<ClassDTO | null>
     const students = (await Promise.all(studentUsernames.map(async (id) => fetchStudent(id) )));
 
     const classRepository = getClassRepository();
-
     const newClass = classRepository.create({
         displayName: classData.displayName,
         teachers: teachers,
diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts
index 9dfb1596..94f96d54 100644
--- a/backend/src/services/groups.ts
+++ b/backend/src/services/groups.ts
@@ -14,80 +14,58 @@ import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
 import { getLogger } from '../logging/initalize.js';
 import { fetchAssignment } from './assignments.js';
+import { NotFoundException } from '../exceptions/not-found-exception.js';
+import { fetchClass } from './classes.js';
 
-async function fetchGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise<Group | null> {
+export async function fetchGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise<Group> {
     const assignment = await fetchAssignment(classId, assignmentNumber);
 
-    if (!assignment) {
-        return null;
-    }
-
     const groupRepository = getGroupRepository();
     const group = await groupRepository.findByAssignmentAndGroupNumber(assignment, groupNumber);
 
+    if (!group) {
+        throw new NotFoundException('Could not find group');
+    }
+
     return group; 
 }
 
-export async function getGroup(classId: string, assignmentNumber: number, groupNumber: number, full: boolean): Promise<GroupDTO | null> {
+export async function getGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise<GroupDTO> {
     const group = await fetchGroup(classId, assignmentNumber, groupNumber);
-
-    if (!group) {
-        return null;
-    }
-
-    if (full) {
-        return mapToGroupDTO(group);
-    }
-
-    return mapToGroupDTOId(group);
+    return mapToGroupDTO(group);
 }
 
-export async function createGroup(groupData: GroupDTO, classid: string, assignmentNumber: number): Promise<Group | null> {
+export async function getExistingGroupFromGroupDTO(groupData: GroupDTO) {
+    const classId = typeof(groupData.class) === 'string' ? groupData.class : groupData.class.id;
+    const assignmentNumber = typeof(groupData.assignment) === 'number' ? groupData.assignment : groupData.assignment.id;
+    const groupNumber = groupData.groupNumber;
+
+    return await fetchGroup(classId, assignmentNumber, groupNumber);
+}
+
+export async function createGroup(groupData: GroupDTO, classid: string, assignmentNumber: number): Promise<GroupDTO> {
     const studentRepository = getStudentRepository();
 
-    const memberUsernames = (groupData.members as string[]) || []; // TODO check if groupdata.members is a list
+    const memberUsernames = (groupData.members as string[]) || [];
     const members = (await Promise.all([...memberUsernames].map(async (id) => studentRepository.findByUsername(id)))).filter(
         (student) => student !== null
     );
 
-    getLogger().debug(members);
-
-    const classRepository = getClassRepository();
-    const cls = await classRepository.findById(classid);
-
-    if (!cls) {
-        return null;
-    }
-
-    const assignmentRepository = getAssignmentRepository();
-    const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber);
-
-    if (!assignment) {
-        return null;
-    }
+    const assignment = await fetchAssignment(classid, assignmentNumber);
 
     const groupRepository = getGroupRepository();
-    try {
-        const newGroup = groupRepository.create({
-            assignment: assignment,
-            members: members,
-        });
-        await groupRepository.save(newGroup);
+    const newGroup = groupRepository.create({
+        assignment: assignment,
+        members: members,
+    });
+    await groupRepository.save(newGroup);
 
-        return newGroup;
-    } catch (e) {
-        getLogger().error(e);
-        return null;
-    }
+    return mapToGroupDTO(newGroup);
 }
 
 export async function getAllGroups(classId: string, assignmentNumber: number, full: boolean): Promise<GroupDTO[]> {
     const assignment = await fetchAssignment(classId, assignmentNumber);
 
-    if (!assignment) {
-        return [];
-    }
-
     const groupRepository = getGroupRepository();
     const groups = await groupRepository.findAllGroupsForAssignment(assignment);
 
@@ -106,10 +84,6 @@ export async function getGroupSubmissions(
 ): Promise<SubmissionDTO[] | SubmissionDTOId[]> {
     const group = await fetchGroup(classId, assignmentNumber, groupNumber);
 
-    if (!group) {
-        return [];
-    }
-
     const submissionRepository = getSubmissionRepository();
     const submissions = await submissionRepository.findAllSubmissionsForGroup(group);
 
diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts
index e80b53ee..f3ee0f10 100644
--- a/backend/src/services/submissions.ts
+++ b/backend/src/services/submissions.ts
@@ -4,11 +4,14 @@ import { NotFoundException } from '../exceptions/not-found-exception.js';
 import { mapToSubmission, mapToSubmissionDTO } from '../interfaces/submission.js';
 import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
 import { Language } from '@dwengo-1/common/util/language';
+import { fetchStudent } from './students.js';
+import { fetchGroup, getExistingGroupFromGroupDTO } from './groups.js';
+import { Submission } from '../entities/assignments/submission.entity.js';
 
-export async function getSubmission(
+export async function fetchSubmission(
     loId: LearningObjectIdentifier,
-    submissionNumber: number
-): Promise<SubmissionDTO> {
+    submissionNumber: number,
+): Promise<Submission> {
     const submissionRepository = getSubmissionRepository();
     const submission = await submissionRepository.findSubmissionByLearningObjectAndSubmissionNumber(loId, submissionNumber);
 
@@ -16,6 +19,14 @@ export async function getSubmission(
         throw new NotFoundException('Could not find submission');
     }
 
+    return submission;
+}
+
+export async function getSubmission(
+    loId: LearningObjectIdentifier,
+    submissionNumber: number
+): Promise<SubmissionDTO> {
+    const submission = await fetchSubmission(loId, submissionNumber);
     return mapToSubmissionDTO(submission);
 }
 
@@ -28,30 +39,22 @@ export async function getAllSubmissions(
     return submissions.map(mapToSubmissionDTO);
 }
 
-export async function createSubmission(submissionDTO: SubmissionDTO): Promise<SubmissionDTO | null> {
-    const submissionRepository = getSubmissionRepository();
-    const submission = mapToSubmission(submissionDTO);
+export async function createSubmission(submissionDTO: SubmissionDTO): Promise<SubmissionDTO> {
+    const submitter = await fetchStudent(submissionDTO.submitter.username);
+    const group = submissionDTO.group ? await getExistingGroupFromGroupDTO(submissionDTO.group) : undefined;
 
-    try {
-        const newSubmission = submissionRepository.create(submission);
-        await submissionRepository.save(newSubmission);
-    } catch (_) {
-        return null;
-    }
+    const submissionRepository = getSubmissionRepository();
+    const submission = mapToSubmission(submissionDTO, submitter, group);
+    await submissionRepository.save(submission);
 
     return mapToSubmissionDTO(submission);
 }
 
 export async function deleteSubmission(loId: LearningObjectIdentifier, submissionNumber: number): Promise<SubmissionDTO> {
+    const submission = await fetchSubmission(loId, submissionNumber);
+    
     const submissionRepository = getSubmissionRepository();
-
-    const submission = await getSubmission(loId, submissionNumber);
-
-    if (!submission) {
-        throw new NotFoundException('Could not delete submission because it does not exist');
-    }
-
     await submissionRepository.deleteSubmissionByLearningObjectAndSubmissionNumber(loId, submissionNumber);
 
-    return submission;
+    return mapToSubmissionDTO(submission);
 }
diff --git a/common/src/interfaces/group.ts b/common/src/interfaces/group.ts
index ca95770a..742f2c75 100644
--- a/common/src/interfaces/group.ts
+++ b/common/src/interfaces/group.ts
@@ -1,7 +1,9 @@
 import { AssignmentDTO } from './assignment';
+import { ClassDTO } from './class';
 import { StudentDTO } from './student';
 
 export interface GroupDTO {
+    class: string | ClassDTO;
     assignment: number | AssignmentDTO;
     groupNumber: number;
     members: string[] | StudentDTO[];

From 441b77b8cdf84b51933b38a3e610135294bc07db Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 19:29:08 +0200
Subject: [PATCH 060/177] fix: requireFields toegevoegd op plaatsen

---
 backend/src/controllers/assignments.ts | 1 -
 backend/src/controllers/groups.ts      | 1 +
 backend/src/controllers/submissions.ts | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts
index 42c822f0..a284360d 100644
--- a/backend/src/controllers/assignments.ts
+++ b/backend/src/controllers/assignments.ts
@@ -7,7 +7,6 @@ import {BadRequestException} from "../exceptions/bad-request-exception";
 export async function getAllAssignmentsHandler(req: Request, res: Response): Promise<void> {
     const classId = req.params.classid;
     const full = req.query.full === 'true';
-    requireFields({ classId });
 
     const assignments = await getAllAssignments(classId, full);
 
diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts
index 446a6a7e..b5f32d37 100644
--- a/backend/src/controllers/groups.ts
+++ b/backend/src/controllers/groups.ts
@@ -3,6 +3,7 @@ import { createGroup, getAllGroups, getGroup, getGroupSubmissions } from '../ser
 import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 import { requireFields } from './error-helper.js';
 import { BadRequestException } from '../exceptions/bad-request-exception.js';
+import { getLogger } from '../logging/initalize.js';
 
 export async function getGroupHandler(req: Request, res: Response): Promise<void> {
     const classId = req.params.classid;
diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts
index a49992bb..3e10b0f2 100644
--- a/backend/src/controllers/submissions.ts
+++ b/backend/src/controllers/submissions.ts
@@ -38,6 +38,7 @@ export async function getAllSubmissionsHandler(req: Request, res: Response): Pro
     res.json({ submissions });
 }
 
+// TODO: gerald moet nog dingen toevoegen aan de databank voor dat dit gefinaliseerd kan worden
 export async function createSubmissionHandler(req: Request, res: Response): Promise<void> {
     const submissionDTO = req.body as SubmissionDTO;
     const submission = await createSubmission(submissionDTO);

From d65bb1f4a6034698a81878b9d84e28f94c0f2f68 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 19:52:00 +0200
Subject: [PATCH 061/177] feat: post en delete toegevoegd voor class students
 en teachers

---
 backend/src/controllers/classes.ts | 44 ++++++++++++++++++++++++++++++
 backend/src/routes/classes.ts      | 12 ++++++++
 backend/src/services/classes.ts    | 38 ++++++++++++++++++++++++++
 3 files changed, 94 insertions(+)

diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts
index a0ceff17..4e0095af 100644
--- a/backend/src/controllers/classes.ts
+++ b/backend/src/controllers/classes.ts
@@ -1,7 +1,11 @@
 import { Request, Response } from 'express';
 import {
+    addClassStudent,
+    addClassTeacher,
     createClass,
     deleteClass,
+    deleteClassStudent,
+    deleteClassTeacher,
     getAllClasses,
     getClass,
     getClassStudents,
@@ -73,3 +77,43 @@ export async function getTeacherInvitationsHandler(req: Request, res: Response):
 
     res.json({ invitations });
 }
+
+export async function deleteClassStudentHandler(req: Request, res: Response): Promise<void> {
+    const classId = req.params.id;
+    const username = req.params.username;
+    requireFields({ classId, username });
+
+    const cls = await deleteClassStudent(classId, username);
+
+    res.json({ class: cls });
+}
+
+export async function deleteClassTeacherHandler(req: Request, res: Response): Promise<void> {
+    const classId = req.params.id;
+    const username = req.params.username;
+    requireFields({ classId, username });
+
+    const cls = await deleteClassTeacher(classId, username);
+
+    res.json({ class: cls });
+}
+
+export async function addClassStudentHandler(req: Request, res: Response): Promise<void> {
+    const classId = req.params.id;
+    const username = req.body.username;
+    requireFields({ classId, username });
+
+    const cls = await addClassStudent(classId, username);
+
+    res.json({ class: cls });
+}
+
+export async function addClassTeacherHandler(req: Request, res: Response): Promise<void> {
+    const classId = req.params.id;
+    const username = req.body.username;
+    requireFields({ classId, username });
+
+    const cls = await addClassTeacher(classId, username);
+
+    res.json({ class: cls });
+}
diff --git a/backend/src/routes/classes.ts b/backend/src/routes/classes.ts
index 4ca8b0b9..aaf95567 100644
--- a/backend/src/routes/classes.ts
+++ b/backend/src/routes/classes.ts
@@ -1,7 +1,11 @@
 import express from 'express';
 import {
+    addClassStudentHandler,
+    addClassTeacherHandler,
     createClassHandler,
     deleteClassHandler,
+    deleteClassStudentHandler,
+    deleteClassTeacherHandler,
     getAllClassesHandler,
     getClassHandler,
     getClassStudentsHandler, getClassTeachersHandler,
@@ -24,8 +28,16 @@ router.get('/:id/teacher-invitations', getTeacherInvitationsHandler);
 
 router.get('/:id/students', getClassStudentsHandler);
 
+router.post('/:id/students', addClassStudentHandler);
+
+router.delete('/:id/students/:username', deleteClassStudentHandler);
+
 router.get('/:id/teachers', getClassTeachersHandler);
 
+router.post('/:id/teachers', addClassTeacherHandler);
+
+router.delete('/:id/teachers/:username', deleteClassTeacherHandler);
+
 router.use('/:classid/assignments', assignmentRouter);
 
 export default router;
diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index 4c8d4caf..9b74397b 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -101,3 +101,41 @@ export async function getClassTeacherInvitations(classId: string, full: boolean)
 
     return invitations.map(mapToTeacherInvitationDTOIds);
 }
+
+export async function deleteClassStudent(classId: string, username: string): Promise<ClassDTO> {
+    const cls = await fetchClass(classId);
+    
+    const classRepository = getClassRepository();
+    classRepository.assign(cls, { students: cls.students.filter((student) => student.username !== username) });
+
+    return mapToClassDTO(cls);
+}
+
+export async function deleteClassTeacher(classId: string, username: string): Promise<ClassDTO> {
+    const cls = await fetchClass(classId);
+    
+    const classRepository = getClassRepository();
+    classRepository.assign(cls, { teachers: cls.teachers.filter((teacher) => teacher.username !== username) });
+
+    return mapToClassDTO(cls);
+}
+
+export async function addClassStudent(classId: string, username: string): Promise<ClassDTO> {
+    const cls = await fetchClass(classId);
+    const newStudent = await fetchStudent(username);
+
+    const classRepository = getClassRepository();
+    classRepository.assign(cls, { students: [...cls.students, newStudent] });
+
+    return mapToClassDTO(cls);
+}
+
+export async function addClassTeacher(classId: string, username: string): Promise<ClassDTO> {
+    const cls = await fetchClass(classId);
+    const newTeacher = await fetchTeacher(username);
+
+    const classRepository = getClassRepository();
+    classRepository.assign(cls, { teachers: [...cls.teachers, newTeacher] });
+
+    return mapToClassDTO(cls);
+}

From 2ec5e02061f30e387c23776278795afa392da9e7 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 19:57:16 +0200
Subject: [PATCH 062/177] feat: DELETE op assignment geimplementeerd

---
 backend/src/controllers/assignments.ts | 14 +++++++++++++-
 backend/src/routes/assignments.ts      |  5 +++--
 backend/src/services/assignments.ts    | 10 ++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts
index a284360d..86e3217e 100644
--- a/backend/src/controllers/assignments.ts
+++ b/backend/src/controllers/assignments.ts
@@ -1,5 +1,5 @@
 import { Request, Response } from 'express';
-import { createAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions } from '../services/assignments.js';
+import { createAssignment, deleteAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions } from '../services/assignments.js';
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
 import {requireFields} from "./error-helper";
 import {BadRequestException} from "../exceptions/bad-request-exception";
@@ -42,6 +42,18 @@ export async function getAssignmentHandler(req: Request, res: Response): Promise
     res.json({ assignment });
 }
 
+export async function deleteAssignmentHandler(req: Request, res: Response): Promise<void> {
+    const id = Number(req.params.id);
+    const classid = req.params.classid;
+    requireFields({ id, classid });
+
+    if (isNaN(id)) {
+        throw new BadRequestException("Assignment id should be a number");
+    }
+
+    const assignment = await deleteAssignment(classid, id); 
+}
+
 export async function getAssignmentsSubmissionsHandler(req: Request, res: Response): Promise<void> {
     const classid = req.params.classid;
     const assignmentNumber = Number(req.params.id);
diff --git a/backend/src/routes/assignments.ts b/backend/src/routes/assignments.ts
index 3652dcc6..054de407 100644
--- a/backend/src/routes/assignments.ts
+++ b/backend/src/routes/assignments.ts
@@ -1,6 +1,7 @@
 import express from 'express';
 import {
     createAssignmentHandler,
+    deleteAssignmentHandler,
     getAllAssignmentsHandler,
     getAssignmentHandler,
     getAssignmentsSubmissionsHandler,
@@ -9,14 +10,14 @@ import groupRouter from './groups.js';
 
 const router = express.Router({ mergeParams: true });
 
-// Root endpoint used to search objects
 router.get('/', getAllAssignmentsHandler);
 
 router.post('/', createAssignmentHandler);
 
-// Information about an assignment with id 'id'
 router.get('/:id', getAssignmentHandler);
 
+router.delete('/:id', deleteAssignmentHandler);
+
 router.get('/:id/submissions', getAssignmentsSubmissionsHandler);
 
 router.get('/:id/questions', (_req, res) => {
diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts
index 05ebb1d1..a2892bed 100644
--- a/backend/src/services/assignments.ts
+++ b/backend/src/services/assignments.ts
@@ -57,6 +57,16 @@ export async function getAssignment(classid: string, id: number): Promise<Assign
     return mapToAssignmentDTO(assignment);
 }
 
+export async function deleteAssignment(classid: string, id: number): Promise<AssignmentDTO> {
+    const assignment = await fetchAssignment(classid, id);
+    const cls = await fetchClass(classid);
+
+    const assignmentRepository = getAssignmentRepository();
+    await assignmentRepository.deleteByClassAndId(cls, id);
+
+    return mapToAssignmentDTO(assignment);
+}
+
 export async function getAssignmentsSubmissions(
     classid: string,
     assignmentNumber: number,

From 709d5f019ad041215337cd91dbe126b571b38b58 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 20:03:46 +0200
Subject: [PATCH 063/177] feat: DELETE voor group geimplementeerd

---
 backend/src/controllers/groups.ts | 28 +++++++++++++++++++---------
 backend/src/routes/groups.ts      |  5 +++--
 backend/src/services/groups.ts    | 10 ++++++++++
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts
index b5f32d37..781cd4fd 100644
--- a/backend/src/controllers/groups.ts
+++ b/backend/src/controllers/groups.ts
@@ -1,14 +1,11 @@
 import { Request, Response } from 'express';
-import { createGroup, getAllGroups, getGroup, getGroupSubmissions } from '../services/groups.js';
+import { createGroup, deleteGroup, getAllGroups, getGroup, getGroupSubmissions } from '../services/groups.js';
 import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 import { requireFields } from './error-helper.js';
 import { BadRequestException } from '../exceptions/bad-request-exception.js';
 import { getLogger } from '../logging/initalize.js';
 
-export async function getGroupHandler(req: Request, res: Response): Promise<void> {
-    const classId = req.params.classid;
-    const assignmentId = parseInt(req.params.assignmentid);
-    const groupId = parseInt(req.params.groupid);
+function checkGroupFields(classId: any, assignmentId: any, groupId: any) {
     requireFields({ classId, assignmentId, groupId });
 
     if (isNaN(assignmentId)) {
@@ -18,13 +15,26 @@ export async function getGroupHandler(req: Request, res: Response): Promise<void
     if (isNaN(groupId)) {
         throw new BadRequestException('Group id must be a number');
     }
+}
+
+export async function getGroupHandler(req: Request, res: Response): Promise<void> {
+    const classId = req.params.classid;
+    const assignmentId = parseInt(req.params.assignmentid);
+    const groupId = parseInt(req.params.groupid);
+    checkGroupFields(classId, assignmentId, groupId);
 
     const group = await getGroup(classId, assignmentId, groupId);
 
-    if (!group) {
-        res.status(404).json({ error: 'Group not found' });
-        return;
-    }
+    res.json({ group });
+}
+
+export async function deleteGroupHandler(req: Request, res: Response): Promise<void> {
+    const classId = req.params.classid;
+    const assignmentId = parseInt(req.params.assignmentid);
+    const groupId = parseInt(req.params.groupid);
+    checkGroupFields(classId, assignmentId, groupId);
+
+    const group = await deleteGroup(classId, assignmentId, groupId);
 
     res.json({ group });
 }
diff --git a/backend/src/routes/groups.ts b/backend/src/routes/groups.ts
index 81532a90..4a7d6b10 100644
--- a/backend/src/routes/groups.ts
+++ b/backend/src/routes/groups.ts
@@ -1,5 +1,5 @@
 import express from 'express';
-import { createGroupHandler, getAllGroupsHandler, getGroupHandler, getGroupSubmissionsHandler } from '../controllers/groups.js';
+import { createGroupHandler, deleteGroupHandler, getAllGroupsHandler, getGroupHandler, getGroupSubmissionsHandler } from '../controllers/groups.js';
 
 const router = express.Router({ mergeParams: true });
 
@@ -8,9 +8,10 @@ router.get('/', getAllGroupsHandler);
 
 router.post('/', createGroupHandler);
 
-// Information about a group (members, ... [TODO DOC])
 router.get('/:groupid', getGroupHandler);
 
+router.delete('/:groupid', deleteGroupHandler);
+
 router.get('/:groupid/submissions', getGroupSubmissionsHandler);
 
 export default router;
diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts
index 94f96d54..68784177 100644
--- a/backend/src/services/groups.ts
+++ b/backend/src/services/groups.ts
@@ -35,6 +35,16 @@ export async function getGroup(classId: string, assignmentNumber: number, groupN
     return mapToGroupDTO(group);
 }
 
+export async function deleteGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise<GroupDTO> {
+    const group = await fetchGroup(classId, assignmentNumber, groupNumber);
+    const assignment = await fetchAssignment(classId, assignmentNumber);
+    
+    const groupRepository = getGroupRepository();
+    await groupRepository.deleteByAssignmentAndGroupNumber(assignment, groupNumber);
+
+    return mapToGroupDTO(group);
+}
+
 export async function getExistingGroupFromGroupDTO(groupData: GroupDTO) {
     const classId = typeof(groupData.class) === 'string' ? groupData.class : groupData.class.id;
     const assignmentNumber = typeof(groupData.assignment) === 'number' ? groupData.assignment : groupData.assignment.id;

From 800d52257ca33756e79c747ec5cfca65c5b6dd41 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 22:02:27 +0200
Subject: [PATCH 064/177] feat: PUT request op assignment geimplementeerd

---
 backend/src/controllers/assignments.ts |  1 +
 backend/src/controllers/classes.ts     | 13 ++++++++++++-
 backend/src/interfaces/assignment.ts   |  8 ++++----
 backend/src/routes/classes.ts          |  3 +++
 backend/src/services/assignments.ts    |  1 +
 backend/src/services/classes.ts        | 17 ++++++++++++++++-
 6 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts
index 86e3217e..e04dc801 100644
--- a/backend/src/controllers/assignments.ts
+++ b/backend/src/controllers/assignments.ts
@@ -3,6 +3,7 @@ import { createAssignment, deleteAssignment, getAllAssignments, getAssignment, g
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
 import {requireFields} from "./error-helper";
 import {BadRequestException} from "../exceptions/bad-request-exception";
+import { getLogger } from '../logging/initalize.js';
 
 export async function getAllAssignmentsHandler(req: Request, res: Response): Promise<void> {
     const classId = req.params.classid;
diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts
index 4e0095af..c6b71ad2 100644
--- a/backend/src/controllers/classes.ts
+++ b/backend/src/controllers/classes.ts
@@ -10,7 +10,8 @@ import {
     getClass,
     getClassStudents,
     getClassTeacherInvitations,
-    getClassTeachers
+    getClassTeachers,
+    putClass
 } from '../services/classes.js';
 import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 import {requireFields} from "./error-helper";
@@ -41,6 +42,16 @@ export async function getClassHandler(req: Request, res: Response): Promise<void
     res.json({ class: cls });
 }
 
+export async function putClassHandler(req: Request, res: Response): Promise<void> {
+    const classId = req.params.id;
+    requireFields({ classId });
+
+    const newData = req.body as Partial<ClassDTO>;
+    const cls = await putClass(classId, newData);
+
+    res.json({ class: cls });
+}
+
 export async function deleteClassHandler(req: Request, res: Response): Promise<void> {
     const classId = req.params.id;
     const cls = await deleteClass(classId);
diff --git a/backend/src/interfaces/assignment.ts b/backend/src/interfaces/assignment.ts
index d48a9083..09e12dd0 100644
--- a/backend/src/interfaces/assignment.ts
+++ b/backend/src/interfaces/assignment.ts
@@ -4,28 +4,28 @@ import { Assignment } from '../entities/assignments/assignment.entity.js';
 import { Class } from '../entities/classes/class.entity.js';
 import { getLogger } from '../logging/initalize.js';
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
+import { mapToGroupDTO } from './group.js';
 
 export function mapToAssignmentDTOId(assignment: Assignment): AssignmentDTO {
     return {
         id: assignment.id!,
-        class: assignment.within.classId!,
+        within: assignment.within.classId!,
         title: assignment.title,
         description: assignment.description,
         learningPath: assignment.learningPathHruid,
         language: assignment.learningPathLanguage,
-        // Groups: assignment.groups.map(group => group.groupNumber),
     };
 }
 
 export function mapToAssignmentDTO(assignment: Assignment): AssignmentDTO {
     return {
         id: assignment.id!,
-        class: assignment.within.classId!,
+        within: assignment.within.classId!,
         title: assignment.title,
         description: assignment.description,
         learningPath: assignment.learningPathHruid,
         language: assignment.learningPathLanguage,
-        // Groups: assignment.groups.map(mapToGroupDTO),
+        // groups: assignment.groups.map(mapToGroupDTO),
     };
 }
 
diff --git a/backend/src/routes/classes.ts b/backend/src/routes/classes.ts
index aaf95567..aa2a4814 100644
--- a/backend/src/routes/classes.ts
+++ b/backend/src/routes/classes.ts
@@ -10,6 +10,7 @@ import {
     getClassHandler,
     getClassStudentsHandler, getClassTeachersHandler,
     getTeacherInvitationsHandler,
+    putClassHandler,
 } from '../controllers/classes.js';
 import assignmentRouter from './assignments.js';
 
@@ -22,6 +23,8 @@ router.post('/', createClassHandler);
 
 router.get('/:id', getClassHandler);
 
+router.put('/:id', putClassHandler);
+
 router.delete('/:id', deleteClassHandler);
 
 router.get('/:id/teacher-invitations', getTeacherInvitationsHandler);
diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts
index a2892bed..8ab58070 100644
--- a/backend/src/services/assignments.ts
+++ b/backend/src/services/assignments.ts
@@ -8,6 +8,7 @@ import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submissi
 import { fetchClass } from './classes.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
+import { getLogger } from '../logging/initalize.js';
 
 export async function fetchAssignment(classid: string, assignmentNumber: number): Promise<Assignment> {
     const classRepository = getClassRepository();
diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index 9b74397b..f3209c0d 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -9,9 +9,10 @@ import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
 import { StudentDTO } from '@dwengo-1/common/interfaces/student';
 import {fetchTeacher} from "./teachers";
-import {fetchStudent} from "./students";
+import {fetchStudent, getStudent} from "./students";
 import {TeacherDTO} from "@dwengo-1/common/interfaces/teacher";
 import {mapToTeacherDTO} from "../interfaces/teacher";
+import { EntityDTO } from '@mikro-orm/core';
 
 export async function fetchClass(classid: string): Promise<Class> {
     const classRepository = getClassRepository();
@@ -57,6 +58,16 @@ export async function createClass(classData: ClassDTO): Promise<ClassDTO> {
     return mapToClassDTO(newClass);
 }
 
+export async function putClass(classId: string, classData: Partial<ClassDTO>): Promise<ClassDTO> {
+    const cls = await fetchClass(classId);
+
+    const classRepository = getClassRepository();
+    classRepository.assign(cls, classData as Partial<EntityDTO<Class>>);
+    await classRepository.getEntityManager().flush();
+
+    return mapToClassDTO(cls);
+}
+
 export async function deleteClass(classId: string): Promise<ClassDTO> {
     const cls = await fetchClass(classId);
 
@@ -107,6 +118,7 @@ export async function deleteClassStudent(classId: string, username: string): Pro
     
     const classRepository = getClassRepository();
     classRepository.assign(cls, { students: cls.students.filter((student) => student.username !== username) });
+    await classRepository.getEntityManager().flush();
 
     return mapToClassDTO(cls);
 }
@@ -116,6 +128,7 @@ export async function deleteClassTeacher(classId: string, username: string): Pro
     
     const classRepository = getClassRepository();
     classRepository.assign(cls, { teachers: cls.teachers.filter((teacher) => teacher.username !== username) });
+    await classRepository.getEntityManager().flush();
 
     return mapToClassDTO(cls);
 }
@@ -126,6 +139,7 @@ export async function addClassStudent(classId: string, username: string): Promis
 
     const classRepository = getClassRepository();
     classRepository.assign(cls, { students: [...cls.students, newStudent] });
+    await classRepository.getEntityManager().flush();
 
     return mapToClassDTO(cls);
 }
@@ -136,6 +150,7 @@ export async function addClassTeacher(classId: string, username: string): Promis
 
     const classRepository = getClassRepository();
     classRepository.assign(cls, { teachers: [...cls.teachers, newTeacher] });
+    await classRepository.getEntityManager().flush();
 
     return mapToClassDTO(cls);
 }

From 541e8ab2d534ddc958bb491ad2b440c7933f10f7 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 22:19:15 +0200
Subject: [PATCH 065/177] feat: PUT request geabstraheerd naar
 service-helper.ts

---
 backend/src/controllers/assignments.ts | 14 +++++++++++++
 backend/src/services/assignments.ts    | 11 ++++++++++
 backend/src/services/classes.ts        | 29 +++++++++++---------------
 backend/src/services/service-helper.ts | 20 ++++++++++++++++++
 4 files changed, 57 insertions(+), 17 deletions(-)
 create mode 100644 backend/src/services/service-helper.ts

diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts
index e04dc801..f70ae4a9 100644
--- a/backend/src/controllers/assignments.ts
+++ b/backend/src/controllers/assignments.ts
@@ -43,6 +43,20 @@ export async function getAssignmentHandler(req: Request, res: Response): Promise
     res.json({ assignment });
 }
 
+export async function putAssignmentHandler(req: Request, res: Response): Promise<void> {
+    const id = Number(req.params.id);
+    const classid = req.params.classid;
+    requireFields({ id, classid });
+
+    if (isNaN(id)) {
+        throw new BadRequestException("Assignment id should be a number")
+    }
+
+    const assignment = await putAssignment(classid, id);
+
+    res.json({ assignment });
+}
+
 export async function deleteAssignmentHandler(req: Request, res: Response): Promise<void> {
     const id = Number(req.params.id);
     const classid = req.params.classid;
diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts
index 8ab58070..9f5d9183 100644
--- a/backend/src/services/assignments.ts
+++ b/backend/src/services/assignments.ts
@@ -9,6 +9,9 @@ import { fetchClass } from './classes.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
 import { getLogger } from '../logging/initalize.js';
+import { EntityData, EntityDTO, FromEntityType } from '@mikro-orm/core';
+import { DwengoEntityRepository } from '../data/dwengo-entity-repository.js';
+import { putObject } from './service-helper.js';
 
 export async function fetchAssignment(classid: string, assignmentNumber: number): Promise<Assignment> {
     const classRepository = getClassRepository();
@@ -58,6 +61,14 @@ export async function getAssignment(classid: string, id: number): Promise<Assign
     return mapToAssignmentDTO(assignment);
 }
 
+export async function putAssignment(classid: string, id: number, assignmentData: Partial<EntityDTO<Assignment>>): Promise<AssignmentDTO> {
+    const assignment = await fetchAssignment(classid, id);
+    
+    await putObject<Assignment, AssignmentDTO>(assignment, assignmentData, getAssignmentRepository());
+
+    return mapToAssignmentDTO(assignment);
+}
+
 export async function deleteAssignment(classid: string, id: number): Promise<AssignmentDTO> {
     const assignment = await fetchAssignment(classid, id);
     const cls = await fetchClass(classid);
diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index f3209c0d..128cdec8 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -13,6 +13,7 @@ import {fetchStudent, getStudent} from "./students";
 import {TeacherDTO} from "@dwengo-1/common/interfaces/teacher";
 import {mapToTeacherDTO} from "../interfaces/teacher";
 import { EntityDTO } from '@mikro-orm/core';
+import { putObject } from './service-helper.js';
 
 export async function fetchClass(classid: string): Promise<Class> {
     const classRepository = getClassRepository();
@@ -58,12 +59,10 @@ export async function createClass(classData: ClassDTO): Promise<ClassDTO> {
     return mapToClassDTO(newClass);
 }
 
-export async function putClass(classId: string, classData: Partial<ClassDTO>): Promise<ClassDTO> {
+export async function putClass(classId: string, classData: Partial<EntityDTO<Class>>): Promise<ClassDTO> {
     const cls = await fetchClass(classId);
 
-    const classRepository = getClassRepository();
-    classRepository.assign(cls, classData as Partial<EntityDTO<Class>>);
-    await classRepository.getEntityManager().flush();
+    await putObject<Class, ClassDTO>(cls, classData, getClassRepository());
 
     return mapToClassDTO(cls);
 }
@@ -116,9 +115,8 @@ export async function getClassTeacherInvitations(classId: string, full: boolean)
 export async function deleteClassStudent(classId: string, username: string): Promise<ClassDTO> {
     const cls = await fetchClass(classId);
     
-    const classRepository = getClassRepository();
-    classRepository.assign(cls, { students: cls.students.filter((student) => student.username !== username) });
-    await classRepository.getEntityManager().flush();
+    const newStudents = { students: cls.students.filter((student) => student.username !== username) };
+    await putObject<Class, ClassDTO>(cls, newStudents, getClassRepository());
 
     return mapToClassDTO(cls);
 }
@@ -126,9 +124,8 @@ export async function deleteClassStudent(classId: string, username: string): Pro
 export async function deleteClassTeacher(classId: string, username: string): Promise<ClassDTO> {
     const cls = await fetchClass(classId);
     
-    const classRepository = getClassRepository();
-    classRepository.assign(cls, { teachers: cls.teachers.filter((teacher) => teacher.username !== username) });
-    await classRepository.getEntityManager().flush();
+    const newTeachers = { teachers: cls.teachers.filter((teacher) => teacher.username !== username) };
+    await putObject<Class, ClassDTO>(cls, newTeachers, getClassRepository());
 
     return mapToClassDTO(cls);
 }
@@ -137,10 +134,9 @@ export async function addClassStudent(classId: string, username: string): Promis
     const cls = await fetchClass(classId);
     const newStudent = await fetchStudent(username);
 
-    const classRepository = getClassRepository();
-    classRepository.assign(cls, { students: [...cls.students, newStudent] });
-    await classRepository.getEntityManager().flush();
-
+    const newStudents = { students: [...cls.students, newStudent] }
+    await putObject<Class, ClassDTO>(cls, newStudents, getClassRepository());
+    
     return mapToClassDTO(cls);
 }
 
@@ -148,9 +144,8 @@ export async function addClassTeacher(classId: string, username: string): Promis
     const cls = await fetchClass(classId);
     const newTeacher = await fetchTeacher(username);
 
-    const classRepository = getClassRepository();
-    classRepository.assign(cls, { teachers: [...cls.teachers, newTeacher] });
-    await classRepository.getEntityManager().flush();
+    const newTeachers = { teachers: [...cls.teachers, newTeacher] };
+    await putObject<Class, ClassDTO>(cls, newTeachers, getClassRepository());    
 
     return mapToClassDTO(cls);
 }
diff --git a/backend/src/services/service-helper.ts b/backend/src/services/service-helper.ts
new file mode 100644
index 00000000..28ff0eb0
--- /dev/null
+++ b/backend/src/services/service-helper.ts
@@ -0,0 +1,20 @@
+import { EntityDTO, FromEntityType } from "@mikro-orm/core";
+import { DwengoEntityRepository } from "../data/dwengo-entity-repository";
+
+/**
+ * Utility function to perform an PUT on an object.
+ *
+ * @param object The object that needs to be changed
+ * @param data The datafields and their values that will be updated
+ * @param repo The repository on which this action needs to be performed
+ * 
+ * @returns Nothing.
+ */
+export async function putObject<T extends Object, DTO>(
+    object: T, 
+    data: Partial<EntityDTO<FromEntityType<T>>>, 
+    repo: DwengoEntityRepository<T>
+): Promise<void> {
+    repo.assign(object, data);
+    await repo.getEntityManager().flush();
+}
\ No newline at end of file

From 8eb468eef03504570be44e47958162635cd302a1 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 22:21:07 +0200
Subject: [PATCH 066/177] fix: errors in vorige commit gefixt

---
 backend/src/controllers/assignments.ts | 7 +++++--
 backend/src/routes/assignments.ts      | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts
index f70ae4a9..42534b3e 100644
--- a/backend/src/controllers/assignments.ts
+++ b/backend/src/controllers/assignments.ts
@@ -1,9 +1,11 @@
 import { Request, Response } from 'express';
-import { createAssignment, deleteAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions } from '../services/assignments.js';
+import { createAssignment, deleteAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions, putAssignment } from '../services/assignments.js';
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
 import {requireFields} from "./error-helper";
 import {BadRequestException} from "../exceptions/bad-request-exception";
 import { getLogger } from '../logging/initalize.js';
+import { Assignment } from '../entities/assignments/assignment.entity.js';
+import { EntityDTO } from '@mikro-orm/core';
 
 export async function getAllAssignmentsHandler(req: Request, res: Response): Promise<void> {
     const classId = req.params.classid;
@@ -52,7 +54,8 @@ export async function putAssignmentHandler(req: Request, res: Response): Promise
         throw new BadRequestException("Assignment id should be a number")
     }
 
-    const assignment = await putAssignment(classid, id);
+    const assignmentData = req.body as Partial<EntityDTO<Assignment>>;
+    const assignment = await putAssignment(classid, id, assignmentData);
 
     res.json({ assignment });
 }
diff --git a/backend/src/routes/assignments.ts b/backend/src/routes/assignments.ts
index 054de407..083ee586 100644
--- a/backend/src/routes/assignments.ts
+++ b/backend/src/routes/assignments.ts
@@ -5,6 +5,7 @@ import {
     getAllAssignmentsHandler,
     getAssignmentHandler,
     getAssignmentsSubmissionsHandler,
+    putAssignmentHandler,
 } from '../controllers/assignments.js';
 import groupRouter from './groups.js';
 
@@ -16,6 +17,8 @@ router.post('/', createAssignmentHandler);
 
 router.get('/:id', getAssignmentHandler);
 
+router.put('/:id', putAssignmentHandler);
+
 router.delete('/:id', deleteAssignmentHandler);
 
 router.get('/:id/submissions', getAssignmentsSubmissionsHandler);

From 7968d49c5ed3bbdce1c68d12ca4b709e27055bbb Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 22:21:20 +0200
Subject: [PATCH 067/177] fix: errors in vorige commit gefixt

---
 common/src/interfaces/assignment.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/interfaces/assignment.ts b/common/src/interfaces/assignment.ts
index 8ad1649b..5cb8feff 100644
--- a/common/src/interfaces/assignment.ts
+++ b/common/src/interfaces/assignment.ts
@@ -2,7 +2,7 @@ import { GroupDTO } from './group';
 
 export interface AssignmentDTO {
     id: number;
-    class: string; // Id of class 'within'
+    within: string;
     title: string;
     description: string;
     learningPath: string;

From 4e6f7ccb3d19a32c32ae035382be0b9b24eb0678 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 22:21:53 +0200
Subject: [PATCH 068/177] fix: errors in vorige commit gefixt

---
 backend/src/controllers/classes.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts
index c6b71ad2..269259aa 100644
--- a/backend/src/controllers/classes.ts
+++ b/backend/src/controllers/classes.ts
@@ -15,6 +15,8 @@ import {
 } from '../services/classes.js';
 import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 import {requireFields} from "./error-helper";
+import { EntityDTO } from '@mikro-orm/core';
+import { Class } from '../entities/classes/class.entity.js';
 
 export async function getAllClassesHandler(req: Request, res: Response): Promise<void> {
     const full = req.query.full === 'true';
@@ -46,7 +48,7 @@ export async function putClassHandler(req: Request, res: Response): Promise<void
     const classId = req.params.id;
     requireFields({ classId });
 
-    const newData = req.body as Partial<ClassDTO>;
+    const newData = req.body as Partial<EntityDTO<Class>>;
     const cls = await putClass(classId, newData);
 
     res.json({ class: cls });

From 33f785ebc03185669f9705e47b82020171f6e35a Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 22:27:02 +0200
Subject: [PATCH 069/177] feat: PUT op group geimplementeerd

---
 backend/src/controllers/groups.ts      | 15 ++++++++++++++-
 backend/src/routes/groups.ts           |  4 +++-
 backend/src/services/assignments.ts    |  2 +-
 backend/src/services/classes.ts        | 10 +++++-----
 backend/src/services/groups.ts         | 16 +++++++++++++++-
 backend/src/services/service-helper.ts |  2 +-
 6 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts
index 781cd4fd..85b0809c 100644
--- a/backend/src/controllers/groups.ts
+++ b/backend/src/controllers/groups.ts
@@ -1,9 +1,11 @@
 import { Request, Response } from 'express';
-import { createGroup, deleteGroup, getAllGroups, getGroup, getGroupSubmissions } from '../services/groups.js';
+import { createGroup, deleteGroup, getAllGroups, getGroup, getGroupSubmissions, putGroup } from '../services/groups.js';
 import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 import { requireFields } from './error-helper.js';
 import { BadRequestException } from '../exceptions/bad-request-exception.js';
 import { getLogger } from '../logging/initalize.js';
+import { EntityDTO } from '@mikro-orm/core';
+import { Group } from '../entities/assignments/group.entity.js';
 
 function checkGroupFields(classId: any, assignmentId: any, groupId: any) {
     requireFields({ classId, assignmentId, groupId });
@@ -28,6 +30,17 @@ export async function getGroupHandler(req: Request, res: Response): Promise<void
     res.json({ group });
 }
 
+export async function putGroupHandler(req: Request, res: Response): Promise<void> {
+    const classId = req.params.classid;
+    const assignmentId = parseInt(req.params.assignmentid);
+    const groupId = parseInt(req.params.groupid);
+    checkGroupFields(classId, assignmentId, groupId);
+
+    const group = await putGroup(classId, assignmentId, groupId, req.body as Partial<EntityDTO<Group>>);
+
+    res.json({ group });
+}
+
 export async function deleteGroupHandler(req: Request, res: Response): Promise<void> {
     const classId = req.params.classid;
     const assignmentId = parseInt(req.params.assignmentid);
diff --git a/backend/src/routes/groups.ts b/backend/src/routes/groups.ts
index 4a7d6b10..54c32462 100644
--- a/backend/src/routes/groups.ts
+++ b/backend/src/routes/groups.ts
@@ -1,5 +1,5 @@
 import express from 'express';
-import { createGroupHandler, deleteGroupHandler, getAllGroupsHandler, getGroupHandler, getGroupSubmissionsHandler } from '../controllers/groups.js';
+import { createGroupHandler, deleteGroupHandler, getAllGroupsHandler, getGroupHandler, getGroupSubmissionsHandler, putGroupHandler } from '../controllers/groups.js';
 
 const router = express.Router({ mergeParams: true });
 
@@ -10,6 +10,8 @@ router.post('/', createGroupHandler);
 
 router.get('/:groupid', getGroupHandler);
 
+router.put('/:groupid', putGroupHandler);
+
 router.delete('/:groupid', deleteGroupHandler);
 
 router.get('/:groupid/submissions', getGroupSubmissionsHandler);
diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts
index 9f5d9183..7b5baaf8 100644
--- a/backend/src/services/assignments.ts
+++ b/backend/src/services/assignments.ts
@@ -64,7 +64,7 @@ export async function getAssignment(classid: string, id: number): Promise<Assign
 export async function putAssignment(classid: string, id: number, assignmentData: Partial<EntityDTO<Assignment>>): Promise<AssignmentDTO> {
     const assignment = await fetchAssignment(classid, id);
     
-    await putObject<Assignment, AssignmentDTO>(assignment, assignmentData, getAssignmentRepository());
+    await putObject<Assignment>(assignment, assignmentData, getAssignmentRepository());
 
     return mapToAssignmentDTO(assignment);
 }
diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index 128cdec8..dfb12aa2 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -62,7 +62,7 @@ export async function createClass(classData: ClassDTO): Promise<ClassDTO> {
 export async function putClass(classId: string, classData: Partial<EntityDTO<Class>>): Promise<ClassDTO> {
     const cls = await fetchClass(classId);
 
-    await putObject<Class, ClassDTO>(cls, classData, getClassRepository());
+    await putObject<Class>(cls, classData, getClassRepository());
 
     return mapToClassDTO(cls);
 }
@@ -116,7 +116,7 @@ export async function deleteClassStudent(classId: string, username: string): Pro
     const cls = await fetchClass(classId);
     
     const newStudents = { students: cls.students.filter((student) => student.username !== username) };
-    await putObject<Class, ClassDTO>(cls, newStudents, getClassRepository());
+    await putObject<Class>(cls, newStudents, getClassRepository());
 
     return mapToClassDTO(cls);
 }
@@ -125,7 +125,7 @@ export async function deleteClassTeacher(classId: string, username: string): Pro
     const cls = await fetchClass(classId);
     
     const newTeachers = { teachers: cls.teachers.filter((teacher) => teacher.username !== username) };
-    await putObject<Class, ClassDTO>(cls, newTeachers, getClassRepository());
+    await putObject<Class>(cls, newTeachers, getClassRepository());
 
     return mapToClassDTO(cls);
 }
@@ -135,7 +135,7 @@ export async function addClassStudent(classId: string, username: string): Promis
     const newStudent = await fetchStudent(username);
 
     const newStudents = { students: [...cls.students, newStudent] }
-    await putObject<Class, ClassDTO>(cls, newStudents, getClassRepository());
+    await putObject<Class>(cls, newStudents, getClassRepository());
     
     return mapToClassDTO(cls);
 }
@@ -145,7 +145,7 @@ export async function addClassTeacher(classId: string, username: string): Promis
     const newTeacher = await fetchTeacher(username);
 
     const newTeachers = { teachers: [...cls.teachers, newTeacher] };
-    await putObject<Class, ClassDTO>(cls, newTeachers, getClassRepository());    
+    await putObject<Class>(cls, newTeachers, getClassRepository());    
 
     return mapToClassDTO(cls);
 }
diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts
index 68784177..442c1aec 100644
--- a/backend/src/services/groups.ts
+++ b/backend/src/services/groups.ts
@@ -1,4 +1,4 @@
-import { assign } from '@mikro-orm/core';
+import { assign, EntityDTO } from '@mikro-orm/core';
 import {
     getAssignmentRepository,
     getClassRepository,
@@ -16,6 +16,7 @@ import { getLogger } from '../logging/initalize.js';
 import { fetchAssignment } from './assignments.js';
 import { NotFoundException } from '../exceptions/not-found-exception.js';
 import { fetchClass } from './classes.js';
+import { putObject } from './service-helper.js';
 
 export async function fetchGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise<Group> {
     const assignment = await fetchAssignment(classId, assignmentNumber);
@@ -35,6 +36,19 @@ export async function getGroup(classId: string, assignmentNumber: number, groupN
     return mapToGroupDTO(group);
 }
 
+export async function putGroup(
+    classId: string, 
+    assignmentNumber: number, 
+    groupNumber: number, 
+    groupData: Partial<EntityDTO<Group>>
+): Promise<GroupDTO> {
+    const group = await fetchGroup(classId, assignmentNumber, groupNumber);
+
+    await putObject<Group>(group, groupData, getGroupRepository());
+
+    return mapToGroupDTO(group);
+}
+
 export async function deleteGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise<GroupDTO> {
     const group = await fetchGroup(classId, assignmentNumber, groupNumber);
     const assignment = await fetchAssignment(classId, assignmentNumber);
diff --git a/backend/src/services/service-helper.ts b/backend/src/services/service-helper.ts
index 28ff0eb0..427ff5dd 100644
--- a/backend/src/services/service-helper.ts
+++ b/backend/src/services/service-helper.ts
@@ -10,7 +10,7 @@ import { DwengoEntityRepository } from "../data/dwengo-entity-repository";
  * 
  * @returns Nothing.
  */
-export async function putObject<T extends Object, DTO>(
+export async function putObject<T extends Object>(
     object: T, 
     data: Partial<EntityDTO<FromEntityType<T>>>, 
     repo: DwengoEntityRepository<T>

From b963101f629e5f77cba54c86eef99b51a43e2356 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Sun, 6 Apr 2025 20:32:08 +0000
Subject: [PATCH 070/177] style: fix linting issues met ESLint

---
 backend/src/data/assignments/submission-repository.ts | 4 ++--
 backend/src/data/questions/question-repository.ts     | 2 +-
 backend/src/interfaces/assignment.ts                  | 2 +-
 backend/src/services/service-helper.ts                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts
index 371dd4ef..2e673210 100644
--- a/backend/src/data/assignments/submission-repository.ts
+++ b/backend/src/data/assignments/submission-repository.ts
@@ -17,7 +17,7 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
         });
     }
 
-    public findByLearningObject(loId: LearningObjectIdentifier): Promise<Submission[]> {
+    public async findByLearningObject(loId: LearningObjectIdentifier): Promise<Submission[]> {
         return this.find({
             learningObjectHruid: loId.hruid,
             learningObjectLanguage: loId.language,
@@ -25,7 +25,7 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
         });
     }
 
-    public findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise<Submission | null> {
+    public async findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise<Submission | null> {
         return this.findOne(
             {
                 learningObjectHruid: loId.hruid,
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 246b0484..eb145fa9 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -56,7 +56,7 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
         });
     }
 
-    public findAllByAssignment(assignment: Assignment): Promise<Question[]> {
+    public async findAllByAssignment(assignment: Assignment): Promise<Question[]> {
         return this.find({
             author: assignment.groups.flatMap(group => group.members),
             learningObjectHruid: assignment.learningPathHruid,
diff --git a/backend/src/interfaces/assignment.ts b/backend/src/interfaces/assignment.ts
index 09e12dd0..2e591797 100644
--- a/backend/src/interfaces/assignment.ts
+++ b/backend/src/interfaces/assignment.ts
@@ -25,7 +25,7 @@ export function mapToAssignmentDTO(assignment: Assignment): AssignmentDTO {
         description: assignment.description,
         learningPath: assignment.learningPathHruid,
         language: assignment.learningPathLanguage,
-        // groups: assignment.groups.map(mapToGroupDTO),
+        // Groups: assignment.groups.map(mapToGroupDTO),
     };
 }
 
diff --git a/backend/src/services/service-helper.ts b/backend/src/services/service-helper.ts
index 28ff0eb0..3f8c897e 100644
--- a/backend/src/services/service-helper.ts
+++ b/backend/src/services/service-helper.ts
@@ -10,7 +10,7 @@ import { DwengoEntityRepository } from "../data/dwengo-entity-repository";
  * 
  * @returns Nothing.
  */
-export async function putObject<T extends Object, DTO>(
+export async function putObject<T extends object, DTO>(
     object: T, 
     data: Partial<EntityDTO<FromEntityType<T>>>, 
     repo: DwengoEntityRepository<T>

From 34facfe7c8c58aed35ef2209e426312dd3d60294 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Sun, 6 Apr 2025 20:32:13 +0000
Subject: [PATCH 071/177] style: fix linting issues met Prettier

---
 backend/src/controllers/assignments.ts        | 23 +++++++++------
 backend/src/controllers/classes.ts            |  4 +--
 backend/src/controllers/submissions.ts        |  8 ++----
 .../src/data/questions/question-repository.ts |  4 +--
 backend/src/routes/classes.ts                 |  3 +-
 backend/src/services/assignments.ts           | 28 +++++++++----------
 backend/src/services/classes.ts               | 28 +++++++++----------
 backend/src/services/groups.ts                |  8 +++---
 backend/src/services/service-helper.ts        | 12 ++++----
 backend/src/services/submissions.ts           | 16 +++--------
 backend/src/services/teachers.ts              |  6 ++--
 frontend/src/controllers/classes.ts           |  2 +-
 12 files changed, 70 insertions(+), 72 deletions(-)

diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts
index 42534b3e..c262057c 100644
--- a/backend/src/controllers/assignments.ts
+++ b/backend/src/controllers/assignments.ts
@@ -1,8 +1,15 @@
 import { Request, Response } from 'express';
-import { createAssignment, deleteAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions, putAssignment } from '../services/assignments.js';
+import {
+    createAssignment,
+    deleteAssignment,
+    getAllAssignments,
+    getAssignment,
+    getAssignmentsSubmissions,
+    putAssignment,
+} from '../services/assignments.js';
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
-import {requireFields} from "./error-helper";
-import {BadRequestException} from "../exceptions/bad-request-exception";
+import { requireFields } from './error-helper';
+import { BadRequestException } from '../exceptions/bad-request-exception';
 import { getLogger } from '../logging/initalize.js';
 import { Assignment } from '../entities/assignments/assignment.entity.js';
 import { EntityDTO } from '@mikro-orm/core';
@@ -37,7 +44,7 @@ export async function getAssignmentHandler(req: Request, res: Response): Promise
     requireFields({ id, classid });
 
     if (isNaN(id)) {
-        throw new BadRequestException("Assignment id should be a number")
+        throw new BadRequestException('Assignment id should be a number');
     }
 
     const assignment = await getAssignment(classid, id);
@@ -51,7 +58,7 @@ export async function putAssignmentHandler(req: Request, res: Response): Promise
     requireFields({ id, classid });
 
     if (isNaN(id)) {
-        throw new BadRequestException("Assignment id should be a number")
+        throw new BadRequestException('Assignment id should be a number');
     }
 
     const assignmentData = req.body as Partial<EntityDTO<Assignment>>;
@@ -66,10 +73,10 @@ export async function deleteAssignmentHandler(req: Request, res: Response): Prom
     requireFields({ id, classid });
 
     if (isNaN(id)) {
-        throw new BadRequestException("Assignment id should be a number");
+        throw new BadRequestException('Assignment id should be a number');
     }
 
-    const assignment = await deleteAssignment(classid, id); 
+    const assignment = await deleteAssignment(classid, id);
 }
 
 export async function getAssignmentsSubmissionsHandler(req: Request, res: Response): Promise<void> {
@@ -79,7 +86,7 @@ export async function getAssignmentsSubmissionsHandler(req: Request, res: Respon
     requireFields({ assignmentNumber, classid });
 
     if (isNaN(assignmentNumber)) {
-        throw new BadRequestException("Assignment id should be a number")
+        throw new BadRequestException('Assignment id should be a number');
     }
 
     const submissions = await getAssignmentsSubmissions(classid, assignmentNumber, full);
diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts
index 269259aa..6252c714 100644
--- a/backend/src/controllers/classes.ts
+++ b/backend/src/controllers/classes.ts
@@ -11,10 +11,10 @@ import {
     getClassStudents,
     getClassTeacherInvitations,
     getClassTeachers,
-    putClass
+    putClass,
 } from '../services/classes.js';
 import { ClassDTO } from '@dwengo-1/common/interfaces/class';
-import {requireFields} from "./error-helper";
+import { requireFields } from './error-helper';
 import { EntityDTO } from '@mikro-orm/core';
 import { Class } from '../entities/classes/class.entity.js';
 
diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts
index 3e10b0f2..a742685f 100644
--- a/backend/src/controllers/submissions.ts
+++ b/backend/src/controllers/submissions.ts
@@ -7,19 +7,17 @@ import { Language, languageMap } from '@dwengo-1/common/util/language';
 import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
 import { requireFields } from './error-helper.js';
 
-
-
 export async function getSubmissionHandler(req: Request, res: Response): Promise<void> {
     const lohruid = req.params.hruid;
     const lang = languageMap[req.query.language as string] || Language.Dutch;
     const version = (req.query.version || 1) as number;
     const submissionNumber = Number(req.params.id);
     requireFields({ lohruid, submissionNumber });
-    
+
     if (isNaN(submissionNumber)) {
         throw new BadRequestException('Submission number must be a number');
     }
-    
+
     const loId = new LearningObjectIdentifier(lohruid, lang, version);
     const submission = await getSubmission(loId, submissionNumber);
 
@@ -54,7 +52,7 @@ export async function deleteSubmissionHandler(req: Request, res: Response): Prom
     requireFields({ hruid, submissionNumber });
 
     if (isNaN(submissionNumber)) {
-        throw new BadRequestException('Submission number must be a number'); 
+        throw new BadRequestException('Submission number must be a number');
     }
 
     const loId = new LearningObjectIdentifier(hruid, lang, version);
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index eb145fa9..af1e0a17 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -58,12 +58,12 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
 
     public async findAllByAssignment(assignment: Assignment): Promise<Question[]> {
         return this.find({
-            author: assignment.groups.flatMap(group => group.members),
+            author: assignment.groups.flatMap((group) => group.members),
             learningObjectHruid: assignment.learningPathHruid,
             learningObjectLanguage: assignment.learningPathLanguage,
         });
     }
-    
+
     public async findAllByAuthor(author: Student): Promise<Question[]> {
         return this.findAll({
             where: { author },
diff --git a/backend/src/routes/classes.ts b/backend/src/routes/classes.ts
index aa2a4814..cef6fd72 100644
--- a/backend/src/routes/classes.ts
+++ b/backend/src/routes/classes.ts
@@ -8,7 +8,8 @@ import {
     deleteClassTeacherHandler,
     getAllClassesHandler,
     getClassHandler,
-    getClassStudentsHandler, getClassTeachersHandler,
+    getClassStudentsHandler,
+    getClassTeachersHandler,
     getTeacherInvitationsHandler,
     putClassHandler,
 } from '../controllers/classes.js';
diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts
index 9f5d9183..3f1de240 100644
--- a/backend/src/services/assignments.ts
+++ b/backend/src/services/assignments.ts
@@ -1,5 +1,11 @@
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
-import { getAssignmentRepository, getClassRepository, getGroupRepository, getQuestionRepository, getSubmissionRepository } from '../data/repositories.js';
+import {
+    getAssignmentRepository,
+    getClassRepository,
+    getGroupRepository,
+    getQuestionRepository,
+    getSubmissionRepository,
+} from '../data/repositories.js';
 import { Assignment } from '../entities/assignments/assignment.entity.js';
 import { NotFoundException } from '../exceptions/not-found-exception.js';
 import { mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId } from '../interfaces/assignment.js';
@@ -18,7 +24,7 @@ export async function fetchAssignment(classid: string, assignmentNumber: number)
     const cls = await classRepository.findById(classid);
 
     if (!cls) {
-        throw new NotFoundException('Could not find assignment\'s class');
+        throw new NotFoundException("Could not find assignment's class");
     }
 
     const assignmentRepository = getAssignmentRepository();
@@ -48,10 +54,10 @@ export async function createAssignment(classid: string, assignmentData: Assignme
     const cls = await fetchClass(classid);
 
     const assignment = mapToAssignment(assignmentData, cls);
-    
+
     const assignmentRepository = getAssignmentRepository();
     const newAssignment = assignmentRepository.create(assignment);
-    await assignmentRepository.save(newAssignment, {preventOverwrite: true});
+    await assignmentRepository.save(newAssignment, { preventOverwrite: true });
 
     return mapToAssignmentDTO(newAssignment);
 }
@@ -63,7 +69,7 @@ export async function getAssignment(classid: string, id: number): Promise<Assign
 
 export async function putAssignment(classid: string, id: number, assignmentData: Partial<EntityDTO<Assignment>>): Promise<AssignmentDTO> {
     const assignment = await fetchAssignment(classid, id);
-    
+
     await putObject<Assignment, AssignmentDTO>(assignment, assignmentData, getAssignmentRepository());
 
     return mapToAssignmentDTO(assignment);
@@ -90,9 +96,7 @@ export async function getAssignmentsSubmissions(
     const groups = await groupRepository.findAllGroupsForAssignment(assignment);
 
     const submissionRepository = getSubmissionRepository();
-    const submissions = (await Promise.all(
-        groups.map(async (group) => submissionRepository.findAllSubmissionsForGroup(group))
-    )).flat();
+    const submissions = (await Promise.all(groups.map(async (group) => submissionRepository.findAllSubmissionsForGroup(group)))).flat();
 
     if (full) {
         return submissions.map(mapToSubmissionDTO);
@@ -101,11 +105,7 @@ export async function getAssignmentsSubmissions(
     return submissions.map(mapToSubmissionDTOId);
 }
 
-export async function getAssignmentsQuestions(
-    classid: string,
-    assignmentNumber: number,
-    full: boolean
-): Promise<QuestionDTO[] | QuestionId[]> {
+export async function getAssignmentsQuestions(classid: string, assignmentNumber: number, full: boolean): Promise<QuestionDTO[] | QuestionId[]> {
     const assignment = await fetchAssignment(classid, assignmentNumber);
 
     const questionRepository = getQuestionRepository();
@@ -116,4 +116,4 @@ export async function getAssignmentsQuestions(
     }
 
     return questions.map(mapToQuestionDTO);
-}
\ No newline at end of file
+}
diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index 128cdec8..b6b4b04e 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -8,10 +8,10 @@ import { Class } from '../entities/classes/class.entity.js';
 import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
 import { StudentDTO } from '@dwengo-1/common/interfaces/student';
-import {fetchTeacher} from "./teachers";
-import {fetchStudent, getStudent} from "./students";
-import {TeacherDTO} from "@dwengo-1/common/interfaces/teacher";
-import {mapToTeacherDTO} from "../interfaces/teacher";
+import { fetchTeacher } from './teachers';
+import { fetchStudent, getStudent } from './students';
+import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher';
+import { mapToTeacherDTO } from '../interfaces/teacher';
 import { EntityDTO } from '@mikro-orm/core';
 import { putObject } from './service-helper.js';
 
@@ -20,7 +20,7 @@ export async function fetchClass(classid: string): Promise<Class> {
     const cls = await classRepository.findById(classid);
 
     if (!cls) {
-        throw new NotFoundException("Class not found");
+        throw new NotFoundException('Class not found');
     }
 
     return cls;
@@ -43,10 +43,10 @@ export async function getClass(classId: string): Promise<ClassDTO> {
 
 export async function createClass(classData: ClassDTO): Promise<ClassDTO> {
     const teacherUsernames = classData.teachers || [];
-    const teachers = (await Promise.all(teacherUsernames.map(async (id) => fetchTeacher(id) )));
+    const teachers = await Promise.all(teacherUsernames.map(async (id) => fetchTeacher(id)));
 
     const studentUsernames = classData.students || [];
-    const students = (await Promise.all(studentUsernames.map(async (id) => fetchStudent(id) )));
+    const students = await Promise.all(studentUsernames.map(async (id) => fetchStudent(id)));
 
     const classRepository = getClassRepository();
     const newClass = classRepository.create({
@@ -54,7 +54,7 @@ export async function createClass(classData: ClassDTO): Promise<ClassDTO> {
         teachers: teachers,
         students: students,
     });
-    await classRepository.save(newClass, {preventOverwrite: true});
+    await classRepository.save(newClass, { preventOverwrite: true });
 
     return mapToClassDTO(newClass);
 }
@@ -93,7 +93,7 @@ export async function getClassStudentsDTO(classId: string): Promise<StudentDTO[]
 export async function getClassTeachers(classId: string, full: boolean): Promise<TeacherDTO[] | string[]> {
     const cls = await fetchClass(classId);
 
-    if (full){
+    if (full) {
         return cls.teachers.map(mapToTeacherDTO);
     }
     return cls.teachers.map((student) => student.username);
@@ -114,7 +114,7 @@ export async function getClassTeacherInvitations(classId: string, full: boolean)
 
 export async function deleteClassStudent(classId: string, username: string): Promise<ClassDTO> {
     const cls = await fetchClass(classId);
-    
+
     const newStudents = { students: cls.students.filter((student) => student.username !== username) };
     await putObject<Class, ClassDTO>(cls, newStudents, getClassRepository());
 
@@ -123,7 +123,7 @@ export async function deleteClassStudent(classId: string, username: string): Pro
 
 export async function deleteClassTeacher(classId: string, username: string): Promise<ClassDTO> {
     const cls = await fetchClass(classId);
-    
+
     const newTeachers = { teachers: cls.teachers.filter((teacher) => teacher.username !== username) };
     await putObject<Class, ClassDTO>(cls, newTeachers, getClassRepository());
 
@@ -134,9 +134,9 @@ export async function addClassStudent(classId: string, username: string): Promis
     const cls = await fetchClass(classId);
     const newStudent = await fetchStudent(username);
 
-    const newStudents = { students: [...cls.students, newStudent] }
+    const newStudents = { students: [...cls.students, newStudent] };
     await putObject<Class, ClassDTO>(cls, newStudents, getClassRepository());
-    
+
     return mapToClassDTO(cls);
 }
 
@@ -145,7 +145,7 @@ export async function addClassTeacher(classId: string, username: string): Promis
     const newTeacher = await fetchTeacher(username);
 
     const newTeachers = { teachers: [...cls.teachers, newTeacher] };
-    await putObject<Class, ClassDTO>(cls, newTeachers, getClassRepository());    
+    await putObject<Class, ClassDTO>(cls, newTeachers, getClassRepository());
 
     return mapToClassDTO(cls);
 }
diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts
index 68784177..711cc11f 100644
--- a/backend/src/services/groups.ts
+++ b/backend/src/services/groups.ts
@@ -27,7 +27,7 @@ export async function fetchGroup(classId: string, assignmentNumber: number, grou
         throw new NotFoundException('Could not find group');
     }
 
-    return group; 
+    return group;
 }
 
 export async function getGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise<GroupDTO> {
@@ -38,7 +38,7 @@ export async function getGroup(classId: string, assignmentNumber: number, groupN
 export async function deleteGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise<GroupDTO> {
     const group = await fetchGroup(classId, assignmentNumber, groupNumber);
     const assignment = await fetchAssignment(classId, assignmentNumber);
-    
+
     const groupRepository = getGroupRepository();
     await groupRepository.deleteByAssignmentAndGroupNumber(assignment, groupNumber);
 
@@ -46,8 +46,8 @@ export async function deleteGroup(classId: string, assignmentNumber: number, gro
 }
 
 export async function getExistingGroupFromGroupDTO(groupData: GroupDTO) {
-    const classId = typeof(groupData.class) === 'string' ? groupData.class : groupData.class.id;
-    const assignmentNumber = typeof(groupData.assignment) === 'number' ? groupData.assignment : groupData.assignment.id;
+    const classId = typeof groupData.class === 'string' ? groupData.class : groupData.class.id;
+    const assignmentNumber = typeof groupData.assignment === 'number' ? groupData.assignment : groupData.assignment.id;
     const groupNumber = groupData.groupNumber;
 
     return await fetchGroup(classId, assignmentNumber, groupNumber);
diff --git a/backend/src/services/service-helper.ts b/backend/src/services/service-helper.ts
index 3f8c897e..215564f3 100644
--- a/backend/src/services/service-helper.ts
+++ b/backend/src/services/service-helper.ts
@@ -1,5 +1,5 @@
-import { EntityDTO, FromEntityType } from "@mikro-orm/core";
-import { DwengoEntityRepository } from "../data/dwengo-entity-repository";
+import { EntityDTO, FromEntityType } from '@mikro-orm/core';
+import { DwengoEntityRepository } from '../data/dwengo-entity-repository';
 
 /**
  * Utility function to perform an PUT on an object.
@@ -7,14 +7,14 @@ import { DwengoEntityRepository } from "../data/dwengo-entity-repository";
  * @param object The object that needs to be changed
  * @param data The datafields and their values that will be updated
  * @param repo The repository on which this action needs to be performed
- * 
+ *
  * @returns Nothing.
  */
 export async function putObject<T extends object, DTO>(
-    object: T, 
-    data: Partial<EntityDTO<FromEntityType<T>>>, 
+    object: T,
+    data: Partial<EntityDTO<FromEntityType<T>>>,
     repo: DwengoEntityRepository<T>
 ): Promise<void> {
     repo.assign(object, data);
     await repo.getEntityManager().flush();
-}
\ No newline at end of file
+}
diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts
index f3ee0f10..25f6e7f0 100644
--- a/backend/src/services/submissions.ts
+++ b/backend/src/services/submissions.ts
@@ -8,10 +8,7 @@ import { fetchStudent } from './students.js';
 import { fetchGroup, getExistingGroupFromGroupDTO } from './groups.js';
 import { Submission } from '../entities/assignments/submission.entity.js';
 
-export async function fetchSubmission(
-    loId: LearningObjectIdentifier,
-    submissionNumber: number,
-): Promise<Submission> {
+export async function fetchSubmission(loId: LearningObjectIdentifier, submissionNumber: number): Promise<Submission> {
     const submissionRepository = getSubmissionRepository();
     const submission = await submissionRepository.findSubmissionByLearningObjectAndSubmissionNumber(loId, submissionNumber);
 
@@ -22,17 +19,12 @@ export async function fetchSubmission(
     return submission;
 }
 
-export async function getSubmission(
-    loId: LearningObjectIdentifier,
-    submissionNumber: number
-): Promise<SubmissionDTO> {
+export async function getSubmission(loId: LearningObjectIdentifier, submissionNumber: number): Promise<SubmissionDTO> {
     const submission = await fetchSubmission(loId, submissionNumber);
     return mapToSubmissionDTO(submission);
 }
 
-export async function getAllSubmissions(
-    loId: LearningObjectIdentifier,
-): Promise<SubmissionDTO[]> {
+export async function getAllSubmissions(loId: LearningObjectIdentifier): Promise<SubmissionDTO[]> {
     const submissionRepository = getSubmissionRepository();
     const submissions = await submissionRepository.findByLearningObject(loId);
 
@@ -52,7 +44,7 @@ export async function createSubmission(submissionDTO: SubmissionDTO): Promise<Su
 
 export async function deleteSubmission(loId: LearningObjectIdentifier, submissionNumber: number): Promise<SubmissionDTO> {
     const submission = await fetchSubmission(loId, submissionNumber);
-    
+
     const submissionRepository = getSubmissionRepository();
     await submissionRepository.deleteSubmissionByLearningObjectAndSubmissionNumber(loId, submissionNumber);
 
diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts
index 487e42be..3ebc6609 100644
--- a/backend/src/services/teachers.ts
+++ b/backend/src/services/teachers.ts
@@ -22,7 +22,7 @@ import { Question } from '../entities/questions/question.entity.js';
 import { ClassJoinRequestRepository } from '../data/classes/class-join-request-repository.js';
 import { Student } from '../entities/users/student.entity.js';
 import { NotFoundException } from '../exceptions/not-found-exception.js';
-import {getClassStudents, getClassStudentsDTO} from './classes.js';
+import { getClassStudents, getClassStudentsDTO } from './classes.js';
 import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher';
 import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 import { StudentDTO } from '@dwengo-1/common/interfaces/student';
@@ -102,9 +102,9 @@ export async function getStudentsByTeacher(username: string, full: boolean): Pro
     const students: StudentDTO[] = (await Promise.all(classIds.map(async (username) => await getClassStudentsDTO(username)))).flat();
 
     if (full) {
-        return students
+        return students;
     }
-    
+
     return students.map((student) => student.username);
 }
 
diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts
index 9c8a667f..d8e93eca 100644
--- a/frontend/src/controllers/classes.ts
+++ b/frontend/src/controllers/classes.ts
@@ -3,7 +3,7 @@ import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
 import type { StudentsResponse } from "./students";
 import type { AssignmentsResponse } from "./assignments";
 import type { TeacherInvitationDTO } from "@dwengo-1/common/interfaces/teacher-invitation";
-import type {TeachersResponse} from "@/controllers/teachers.ts";
+import type { TeachersResponse } from "@/controllers/teachers.ts";
 
 export interface ClassesResponse {
     classes: ClassDTO[] | string[];

From 81da765a74bc50922392e726b32e926ca276db87 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 6 Apr 2025 22:40:09 +0200
Subject: [PATCH 072/177] fix: linter run

---
 backend/src/data/assignments/submission-repository.ts | 4 ++--
 backend/src/data/questions/question-repository.ts     | 2 +-
 backend/src/interfaces/assignment.ts                  | 2 +-
 backend/src/services/service-helper.ts                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts
index 371dd4ef..2e673210 100644
--- a/backend/src/data/assignments/submission-repository.ts
+++ b/backend/src/data/assignments/submission-repository.ts
@@ -17,7 +17,7 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
         });
     }
 
-    public findByLearningObject(loId: LearningObjectIdentifier): Promise<Submission[]> {
+    public async findByLearningObject(loId: LearningObjectIdentifier): Promise<Submission[]> {
         return this.find({
             learningObjectHruid: loId.hruid,
             learningObjectLanguage: loId.language,
@@ -25,7 +25,7 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
         });
     }
 
-    public findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise<Submission | null> {
+    public async findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise<Submission | null> {
         return this.findOne(
             {
                 learningObjectHruid: loId.hruid,
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 246b0484..eb145fa9 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -56,7 +56,7 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
         });
     }
 
-    public findAllByAssignment(assignment: Assignment): Promise<Question[]> {
+    public async findAllByAssignment(assignment: Assignment): Promise<Question[]> {
         return this.find({
             author: assignment.groups.flatMap(group => group.members),
             learningObjectHruid: assignment.learningPathHruid,
diff --git a/backend/src/interfaces/assignment.ts b/backend/src/interfaces/assignment.ts
index 09e12dd0..2e591797 100644
--- a/backend/src/interfaces/assignment.ts
+++ b/backend/src/interfaces/assignment.ts
@@ -25,7 +25,7 @@ export function mapToAssignmentDTO(assignment: Assignment): AssignmentDTO {
         description: assignment.description,
         learningPath: assignment.learningPathHruid,
         language: assignment.learningPathLanguage,
-        // groups: assignment.groups.map(mapToGroupDTO),
+        // Groups: assignment.groups.map(mapToGroupDTO),
     };
 }
 
diff --git a/backend/src/services/service-helper.ts b/backend/src/services/service-helper.ts
index 427ff5dd..1b7c23fb 100644
--- a/backend/src/services/service-helper.ts
+++ b/backend/src/services/service-helper.ts
@@ -10,7 +10,7 @@ import { DwengoEntityRepository } from "../data/dwengo-entity-repository";
  * 
  * @returns Nothing.
  */
-export async function putObject<T extends Object>(
+export async function putObject<T extends object>(
     object: T, 
     data: Partial<EntityDTO<FromEntityType<T>>>, 
     repo: DwengoEntityRepository<T>

From aa2d4242ae8d8d15434167a47242fded08155a08 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Sun, 6 Apr 2025 20:44:06 +0000
Subject: [PATCH 073/177] style: fix linting issues met Prettier

---
 backend/src/routes/groups.ts           | 9 ++++++++-
 backend/src/services/assignments.ts    | 2 +-
 backend/src/services/classes.ts        | 6 +++---
 backend/src/services/groups.ts         | 6 +++---
 backend/src/services/service-helper.ts | 4 ++--
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/backend/src/routes/groups.ts b/backend/src/routes/groups.ts
index 54c32462..7f973972 100644
--- a/backend/src/routes/groups.ts
+++ b/backend/src/routes/groups.ts
@@ -1,5 +1,12 @@
 import express from 'express';
-import { createGroupHandler, deleteGroupHandler, getAllGroupsHandler, getGroupHandler, getGroupSubmissionsHandler, putGroupHandler } from '../controllers/groups.js';
+import {
+    createGroupHandler,
+    deleteGroupHandler,
+    getAllGroupsHandler,
+    getGroupHandler,
+    getGroupSubmissionsHandler,
+    putGroupHandler,
+} from '../controllers/groups.js';
 
 const router = express.Router({ mergeParams: true });
 
diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts
index d703e7f4..55f4947c 100644
--- a/backend/src/services/assignments.ts
+++ b/backend/src/services/assignments.ts
@@ -69,7 +69,7 @@ export async function getAssignment(classid: string, id: number): Promise<Assign
 
 export async function putAssignment(classid: string, id: number, assignmentData: Partial<EntityDTO<Assignment>>): Promise<AssignmentDTO> {
     const assignment = await fetchAssignment(classid, id);
-    
+
     await putObject<Assignment>(assignment, assignmentData, getAssignmentRepository());
 
     return mapToAssignmentDTO(assignment);
diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index c9d44730..4abe18af 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -134,9 +134,9 @@ export async function addClassStudent(classId: string, username: string): Promis
     const cls = await fetchClass(classId);
     const newStudent = await fetchStudent(username);
 
-    const newStudents = { students: [...cls.students, newStudent] }
+    const newStudents = { students: [...cls.students, newStudent] };
     await putObject<Class>(cls, newStudents, getClassRepository());
-    
+
     return mapToClassDTO(cls);
 }
 
@@ -145,7 +145,7 @@ export async function addClassTeacher(classId: string, username: string): Promis
     const newTeacher = await fetchTeacher(username);
 
     const newTeachers = { teachers: [...cls.teachers, newTeacher] };
-    await putObject<Class>(cls, newTeachers, getClassRepository());    
+    await putObject<Class>(cls, newTeachers, getClassRepository());
 
     return mapToClassDTO(cls);
 }
diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts
index 40bad732..9b9903ed 100644
--- a/backend/src/services/groups.ts
+++ b/backend/src/services/groups.ts
@@ -37,9 +37,9 @@ export async function getGroup(classId: string, assignmentNumber: number, groupN
 }
 
 export async function putGroup(
-    classId: string, 
-    assignmentNumber: number, 
-    groupNumber: number, 
+    classId: string,
+    assignmentNumber: number,
+    groupNumber: number,
     groupData: Partial<EntityDTO<Group>>
 ): Promise<GroupDTO> {
     const group = await fetchGroup(classId, assignmentNumber, groupNumber);
diff --git a/backend/src/services/service-helper.ts b/backend/src/services/service-helper.ts
index 47c4b757..641fada4 100644
--- a/backend/src/services/service-helper.ts
+++ b/backend/src/services/service-helper.ts
@@ -11,8 +11,8 @@ import { DwengoEntityRepository } from '../data/dwengo-entity-repository';
  * @returns Nothing.
  */
 export async function putObject<T extends object>(
-    object: T, 
-    data: Partial<EntityDTO<FromEntityType<T>>>, 
+    object: T,
+    data: Partial<EntityDTO<FromEntityType<T>>>,
     repo: DwengoEntityRepository<T>
 ): Promise<void> {
     repo.assign(object, data);

From 12c1505ba79454f65b3d2ce6b04b07e62b68de5d Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Sun, 6 Apr 2025 23:08:11 +0200
Subject: [PATCH 074/177] feat(backend): Groep aan primaire sleutel van
 submissions en questions toegevoegd.

---
 backend/src/data/questions/question-repository.ts    |  4 +++-
 .../src/entities/assignments/submission.entity.ts    | 12 +++++++-----
 backend/src/entities/questions/question.entity.ts    |  3 +++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 2d165abc..087246b6 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -5,12 +5,13 @@ import { Student } from '../../entities/users/student.entity.js';
 import { LearningObject } from '../../entities/content/learning-object.entity.js';
 
 export class QuestionRepository extends DwengoEntityRepository<Question> {
-    public async createQuestion(question: { loId: LearningObjectIdentifier; author: Student; content: string }): Promise<Question> {
+    public async createQuestion(question: { loId: LearningObjectIdentifier; author: Student; group: Group, content: string }): Promise<Question> {
         const questionEntity = this.create({
             learningObjectHruid: question.loId.hruid,
             learningObjectLanguage: question.loId.language,
             learningObjectVersion: question.loId.version,
             author: question.author,
+            group: question.group,
             content: question.content,
             timestamp: new Date(),
         });
@@ -18,6 +19,7 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
         questionEntity.learningObjectLanguage = question.loId.language;
         questionEntity.learningObjectVersion = question.loId.version;
         questionEntity.author = question.author;
+        questionEntity.group = question.group;
         questionEntity.content = question.content;
         return this.insert(questionEntity);
     }
diff --git a/backend/src/entities/assignments/submission.entity.ts b/backend/src/entities/assignments/submission.entity.ts
index 80b9a8fb..1f500890 100644
--- a/backend/src/entities/assignments/submission.entity.ts
+++ b/backend/src/entities/assignments/submission.entity.ts
@@ -21,6 +21,12 @@ export class Submission {
     @PrimaryKey({ type: 'integer', autoincrement: true })
     submissionNumber?: number;
 
+    @ManyToOne({
+        entity: () => Group,
+        primary: true
+    })
+    onBehalfOf: Group;
+
     @ManyToOne({
         entity: () => Student,
     })
@@ -29,11 +35,7 @@ export class Submission {
     @Property({ type: 'datetime' })
     submissionTime!: Date;
 
-    @ManyToOne({
-        entity: () => Group,
-        nullable: true,
-    })
-    onBehalfOf?: Group;
+
 
     @Property({ type: 'json' })
     content!: string;
diff --git a/backend/src/entities/questions/question.entity.ts b/backend/src/entities/questions/question.entity.ts
index 5e691f70..8ee2c70e 100644
--- a/backend/src/entities/questions/question.entity.ts
+++ b/backend/src/entities/questions/question.entity.ts
@@ -20,6 +20,9 @@ export class Question {
     @PrimaryKey({ type: 'integer', autoincrement: true })
     sequenceNumber?: number;
 
+    @ManyToOne({ entity: () => Group, primary: true })
+    inGroup: Group;
+
     @ManyToOne({
         entity: () => Student,
     })

From f9b83bc4afafa24ef89db07a5bc9bb0ecab5c515 Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Sun, 6 Apr 2025 23:36:23 +0200
Subject: [PATCH 075/177] fix(backend): Services en controllers aan gewijzigde
 primaire sleutel van Question en Submission aangepast.

---
 backend/src/controllers/questions.ts              | 2 +-
 backend/src/data/questions/question-repository.ts | 7 ++++---
 backend/src/entities/questions/question.entity.ts | 3 ++-
 backend/src/services/questions.ts                 | 1 +
 common/src/interfaces/question.ts                 | 3 +++
 common/src/interfaces/submission.ts               | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts
index b5b764ac..54b50fa9 100644
--- a/backend/src/controllers/questions.ts
+++ b/backend/src/controllers/questions.ts
@@ -88,7 +88,7 @@ export async function getQuestionAnswersHandler(req: Request, res: Response): Pr
 export async function createQuestionHandler(req: Request, res: Response): Promise<void> {
     const questionDTO = req.body as QuestionDTO;
 
-    if (!questionDTO.learningObjectIdentifier || !questionDTO.author || !questionDTO.content) {
+    if (!questionDTO.learningObjectIdentifier || !questionDTO.author || !questionDTO.inGroup || !questionDTO.content) {
         res.status(400).json({ error: 'Missing required fields: identifier and content' });
         return;
     }
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 087246b6..51df5afe 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -3,15 +3,16 @@ import { Question } from '../../entities/questions/question.entity.js';
 import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js';
 import { Student } from '../../entities/users/student.entity.js';
 import { LearningObject } from '../../entities/content/learning-object.entity.js';
+import {Group} from "../../entities/assignments/group.entity";
 
 export class QuestionRepository extends DwengoEntityRepository<Question> {
-    public async createQuestion(question: { loId: LearningObjectIdentifier; author: Student; group: Group, content: string }): Promise<Question> {
+    public async createQuestion(question: { loId: LearningObjectIdentifier; author: Student; inGroup: Group, content: string }): Promise<Question> {
         const questionEntity = this.create({
             learningObjectHruid: question.loId.hruid,
             learningObjectLanguage: question.loId.language,
             learningObjectVersion: question.loId.version,
             author: question.author,
-            group: question.group,
+            inGroup: question.inGroup,
             content: question.content,
             timestamp: new Date(),
         });
@@ -19,7 +20,7 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
         questionEntity.learningObjectLanguage = question.loId.language;
         questionEntity.learningObjectVersion = question.loId.version;
         questionEntity.author = question.author;
-        questionEntity.group = question.group;
+        questionEntity.inGroup = question.inGroup;
         questionEntity.content = question.content;
         return this.insert(questionEntity);
     }
diff --git a/backend/src/entities/questions/question.entity.ts b/backend/src/entities/questions/question.entity.ts
index 8ee2c70e..bb36e8a3 100644
--- a/backend/src/entities/questions/question.entity.ts
+++ b/backend/src/entities/questions/question.entity.ts
@@ -2,6 +2,7 @@ import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core';
 import { Student } from '../users/student.entity.js';
 import { QuestionRepository } from '../../data/questions/question-repository.js';
 import { Language } from '@dwengo-1/common/util/language';
+import {Group} from "../assignments/group.entity";
 
 @Entity({ repository: () => QuestionRepository })
 export class Question {
@@ -21,7 +22,7 @@ export class Question {
     sequenceNumber?: number;
 
     @ManyToOne({ entity: () => Group, primary: true })
-    inGroup: Group;
+    inGroup!: Group;
 
     @ManyToOne({
         entity: () => Student,
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index 319061c5..e1ee8831 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -80,6 +80,7 @@ export async function createQuestion(questionDTO: QuestionDTO): Promise<Question
         await questionRepository.createQuestion({
             loId,
             author,
+            inGroup: questionDTO.inGroup,
             content: questionDTO.content,
         });
     } catch (_) {
diff --git a/common/src/interfaces/question.ts b/common/src/interfaces/question.ts
index b80ff0af..69a9590d 100644
--- a/common/src/interfaces/question.ts
+++ b/common/src/interfaces/question.ts
@@ -1,10 +1,12 @@
 import { LearningObjectIdentifier } from './learning-content';
 import { StudentDTO } from './student';
+import {GroupDTO} from "./group";
 
 export interface QuestionDTO {
     learningObjectIdentifier: LearningObjectIdentifier;
     sequenceNumber?: number;
     author: StudentDTO;
+    inGroup: GroupDTO;
     timestamp?: string;
     content: string;
 }
@@ -12,4 +14,5 @@ export interface QuestionDTO {
 export interface QuestionId {
     learningObjectIdentifier: LearningObjectIdentifier;
     sequenceNumber: number;
+    inGroup: GroupDTO;
 }
diff --git a/common/src/interfaces/submission.ts b/common/src/interfaces/submission.ts
index 6b250616..f63660b1 100644
--- a/common/src/interfaces/submission.ts
+++ b/common/src/interfaces/submission.ts
@@ -9,7 +9,7 @@ export interface SubmissionDTO {
     submissionNumber?: number;
     submitter: StudentDTO;
     time?: Date;
-    group?: GroupDTO;
+    group: GroupDTO;
     content: string;
 }
 

From e8e2466b7608d61154cca33b6f0db199ba514d32 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Sun, 6 Apr 2025 23:37:54 +0200
Subject: [PATCH 076/177] feat: answer routes en put question

---
 backend/src/controllers/answers.ts            | 101 ++++++++++++++++++
 backend/src/controllers/questions.ts          |  57 ++++++----
 .../src/data/questions/answer-repository.ts   |  10 ++
 .../src/data/questions/question-repository.ts |   6 ++
 backend/src/interfaces/answer.ts              |   6 +-
 backend/src/interfaces/question.ts            |   4 +-
 backend/src/routes/answers.ts                 |  22 ++++
 backend/src/routes/questions.ts               |   5 +-
 backend/src/services/answers.ts               |  68 ++++++++++++
 backend/src/services/questions.ts             |  53 ++++-----
 common/src/interfaces/answer.ts               |   9 +-
 common/src/interfaces/question.ts             |   9 +-
 12 files changed, 288 insertions(+), 62 deletions(-)
 create mode 100644 backend/src/controllers/answers.ts
 create mode 100644 backend/src/routes/answers.ts
 create mode 100644 backend/src/services/answers.ts

diff --git a/backend/src/controllers/answers.ts b/backend/src/controllers/answers.ts
new file mode 100644
index 00000000..1bb53019
--- /dev/null
+++ b/backend/src/controllers/answers.ts
@@ -0,0 +1,101 @@
+import {Request, Response} from "express";
+import {requireFields} from "./error-helper";
+import {getLearningObjectId, getQuestionId} from "./questions";
+import {createAnswer, deleteAnswer, getAnswer, getAnswersByQuestion, updateAnswer} from "../services/answers";
+import {FALLBACK_SEQ_NUM} from "../config";
+import {AnswerData} from "@dwengo-1/common/interfaces/answer";
+
+export async function getAnswersHandler(req: Request, res: Response): Promise<void> {
+    const hruid = req.params.hruid;
+    const version = req.params.version;
+    const language = req.query.lang as string;
+    const seq = req.params.seq;
+    const full = req.query.full === 'true';
+    requireFields({ hruid })
+
+    const learningObjectId = getLearningObjectId(hruid, version, language);
+    const questionId = getQuestionId(learningObjectId, seq);
+
+    const answers = await getAnswersByQuestion(questionId, full);
+
+    res.json({ answers });
+}
+
+export async function getAnswerHandler(req: Request, res: Response): Promise<void>{
+    const hruid = req.params.hruid;
+    const version = req.params.version;
+    const language = req.query.lang as string;
+    const seq = req.params.seq;
+    const seqAnswer = req.params.seqAnswer;
+    requireFields({ hruid })
+
+    const learningObjectId = getLearningObjectId(hruid, version, language);
+    const questionId = getQuestionId(learningObjectId, seq);
+
+    const sequenceNumber = Number(seqAnswer) || FALLBACK_SEQ_NUM;
+    const answer = await getAnswer(questionId, sequenceNumber);
+
+    res.json({ answer });
+}
+
+export async function createAnswerHandler(req: Request, res: Response): Promise<void> {
+    const hruid = req.params.hruid;
+    const version = req.params.version;
+    const language = req.query.lang as string;
+    const seq = req.params.seq;
+    requireFields({ hruid })
+
+    const learningObjectId = getLearningObjectId(hruid, version, language);
+    const questionId = getQuestionId(learningObjectId, seq);
+
+    const author = req.body.author as string;
+    const content = req.body.content as string;
+    requireFields({ author, content });
+
+    const answerData = req.body as AnswerData;
+
+    const answer = await createAnswer(questionId, answerData);
+
+    res.json({ answer });
+}
+
+export async function deleteAnswerHandler(req: Request, res: Response): Promise<void> {
+    const hruid = req.params.hruid;
+    const version = req.params.version;
+    const language = req.query.lang as string;
+    const seq = req.params.seq;
+    const seqAnswer = req.params.seqAnswer;
+    requireFields({ hruid })
+
+    const learningObjectId = getLearningObjectId(hruid, version, language);
+    const questionId = getQuestionId(learningObjectId, seq);
+
+    const sequenceNumber = Number(seqAnswer) || FALLBACK_SEQ_NUM;
+    const answer = await deleteAnswer(questionId, sequenceNumber);
+
+    res.json({ answer });
+}
+
+
+
+export async function updateAnswerHandler(req: Request, res: Response): Promise<void> {
+    const hruid = req.params.hruid;
+    const version = req.params.version;
+    const language = req.query.lang as string;
+    const seq = req.params.seq;
+    const seqAnswer = req.params.seqAnswer;
+    requireFields({ hruid })
+
+    const learningObjectId = getLearningObjectId(hruid, version, language);
+    const questionId = getQuestionId(learningObjectId, seq);
+
+    const content = req.body.content as string;
+    requireFields({ content });
+
+    const answerData = req.body as AnswerData;
+
+    const sequenceNumber = Number(seqAnswer) || FALLBACK_SEQ_NUM;
+    const answer = await updateAnswer(questionId, sequenceNumber, answerData);
+
+    res.json({ answer });
+}
diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts
index a4a6a76d..e239d9ca 100644
--- a/backend/src/controllers/questions.ts
+++ b/backend/src/controllers/questions.ts
@@ -1,12 +1,17 @@
 import { Request, Response } from 'express';
-import { createQuestion, deleteQuestion, getAllQuestions, getAnswersByQuestion, getQuestion } from '../services/questions.js';
+import {
+    createQuestion,
+    deleteQuestion,
+    getAllQuestions,
+    getQuestion, updateQuestion
+} from '../services/questions.js';
 import {FALLBACK_LANG, FALLBACK_SEQ_NUM, FALLBACK_VERSION_NUM} from '../config.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
-import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
+import {QuestionData, QuestionId} from '@dwengo-1/common/interfaces/question';
 import { Language } from '@dwengo-1/common/util/language';
 import {requireFields} from "./error-helper";
 
-function getLearningObjectId(hruid: string, version: string, lang: string): LearningObjectIdentifier {
+export function getLearningObjectId(hruid: string, version: string, lang: string): LearningObjectIdentifier {
     return {
         hruid,
         language: (lang || FALLBACK_LANG) as Language,
@@ -14,7 +19,7 @@ function getLearningObjectId(hruid: string, version: string, lang: string): Lear
     };
 }
 
-function getQuestionId(learningObjectIdentifier: LearningObjectIdentifier, seq: string): QuestionId {
+export function getQuestionId(learningObjectIdentifier: LearningObjectIdentifier, seq: string): QuestionId {
     return {
         learningObjectIdentifier,
         sequenceNumber: seq ? Number(seq) : FALLBACK_SEQ_NUM,
@@ -51,31 +56,21 @@ export async function getQuestionHandler(req: Request, res: Response): Promise<v
 
 }
 
-export async function getQuestionAnswersHandler(req: Request, res: Response): Promise<void> {
+export async function createQuestionHandler(req: Request, res: Response): Promise<void> {
     const hruid = req.params.hruid;
     const version = req.params.version;
     const language = req.query.lang as string;
-    const seq = req.params.seq;
-    const full = req.query.full === 'true';
     requireFields({ hruid })
 
-    const learningObjectId = getLearningObjectId(hruid, version, language);
-    const questionId = getQuestionId(learningObjectId, seq);
+    const loId = getLearningObjectId(hruid, version, language);
 
-    const answers = await getAnswersByQuestion(questionId, full);
+    const author = req.body.author as string;
+    const content = req.body.content as string;
+    requireFields({ author, content });
 
-    res.json({ answers });
-}
+    const questionData = req.body as QuestionData;
 
-export async function createQuestionHandler(req: Request, res: Response): Promise<void> {
-    const learningObjectIdentifier = req.body.learningObjectIdentifier;
-    const author = req.body.author;
-    const content = req.body.content;
-    requireFields({ learningObjectIdentifier, author, content });
-
-    const questionDTO = req.body as QuestionDTO;
-
-    const question = await createQuestion(questionDTO);
+    const question = await createQuestion(loId, questionData);
 
     res.json({ question });
 
@@ -95,3 +90,23 @@ export async function deleteQuestionHandler(req: Request, res: Response): Promis
 
     res.json({ question });
 }
+
+export async function updateQuestionHandler(req: Request, res: Response): Promise<void> {
+    const hruid = req.params.hruid;
+    const version = req.params.version;
+    const language = req.query.lang as string;
+    const seq = req.params.seq;
+    requireFields({ hruid })
+
+    const learningObjectId = getLearningObjectId(hruid, version, language);
+    const questionId = getQuestionId(learningObjectId, seq);
+
+    const content = req.body.content as string;
+    requireFields({ content });
+
+    const questionData = req.body as QuestionData;
+
+    const question = await updateQuestion(questionId, questionData);
+
+    res.json({ question });
+}
diff --git a/backend/src/data/questions/answer-repository.ts b/backend/src/data/questions/answer-repository.ts
index a50bfd28..94798248 100644
--- a/backend/src/data/questions/answer-repository.ts
+++ b/backend/src/data/questions/answer-repository.ts
@@ -19,10 +19,20 @@ export class AnswerRepository extends DwengoEntityRepository<Answer> {
             orderBy: { sequenceNumber: 'ASC' },
         });
     }
+    public async findAnswer(question: Question, sequenceNumber: number) {
+        return this.findOne({
+            toQuestion: question, sequenceNumber
+        });
+    }
     public async removeAnswerByQuestionAndSequenceNumber(question: Question, sequenceNumber: number): Promise<void> {
         return this.deleteWhere({
             toQuestion: question,
             sequenceNumber: sequenceNumber,
         });
     }
+    public async updateContent(answer: Answer, newContent: string){
+        answer.content = newContent;
+        await this.save(answer);
+        return answer;
+    }
 }
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 90c144d8..31a856a6 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -70,4 +70,10 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
             sequenceNumber
         });
     }
+
+    public async updateContent(question: Question, newContent: string): Promise<Question> {
+        question.content = newContent;
+        await this.save(question);
+        return question;
+    }
 }
diff --git a/backend/src/interfaces/answer.ts b/backend/src/interfaces/answer.ts
index 1f0d0625..87464a0b 100644
--- a/backend/src/interfaces/answer.ts
+++ b/backend/src/interfaces/answer.ts
@@ -1,14 +1,14 @@
-import { mapToUserDTO } from './user.js';
-import { mapToQuestionDTO, mapToQuestionDTOId } from './question.js';
+import {mapToQuestionDTO, mapToQuestionDTOId} from './question.js';
 import { Answer } from '../entities/questions/answer.entity.js';
 import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
+import {mapToTeacherDTO} from "./teacher";
 
 /**
  * Convert a Question entity to a DTO format.
  */
 export function mapToAnswerDTO(answer: Answer): AnswerDTO {
     return {
-        author: mapToUserDTO(answer.author),
+        author: mapToTeacherDTO(answer.author),
         toQuestion: mapToQuestionDTO(answer.toQuestion),
         sequenceNumber: answer.sequenceNumber!,
         timestamp: answer.timestamp.toISOString(),
diff --git a/backend/src/interfaces/question.ts b/backend/src/interfaces/question.ts
index 9005654f..46f61825 100644
--- a/backend/src/interfaces/question.ts
+++ b/backend/src/interfaces/question.ts
@@ -1,6 +1,6 @@
 import { Question } from '../entities/questions/question.entity.js';
-import { mapToStudentDTO } from './student.js';
-import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
+import { mapToStudentDTO} from './student.js';
+import { QuestionDTO, QuestionId} from '@dwengo-1/common/interfaces/question';
 import { LearningObjectIdentifierDTO } from '@dwengo-1/common/interfaces/learning-content';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 
diff --git a/backend/src/routes/answers.ts b/backend/src/routes/answers.ts
new file mode 100644
index 00000000..edb27813
--- /dev/null
+++ b/backend/src/routes/answers.ts
@@ -0,0 +1,22 @@
+import express from "express";
+import {
+    createAnswerHandler,
+    deleteAnswerHandler,
+    getAnswerHandler,
+    getAnswersHandler,
+    updateAnswerHandler
+} from "../controllers/answers";
+
+const router = express.Router({ mergeParams: true });
+
+router.get('/', getAnswersHandler);
+
+router.post('/', createAnswerHandler)
+
+router.get('/:seqAnswer', getAnswerHandler)
+
+router.delete('/:seqAnswer', deleteAnswerHandler);
+
+router.put('/:seqAnswer', updateAnswerHandler);
+
+export default router;
diff --git a/backend/src/routes/questions.ts b/backend/src/routes/questions.ts
index 31a71f3b..ba39435c 100644
--- a/backend/src/routes/questions.ts
+++ b/backend/src/routes/questions.ts
@@ -3,9 +3,10 @@ import {
     createQuestionHandler,
     deleteQuestionHandler,
     getAllQuestionsHandler,
-    getQuestionAnswersHandler,
     getQuestionHandler,
 } from '../controllers/questions.js';
+import answerRoutes from './answers.js';
+
 const router = express.Router({ mergeParams: true });
 
 // Query language
@@ -20,6 +21,6 @@ router.delete('/:seq', deleteQuestionHandler);
 // Information about a question with id
 router.get('/:seq', getQuestionHandler);
 
-router.get('/answers/:seq', getQuestionAnswersHandler);
+router.use('/:seq/answer', answerRoutes);
 
 export default router;
diff --git a/backend/src/services/answers.ts b/backend/src/services/answers.ts
new file mode 100644
index 00000000..27b9cb13
--- /dev/null
+++ b/backend/src/services/answers.ts
@@ -0,0 +1,68 @@
+import {getAnswerRepository} from "../data/repositories";
+import {Answer} from "../entities/questions/answer.entity";
+import {mapToAnswerDTO, mapToAnswerDTOId} from "../interfaces/answer";
+import {fetchTeacher} from "./teachers";
+import {fetchQuestion} from "./questions";
+import {QuestionId} from "@dwengo-1/common/interfaces/question";
+import {AnswerData, AnswerDTO, AnswerId} from "@dwengo-1/common/interfaces/answer";
+import {NotFoundException} from "../exceptions/not-found-exception";
+
+export async function getAnswersByQuestion(questionId: QuestionId, full: boolean): Promise<AnswerDTO[] | AnswerId[]> {
+    const answerRepository = getAnswerRepository();
+    const question = await fetchQuestion(questionId);
+
+    const answers: Answer[] = await answerRepository.findAllAnswersToQuestion(question);
+
+    if (full) {
+        return answers.map(mapToAnswerDTO);
+    }
+
+    return answers.map(mapToAnswerDTOId);
+}
+
+export async function createAnswer(questionId: QuestionId, answerData: AnswerData): Promise<AnswerDTO> {
+    const answerRepository = getAnswerRepository();
+    const toQuestion = await fetchQuestion(questionId);
+    const author = await fetchTeacher(answerData.author);
+    const content = answerData.content;
+
+    const answer = await answerRepository.createAnswer({
+        toQuestion, author, content
+    });
+    return mapToAnswerDTO(answer);
+}
+
+async function fetchAnswer(questionId: QuestionId, sequenceNumber: number): Promise<Answer> {
+    const answerRepository = getAnswerRepository();
+    const question = await fetchQuestion(questionId);
+    const answer = await answerRepository.findAnswer(question, sequenceNumber);
+
+    if (!answer){
+        throw new NotFoundException('Answer with questionID and sequence number not found');
+    }
+
+    return answer;
+}
+
+export async function getAnswer(questionId: QuestionId, sequenceNumber: number): Promise<AnswerDTO> {
+    const answer = await fetchAnswer(questionId, sequenceNumber);
+    return mapToAnswerDTO(answer);
+}
+
+export async function deleteAnswer(questionId: QuestionId, sequenceNumber: number): Promise<AnswerDTO> {
+    const answerRepository = getAnswerRepository();
+
+    const question = await fetchQuestion(questionId);
+    const answer = await fetchAnswer(questionId, sequenceNumber);
+
+    await answerRepository.removeAnswerByQuestionAndSequenceNumber(question, sequenceNumber);
+    return mapToAnswerDTO(answer);
+}
+
+export async function updateAnswer(questionId: QuestionId, sequenceNumber: number, answerData: AnswerData){
+    const answerRepository = getAnswerRepository();
+    const answer = await fetchAnswer(questionId, sequenceNumber);
+
+    const newAnswer = await answerRepository.updateContent(answer, answerData.content);
+    return mapToAnswerDTO(newAnswer);
+}
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index be361085..2e26c960 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -1,13 +1,11 @@
-import { getAnswerRepository, getQuestionRepository } from '../data/repositories.js';
+import { getQuestionRepository } from '../data/repositories.js';
 import {mapToLearningObjectID, mapToQuestionDTO, mapToQuestionDTOId} from '../interfaces/question.js';
 import { Question } from '../entities/questions/question.entity.js';
-import { Answer } from '../entities/questions/answer.entity.js';
-import { mapToAnswerDTO, mapToAnswerDTOId } from '../interfaces/answer.js';
 import { QuestionRepository } from '../data/questions/question-repository.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
-import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
-import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
+import {QuestionData, QuestionDTO, QuestionId} from '@dwengo-1/common/interfaces/question';
 import {NotFoundException} from "../exceptions/not-found-exception";
+import {FALLBACK_VERSION_NUM} from "../config";
 import {fetchStudent} from "./students";
 
 export async function getAllQuestions(id: LearningObjectIdentifier, full: boolean): Promise<QuestionDTO[] | QuestionId[]> {
@@ -21,7 +19,7 @@ export async function getAllQuestions(id: LearningObjectIdentifier, full: boolea
     return questions.map(mapToQuestionDTOId);
 }
 
-async function fetchQuestion(questionId: QuestionId): Promise<Question> {
+export async function fetchQuestion(questionId: QuestionId): Promise<Question> {
     const questionRepository = getQuestionRepository();
     const question = await questionRepository.findByLearningObjectAndSequenceNumber(
         mapToLearningObjectID(questionId.learningObjectIdentifier),
@@ -40,42 +38,37 @@ export async function getQuestion(questionId: QuestionId): Promise<QuestionDTO>
     return mapToQuestionDTO(question);
 }
 
-export async function getAnswersByQuestion(questionId: QuestionId, full: boolean): Promise<AnswerDTO[] | AnswerId[]> {
-    const answerRepository = getAnswerRepository();
-    const question = await fetchQuestion(questionId);
-
-    const answers: Answer[] = await answerRepository.findAllAnswersToQuestion(question);
-
-    if (full) {
-        return answers.map(mapToAnswerDTO);
-    }
-
-    return answers.map(mapToAnswerDTOId);
-}
-
-export async function createQuestion(questionDTO: QuestionDTO): Promise<QuestionDTO | null> {
+export async function createQuestion(loId: LearningObjectIdentifier, questionData: QuestionData): Promise<QuestionDTO> {
     const questionRepository = getQuestionRepository();
-    const author = await fetchStudent(questionDTO.author);
+    const author = await fetchStudent(questionData.author!);
+    const content = questionData.content;
 
-    await questionRepository.createQuestion({
-        loId: mapToLearningObjectID(questionDTO.learningObjectIdentifier),
-        author,
-        content: questionDTO.content,
+    const question = await questionRepository.createQuestion({
+        loId, author, content
     });
 
-    return questionDTO;
+    return mapToQuestionDTO(question);
 }
 
-export async function deleteQuestion(questionId: QuestionId): Promise<QuestionDTO | null> {
+export async function deleteQuestion(questionId: QuestionId): Promise<QuestionDTO> {
     const questionRepository = getQuestionRepository();
-
-    const question = await fetchQuestion(questionId);
+    const question = await fetchQuestion(questionId); // throws error if not found
 
     const loId: LearningObjectIdentifier = {
         ...questionId.learningObjectIdentifier,
-        version: questionId.learningObjectIdentifier.version ?? 1,
+        version: questionId.learningObjectIdentifier.version ?? FALLBACK_VERSION_NUM,
     };
 
     await questionRepository.removeQuestionByLearningObjectAndSequenceNumber(loId, questionId.sequenceNumber);
     return mapToQuestionDTO(question);
 }
+
+export async function updateQuestion(questionId: QuestionId, questionData: QuestionData): Promise<QuestionDTO> {
+    const questionRepository = getQuestionRepository();
+    const question = await fetchQuestion(questionId);
+
+    const newQuestion = await questionRepository.updateContent(question, questionData.content);
+    return mapToQuestionDTO(newQuestion);
+}
+
+
diff --git a/common/src/interfaces/answer.ts b/common/src/interfaces/answer.ts
index e9280f8a..efba9437 100644
--- a/common/src/interfaces/answer.ts
+++ b/common/src/interfaces/answer.ts
@@ -1,14 +1,19 @@
-import { UserDTO } from './user';
 import { QuestionDTO, QuestionId } from './question';
+import {TeacherDTO} from "./teacher";
 
 export interface AnswerDTO {
-    author: UserDTO;
+    author: TeacherDTO;
     toQuestion: QuestionDTO;
     sequenceNumber: number;
     timestamp: string;
     content: string;
 }
 
+export interface AnswerData {
+    author: string;
+    content: string;
+}
+
 export interface AnswerId {
     author: string;
     toQuestion: QuestionId;
diff --git a/common/src/interfaces/question.ts b/common/src/interfaces/question.ts
index 88e9c7b8..9866fbef 100644
--- a/common/src/interfaces/question.ts
+++ b/common/src/interfaces/question.ts
@@ -4,8 +4,13 @@ import { StudentDTO } from './student';
 export interface QuestionDTO {
     learningObjectIdentifier: LearningObjectIdentifierDTO;
     sequenceNumber?: number;
-    author: string;
-    timestamp?: string;
+    author: StudentDTO;
+    timestamp: string;
+    content: string;
+}
+
+export interface QuestionData {
+    author?: string;
     content: string;
 }
 

From 7ddde18d6c2b3cd8f84c7f43029b8d5dd76b64e6 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Sun, 6 Apr 2025 21:41:37 +0000
Subject: [PATCH 077/177] style: fix linting issues met ESLint

---
 backend/src/services/questions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index 2e26c960..21794ff5 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -52,7 +52,7 @@ export async function createQuestion(loId: LearningObjectIdentifier, questionDat
 
 export async function deleteQuestion(questionId: QuestionId): Promise<QuestionDTO> {
     const questionRepository = getQuestionRepository();
-    const question = await fetchQuestion(questionId); // throws error if not found
+    const question = await fetchQuestion(questionId); // Throws error if not found
 
     const loId: LearningObjectIdentifier = {
         ...questionId.learningObjectIdentifier,

From 9136ff031301b02bfd7ec4cfec31ed9f24001ef5 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Sun, 6 Apr 2025 21:41:42 +0000
Subject: [PATCH 078/177] style: fix linting issues met Prettier

---
 backend/src/controllers/answers.ts            | 26 +++++++++----------
 backend/src/controllers/questions.ts          | 25 +++++++-----------
 .../src/data/questions/answer-repository.ts   |  5 ++--
 .../src/data/questions/question-repository.ts |  4 +--
 backend/src/interfaces/answer.ts              |  4 +--
 backend/src/interfaces/question.ts            |  9 +++----
 backend/src/routes/answers.ts                 | 14 +++-------
 backend/src/routes/questions.ts               |  7 +----
 backend/src/services/answers.ts               | 24 +++++++++--------
 backend/src/services/questions.ts             | 18 ++++++-------
 common/src/interfaces/answer.ts               |  2 +-
 11 files changed, 60 insertions(+), 78 deletions(-)

diff --git a/backend/src/controllers/answers.ts b/backend/src/controllers/answers.ts
index 1bb53019..4167e746 100644
--- a/backend/src/controllers/answers.ts
+++ b/backend/src/controllers/answers.ts
@@ -1,9 +1,9 @@
-import {Request, Response} from "express";
-import {requireFields} from "./error-helper";
-import {getLearningObjectId, getQuestionId} from "./questions";
-import {createAnswer, deleteAnswer, getAnswer, getAnswersByQuestion, updateAnswer} from "../services/answers";
-import {FALLBACK_SEQ_NUM} from "../config";
-import {AnswerData} from "@dwengo-1/common/interfaces/answer";
+import { Request, Response } from 'express';
+import { requireFields } from './error-helper';
+import { getLearningObjectId, getQuestionId } from './questions';
+import { createAnswer, deleteAnswer, getAnswer, getAnswersByQuestion, updateAnswer } from '../services/answers';
+import { FALLBACK_SEQ_NUM } from '../config';
+import { AnswerData } from '@dwengo-1/common/interfaces/answer';
 
 export async function getAnswersHandler(req: Request, res: Response): Promise<void> {
     const hruid = req.params.hruid;
@@ -11,7 +11,7 @@ export async function getAnswersHandler(req: Request, res: Response): Promise<vo
     const language = req.query.lang as string;
     const seq = req.params.seq;
     const full = req.query.full === 'true';
-    requireFields({ hruid })
+    requireFields({ hruid });
 
     const learningObjectId = getLearningObjectId(hruid, version, language);
     const questionId = getQuestionId(learningObjectId, seq);
@@ -21,13 +21,13 @@ export async function getAnswersHandler(req: Request, res: Response): Promise<vo
     res.json({ answers });
 }
 
-export async function getAnswerHandler(req: Request, res: Response): Promise<void>{
+export async function getAnswerHandler(req: Request, res: Response): Promise<void> {
     const hruid = req.params.hruid;
     const version = req.params.version;
     const language = req.query.lang as string;
     const seq = req.params.seq;
     const seqAnswer = req.params.seqAnswer;
-    requireFields({ hruid })
+    requireFields({ hruid });
 
     const learningObjectId = getLearningObjectId(hruid, version, language);
     const questionId = getQuestionId(learningObjectId, seq);
@@ -43,7 +43,7 @@ export async function createAnswerHandler(req: Request, res: Response): Promise<
     const version = req.params.version;
     const language = req.query.lang as string;
     const seq = req.params.seq;
-    requireFields({ hruid })
+    requireFields({ hruid });
 
     const learningObjectId = getLearningObjectId(hruid, version, language);
     const questionId = getQuestionId(learningObjectId, seq);
@@ -65,7 +65,7 @@ export async function deleteAnswerHandler(req: Request, res: Response): Promise<
     const language = req.query.lang as string;
     const seq = req.params.seq;
     const seqAnswer = req.params.seqAnswer;
-    requireFields({ hruid })
+    requireFields({ hruid });
 
     const learningObjectId = getLearningObjectId(hruid, version, language);
     const questionId = getQuestionId(learningObjectId, seq);
@@ -76,15 +76,13 @@ export async function deleteAnswerHandler(req: Request, res: Response): Promise<
     res.json({ answer });
 }
 
-
-
 export async function updateAnswerHandler(req: Request, res: Response): Promise<void> {
     const hruid = req.params.hruid;
     const version = req.params.version;
     const language = req.query.lang as string;
     const seq = req.params.seq;
     const seqAnswer = req.params.seqAnswer;
-    requireFields({ hruid })
+    requireFields({ hruid });
 
     const learningObjectId = getLearningObjectId(hruid, version, language);
     const questionId = getQuestionId(learningObjectId, seq);
diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts
index e239d9ca..1158e041 100644
--- a/backend/src/controllers/questions.ts
+++ b/backend/src/controllers/questions.ts
@@ -1,15 +1,10 @@
 import { Request, Response } from 'express';
-import {
-    createQuestion,
-    deleteQuestion,
-    getAllQuestions,
-    getQuestion, updateQuestion
-} from '../services/questions.js';
-import {FALLBACK_LANG, FALLBACK_SEQ_NUM, FALLBACK_VERSION_NUM} from '../config.js';
+import { createQuestion, deleteQuestion, getAllQuestions, getQuestion, updateQuestion } from '../services/questions.js';
+import { FALLBACK_LANG, FALLBACK_SEQ_NUM, FALLBACK_VERSION_NUM } from '../config.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
-import {QuestionData, QuestionId} from '@dwengo-1/common/interfaces/question';
+import { QuestionData, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { Language } from '@dwengo-1/common/util/language';
-import {requireFields} from "./error-helper";
+import { requireFields } from './error-helper';
 
 export function getLearningObjectId(hruid: string, version: string, lang: string): LearningObjectIdentifier {
     return {
@@ -31,7 +26,7 @@ export async function getAllQuestionsHandler(req: Request, res: Response): Promi
     const version = req.params.version;
     const language = req.query.lang as string;
     const full = req.query.full === 'true';
-    requireFields({ hruid })
+    requireFields({ hruid });
 
     const learningObjectId = getLearningObjectId(hruid, version, language);
 
@@ -45,7 +40,7 @@ export async function getQuestionHandler(req: Request, res: Response): Promise<v
     const version = req.params.version;
     const language = req.query.lang as string;
     const seq = req.params.seq;
-    requireFields({ hruid })
+    requireFields({ hruid });
 
     const learningObjectId = getLearningObjectId(hruid, version, language);
     const questionId = getQuestionId(learningObjectId, seq);
@@ -53,14 +48,13 @@ export async function getQuestionHandler(req: Request, res: Response): Promise<v
     const question = await getQuestion(questionId);
 
     res.json({ question });
-
 }
 
 export async function createQuestionHandler(req: Request, res: Response): Promise<void> {
     const hruid = req.params.hruid;
     const version = req.params.version;
     const language = req.query.lang as string;
-    requireFields({ hruid })
+    requireFields({ hruid });
 
     const loId = getLearningObjectId(hruid, version, language);
 
@@ -73,7 +67,6 @@ export async function createQuestionHandler(req: Request, res: Response): Promis
     const question = await createQuestion(loId, questionData);
 
     res.json({ question });
-
 }
 
 export async function deleteQuestionHandler(req: Request, res: Response): Promise<void> {
@@ -81,7 +74,7 @@ export async function deleteQuestionHandler(req: Request, res: Response): Promis
     const version = req.params.version;
     const language = req.query.lang as string;
     const seq = req.params.seq;
-    requireFields({ hruid })
+    requireFields({ hruid });
 
     const learningObjectId = getLearningObjectId(hruid, version, language);
     const questionId = getQuestionId(learningObjectId, seq);
@@ -96,7 +89,7 @@ export async function updateQuestionHandler(req: Request, res: Response): Promis
     const version = req.params.version;
     const language = req.query.lang as string;
     const seq = req.params.seq;
-    requireFields({ hruid })
+    requireFields({ hruid });
 
     const learningObjectId = getLearningObjectId(hruid, version, language);
     const questionId = getQuestionId(learningObjectId, seq);
diff --git a/backend/src/data/questions/answer-repository.ts b/backend/src/data/questions/answer-repository.ts
index 94798248..93af06dd 100644
--- a/backend/src/data/questions/answer-repository.ts
+++ b/backend/src/data/questions/answer-repository.ts
@@ -21,7 +21,8 @@ export class AnswerRepository extends DwengoEntityRepository<Answer> {
     }
     public async findAnswer(question: Question, sequenceNumber: number) {
         return this.findOne({
-            toQuestion: question, sequenceNumber
+            toQuestion: question,
+            sequenceNumber,
         });
     }
     public async removeAnswerByQuestionAndSequenceNumber(question: Question, sequenceNumber: number): Promise<void> {
@@ -30,7 +31,7 @@ export class AnswerRepository extends DwengoEntityRepository<Answer> {
             sequenceNumber: sequenceNumber,
         });
     }
-    public async updateContent(answer: Answer, newContent: string){
+    public async updateContent(answer: Answer, newContent: string) {
         answer.content = newContent;
         await this.save(answer);
         return answer;
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 31a856a6..b4e13ae9 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -62,12 +62,12 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
         });
     }
 
-    public async findByLearningObjectAndSequenceNumber(loId: LearningObjectIdentifier, sequenceNumber: number){
+    public async findByLearningObjectAndSequenceNumber(loId: LearningObjectIdentifier, sequenceNumber: number) {
         return this.findOne({
             learningObjectHruid: loId.hruid,
             learningObjectLanguage: loId.language,
             learningObjectVersion: loId.version,
-            sequenceNumber
+            sequenceNumber,
         });
     }
 
diff --git a/backend/src/interfaces/answer.ts b/backend/src/interfaces/answer.ts
index 87464a0b..b78c579f 100644
--- a/backend/src/interfaces/answer.ts
+++ b/backend/src/interfaces/answer.ts
@@ -1,7 +1,7 @@
-import {mapToQuestionDTO, mapToQuestionDTOId} from './question.js';
+import { mapToQuestionDTO, mapToQuestionDTOId } from './question.js';
 import { Answer } from '../entities/questions/answer.entity.js';
 import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
-import {mapToTeacherDTO} from "./teacher";
+import { mapToTeacherDTO } from './teacher';
 
 /**
  * Convert a Question entity to a DTO format.
diff --git a/backend/src/interfaces/question.ts b/backend/src/interfaces/question.ts
index 46f61825..40642ae7 100644
--- a/backend/src/interfaces/question.ts
+++ b/backend/src/interfaces/question.ts
@@ -1,10 +1,9 @@
 import { Question } from '../entities/questions/question.entity.js';
-import { mapToStudentDTO} from './student.js';
-import { QuestionDTO, QuestionId} from '@dwengo-1/common/interfaces/question';
+import { mapToStudentDTO } from './student.js';
+import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { LearningObjectIdentifierDTO } from '@dwengo-1/common/interfaces/learning-content';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 
-
 function getLearningObjectIdentifier(question: Question): LearningObjectIdentifierDTO {
     return {
         hruid: question.learningObjectHruid,
@@ -17,8 +16,8 @@ export function mapToLearningObjectID(loID: LearningObjectIdentifierDTO): Learni
     return {
         hruid: loID.hruid,
         language: loID.language,
-        version: loID.version ?? 1
-    }
+        version: loID.version ?? 1,
+    };
 }
 
 /**
diff --git a/backend/src/routes/answers.ts b/backend/src/routes/answers.ts
index edb27813..78b87061 100644
--- a/backend/src/routes/answers.ts
+++ b/backend/src/routes/answers.ts
@@ -1,19 +1,13 @@
-import express from "express";
-import {
-    createAnswerHandler,
-    deleteAnswerHandler,
-    getAnswerHandler,
-    getAnswersHandler,
-    updateAnswerHandler
-} from "../controllers/answers";
+import express from 'express';
+import { createAnswerHandler, deleteAnswerHandler, getAnswerHandler, getAnswersHandler, updateAnswerHandler } from '../controllers/answers';
 
 const router = express.Router({ mergeParams: true });
 
 router.get('/', getAnswersHandler);
 
-router.post('/', createAnswerHandler)
+router.post('/', createAnswerHandler);
 
-router.get('/:seqAnswer', getAnswerHandler)
+router.get('/:seqAnswer', getAnswerHandler);
 
 router.delete('/:seqAnswer', deleteAnswerHandler);
 
diff --git a/backend/src/routes/questions.ts b/backend/src/routes/questions.ts
index ba39435c..e3651ba3 100644
--- a/backend/src/routes/questions.ts
+++ b/backend/src/routes/questions.ts
@@ -1,10 +1,5 @@
 import express from 'express';
-import {
-    createQuestionHandler,
-    deleteQuestionHandler,
-    getAllQuestionsHandler,
-    getQuestionHandler,
-} from '../controllers/questions.js';
+import { createQuestionHandler, deleteQuestionHandler, getAllQuestionsHandler, getQuestionHandler } from '../controllers/questions.js';
 import answerRoutes from './answers.js';
 
 const router = express.Router({ mergeParams: true });
diff --git a/backend/src/services/answers.ts b/backend/src/services/answers.ts
index 27b9cb13..8f3d6c9f 100644
--- a/backend/src/services/answers.ts
+++ b/backend/src/services/answers.ts
@@ -1,11 +1,11 @@
-import {getAnswerRepository} from "../data/repositories";
-import {Answer} from "../entities/questions/answer.entity";
-import {mapToAnswerDTO, mapToAnswerDTOId} from "../interfaces/answer";
-import {fetchTeacher} from "./teachers";
-import {fetchQuestion} from "./questions";
-import {QuestionId} from "@dwengo-1/common/interfaces/question";
-import {AnswerData, AnswerDTO, AnswerId} from "@dwengo-1/common/interfaces/answer";
-import {NotFoundException} from "../exceptions/not-found-exception";
+import { getAnswerRepository } from '../data/repositories';
+import { Answer } from '../entities/questions/answer.entity';
+import { mapToAnswerDTO, mapToAnswerDTOId } from '../interfaces/answer';
+import { fetchTeacher } from './teachers';
+import { fetchQuestion } from './questions';
+import { QuestionId } from '@dwengo-1/common/interfaces/question';
+import { AnswerData, AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
+import { NotFoundException } from '../exceptions/not-found-exception';
 
 export async function getAnswersByQuestion(questionId: QuestionId, full: boolean): Promise<AnswerDTO[] | AnswerId[]> {
     const answerRepository = getAnswerRepository();
@@ -27,7 +27,9 @@ export async function createAnswer(questionId: QuestionId, answerData: AnswerDat
     const content = answerData.content;
 
     const answer = await answerRepository.createAnswer({
-        toQuestion, author, content
+        toQuestion,
+        author,
+        content,
     });
     return mapToAnswerDTO(answer);
 }
@@ -37,7 +39,7 @@ async function fetchAnswer(questionId: QuestionId, sequenceNumber: number): Prom
     const question = await fetchQuestion(questionId);
     const answer = await answerRepository.findAnswer(question, sequenceNumber);
 
-    if (!answer){
+    if (!answer) {
         throw new NotFoundException('Answer with questionID and sequence number not found');
     }
 
@@ -59,7 +61,7 @@ export async function deleteAnswer(questionId: QuestionId, sequenceNumber: numbe
     return mapToAnswerDTO(answer);
 }
 
-export async function updateAnswer(questionId: QuestionId, sequenceNumber: number, answerData: AnswerData){
+export async function updateAnswer(questionId: QuestionId, sequenceNumber: number, answerData: AnswerData) {
     const answerRepository = getAnswerRepository();
     const answer = await fetchAnswer(questionId, sequenceNumber);
 
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index 21794ff5..5e5dd599 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -1,12 +1,12 @@
 import { getQuestionRepository } from '../data/repositories.js';
-import {mapToLearningObjectID, mapToQuestionDTO, mapToQuestionDTOId} from '../interfaces/question.js';
+import { mapToLearningObjectID, mapToQuestionDTO, mapToQuestionDTOId } from '../interfaces/question.js';
 import { Question } from '../entities/questions/question.entity.js';
 import { QuestionRepository } from '../data/questions/question-repository.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
-import {QuestionData, QuestionDTO, QuestionId} from '@dwengo-1/common/interfaces/question';
-import {NotFoundException} from "../exceptions/not-found-exception";
-import {FALLBACK_VERSION_NUM} from "../config";
-import {fetchStudent} from "./students";
+import { QuestionData, QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
+import { NotFoundException } from '../exceptions/not-found-exception';
+import { FALLBACK_VERSION_NUM } from '../config';
+import { fetchStudent } from './students';
 
 export async function getAllQuestions(id: LearningObjectIdentifier, full: boolean): Promise<QuestionDTO[] | QuestionId[]> {
     const questionRepository: QuestionRepository = getQuestionRepository();
@@ -26,7 +26,7 @@ export async function fetchQuestion(questionId: QuestionId): Promise<Question> {
         questionId.sequenceNumber
     );
 
-    if (!question){
+    if (!question) {
         throw new NotFoundException('Question with loID and sequence number not found');
     }
 
@@ -44,7 +44,9 @@ export async function createQuestion(loId: LearningObjectIdentifier, questionDat
     const content = questionData.content;
 
     const question = await questionRepository.createQuestion({
-        loId, author, content
+        loId,
+        author,
+        content,
     });
 
     return mapToQuestionDTO(question);
@@ -70,5 +72,3 @@ export async function updateQuestion(questionId: QuestionId, questionData: Quest
     const newQuestion = await questionRepository.updateContent(question, questionData.content);
     return mapToQuestionDTO(newQuestion);
 }
-
-
diff --git a/common/src/interfaces/answer.ts b/common/src/interfaces/answer.ts
index efba9437..8510ac7b 100644
--- a/common/src/interfaces/answer.ts
+++ b/common/src/interfaces/answer.ts
@@ -1,5 +1,5 @@
 import { QuestionDTO, QuestionId } from './question';
-import {TeacherDTO} from "./teacher";
+import { TeacherDTO } from './teacher';
 
 export interface AnswerDTO {
     author: TeacherDTO;

From b1df95da6367cf5a0f21c02a8b5019a88c6da2b7 Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Mon, 7 Apr 2025 00:44:20 +0200
Subject: [PATCH 079/177] fix(backend): Verdere door de aanpassingen
 veroorzaakte compilatiefouten opgelost

---
 backend/src/controllers/questions.ts           | 15 +++++++++------
 .../entities/assignments/submission.entity.ts  |  2 +-
 backend/src/interfaces/group.ts                | 18 ++++++++++++++++--
 backend/src/interfaces/question.ts             |  3 +++
 backend/src/interfaces/submission.ts           |  2 +-
 backend/src/routes/questions.ts                |  6 +++---
 backend/src/services/questions.ts              | 15 +++++++++++++--
 7 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts
index 54b50fa9..0cfddd9b 100644
--- a/backend/src/controllers/questions.ts
+++ b/backend/src/controllers/questions.ts
@@ -4,6 +4,7 @@ import { FALLBACK_LANG, FALLBACK_SEQ_NUM } from '../config.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { Language } from '@dwengo-1/common/util/language';
+import {getGroup} from "../services/groups";
 
 function getObjectId(req: Request, res: Response): LearningObjectIdentifier | null {
     const { hruid, version } = req.params;
@@ -21,16 +22,18 @@ function getObjectId(req: Request, res: Response): LearningObjectIdentifier | nu
     };
 }
 
-function getQuestionId(req: Request, res: Response): QuestionId | null {
-    const seq = req.params.seq;
+async function getQuestionId(req: Request, res: Response): Promise<QuestionId | null> {
+    const { seq, classId, assignmentId, groupId } = req.params
     const learningObjectIdentifier = getObjectId(req, res);
+    const groupIdentifier = await getGroup(classId, parseInt(assignmentId), parseInt(groupId), false);
 
-    if (!learningObjectIdentifier) {
+    if (!learningObjectIdentifier || !groupIdentifier) {
         return null;
     }
 
     return {
         learningObjectIdentifier,
+        inGroup: groupIdentifier,
         sequenceNumber: seq ? Number(seq) : FALLBACK_SEQ_NUM,
     };
 }
@@ -53,7 +56,7 @@ export async function getAllQuestionsHandler(req: Request, res: Response): Promi
 }
 
 export async function getQuestionHandler(req: Request, res: Response): Promise<void> {
-    const questionId = getQuestionId(req, res);
+    const questionId = await getQuestionId(req, res);
 
     if (!questionId) {
         return;
@@ -69,7 +72,7 @@ export async function getQuestionHandler(req: Request, res: Response): Promise<v
 }
 
 export async function getQuestionAnswersHandler(req: Request, res: Response): Promise<void> {
-    const questionId = getQuestionId(req, res);
+    const questionId = await getQuestionId(req, res);
     const full = req.query.full === 'true';
 
     if (!questionId) {
@@ -103,7 +106,7 @@ export async function createQuestionHandler(req: Request, res: Response): Promis
 }
 
 export async function deleteQuestionHandler(req: Request, res: Response): Promise<void> {
-    const questionId = getQuestionId(req, res);
+    const questionId = await getQuestionId(req, res);
 
     if (!questionId) {
         return;
diff --git a/backend/src/entities/assignments/submission.entity.ts b/backend/src/entities/assignments/submission.entity.ts
index 1f500890..7a0ffc1c 100644
--- a/backend/src/entities/assignments/submission.entity.ts
+++ b/backend/src/entities/assignments/submission.entity.ts
@@ -25,7 +25,7 @@ export class Submission {
         entity: () => Group,
         primary: true
     })
-    onBehalfOf: Group;
+    onBehalfOf!: Group;
 
     @ManyToOne({
         entity: () => Student,
diff --git a/backend/src/interfaces/group.ts b/backend/src/interfaces/group.ts
index 1a169b2b..da3ad845 100644
--- a/backend/src/interfaces/group.ts
+++ b/backend/src/interfaces/group.ts
@@ -1,7 +1,21 @@
 import { Group } from '../entities/assignments/group.entity.js';
-import { mapToAssignmentDTO } from './assignment.js';
-import { mapToStudentDTO } from './student.js';
+import {mapToAssignment, mapToAssignmentDTO} from './assignment.js';
+import {mapToStudent, mapToStudentDTO} from './student.js';
 import { GroupDTO } from '@dwengo-1/common/interfaces/group';
+import {getGroupRepository} from "../data/repositories";
+import {AssignmentDTO} from "@dwengo-1/common/interfaces/assignment";
+import {Class} from "../entities/classes/class.entity";
+import {StudentDTO} from "@dwengo-1/common/interfaces/student";
+
+export function mapToGroup(groupDto: GroupDTO, clazz: Class): Group {
+    const assignmentDto = groupDto.assignment as AssignmentDTO;
+
+    return getGroupRepository().create({
+        groupNumber: groupDto.groupNumber,
+        assignment: mapToAssignment(assignmentDto, clazz!),
+        members: groupDto.members.map(studentDto => mapToStudent(studentDto as StudentDTO))
+    });
+}
 
 export function mapToGroupDTO(group: Group): GroupDTO {
     return {
diff --git a/backend/src/interfaces/question.ts b/backend/src/interfaces/question.ts
index 48d64f11..1b2b6fc9 100644
--- a/backend/src/interfaces/question.ts
+++ b/backend/src/interfaces/question.ts
@@ -2,6 +2,7 @@ import { Question } from '../entities/questions/question.entity.js';
 import { mapToStudentDTO } from './student.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import {mapToGroupDTO} from "./group";
 
 function getLearningObjectIdentifier(question: Question): LearningObjectIdentifier {
     return {
@@ -21,6 +22,7 @@ export function mapToQuestionDTO(question: Question): QuestionDTO {
         learningObjectIdentifier,
         sequenceNumber: question.sequenceNumber!,
         author: mapToStudentDTO(question.author),
+        inGroup: mapToGroupDTO(question.inGroup),
         timestamp: question.timestamp.toISOString(),
         content: question.content,
     };
@@ -31,6 +33,7 @@ export function mapToQuestionDTOId(question: Question): QuestionId {
 
     return {
         learningObjectIdentifier,
+        inGroup: mapToGroupDTO(question.inGroup),
         sequenceNumber: question.sequenceNumber!,
     };
 }
diff --git a/backend/src/interfaces/submission.ts b/backend/src/interfaces/submission.ts
index b4ed4a2b..859370f6 100644
--- a/backend/src/interfaces/submission.ts
+++ b/backend/src/interfaces/submission.ts
@@ -14,7 +14,7 @@ export function mapToSubmissionDTO(submission: Submission): SubmissionDTO {
         submissionNumber: submission.submissionNumber,
         submitter: mapToStudentDTO(submission.submitter),
         time: submission.submissionTime,
-        group: submission.onBehalfOf ? mapToGroupDTO(submission.onBehalfOf) : undefined,
+        group: mapToGroupDTO(submission.onBehalfOf),
         content: submission.content,
     };
 }
diff --git a/backend/src/routes/questions.ts b/backend/src/routes/questions.ts
index 31a71f3b..59e3fe58 100644
--- a/backend/src/routes/questions.ts
+++ b/backend/src/routes/questions.ts
@@ -15,11 +15,11 @@ router.get('/', getAllQuestionsHandler);
 
 router.post('/', createQuestionHandler);
 
-router.delete('/:seq', deleteQuestionHandler);
+router.delete('/:classId/assignment/:assignmentId/group/:groupId/:seq', deleteQuestionHandler);
 
 // Information about a question with id
-router.get('/:seq', getQuestionHandler);
+router.get('/:classId/assignment/:assignmentId/group/:groupId/:seq', getQuestionHandler);
 
-router.get('/answers/:seq', getQuestionAnswersHandler);
+router.get('/:classId/assignment/:assignmentId/group/:groupId/answers/:seq', getQuestionAnswersHandler);
 
 export default router;
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index e1ee8831..0bf5c734 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -1,4 +1,9 @@
-import { getAnswerRepository, getQuestionRepository } from '../data/repositories.js';
+import {
+    getAnswerRepository,
+    getClassRepository,
+    getGroupRepository,
+    getQuestionRepository
+} from '../data/repositories.js';
 import { mapToQuestionDTO, mapToQuestionDTOId } from '../interfaces/question.js';
 import { Question } from '../entities/questions/question.entity.js';
 import { Answer } from '../entities/questions/answer.entity.js';
@@ -8,6 +13,8 @@ import { LearningObjectIdentifier } from '../entities/content/learning-object-id
 import { mapToStudent } from '../interfaces/student.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
+import {AssignmentDTO} from "@dwengo-1/common/interfaces/assignment";
+import {mapToAssignment} from "../interfaces/assignment";
 
 export async function getAllQuestions(id: LearningObjectIdentifier, full: boolean): Promise<QuestionDTO[] | QuestionId[]> {
     const questionRepository: QuestionRepository = getQuestionRepository();
@@ -76,11 +83,15 @@ export async function createQuestion(questionDTO: QuestionDTO): Promise<Question
         version: questionDTO.learningObjectIdentifier.version ?? 1,
     };
 
+    const clazz = await getClassRepository().findById((questionDTO.inGroup.assignment as AssignmentDTO).class)
+    const assignment = mapToAssignment(questionDTO.inGroup.assignment as AssignmentDTO, clazz!);
+    const inGroup = await getGroupRepository().findByAssignmentAndGroupNumber(assignment, questionDTO.inGroup.groupNumber);
+
     try {
         await questionRepository.createQuestion({
             loId,
             author,
-            inGroup: questionDTO.inGroup,
+            inGroup: inGroup!,
             content: questionDTO.content,
         });
     } catch (_) {

From da1d502ee628595c4fdd0cc836de884da8d9a0ab Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Mon, 7 Apr 2025 11:30:15 +0200
Subject: [PATCH 080/177] feat: question tests

---
 backend/src/services/questions.ts           |   9 +-
 backend/tests/controllers/questions.test.ts | 136 ++++++++++++++++++++
 2 files changed, 141 insertions(+), 4 deletions(-)
 create mode 100644 backend/tests/controllers/questions.test.ts

diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index 2e26c960..a3c64b9f 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -54,10 +54,11 @@ export async function deleteQuestion(questionId: QuestionId): Promise<QuestionDT
     const questionRepository = getQuestionRepository();
     const question = await fetchQuestion(questionId); // throws error if not found
 
-    const loId: LearningObjectIdentifier = {
-        ...questionId.learningObjectIdentifier,
-        version: questionId.learningObjectIdentifier.version ?? FALLBACK_VERSION_NUM,
-    };
+    const loId : LearningObjectIdentifier = {
+        hruid: questionId.learningObjectIdentifier.hruid,
+        language: questionId.learningObjectIdentifier.language,
+        version: questionId.learningObjectIdentifier.version || FALLBACK_VERSION_NUM
+    }
 
     await questionRepository.removeQuestionByLearningObjectAndSequenceNumber(loId, questionId.sequenceNumber);
     return mapToQuestionDTO(question);
diff --git a/backend/tests/controllers/questions.test.ts b/backend/tests/controllers/questions.test.ts
new file mode 100644
index 00000000..3d9c6537
--- /dev/null
+++ b/backend/tests/controllers/questions.test.ts
@@ -0,0 +1,136 @@
+import {beforeAll, beforeEach, describe, expect, it, Mock, vi} from "vitest";
+import {Request, Response} from "express";
+import {setupTestApp} from "../setup-tests";
+import {
+    getAllQuestionsHandler,
+    getQuestionHandler, updateQuestionHandler
+} from "../../src/controllers/questions";
+import {Language} from "@dwengo-1/common/util/language";
+import {NotFoundException} from "../../src/exceptions/not-found-exception";
+import {BadRequestException} from "../../src/exceptions/bad-request-exception";
+
+
+describe('Questions controllers', () => {
+    let req: Partial<Request>;
+    let res: Partial<Response>;
+
+    let jsonMock: Mock;
+
+    beforeAll(async () => {
+        await setupTestApp();
+    });
+
+    beforeEach(() => {
+        jsonMock = vi.fn();
+        res = {
+            json: jsonMock,
+        };
+    });
+
+    it('Get question list', async () => {
+        req = {
+            params: { hruid: 'id05', version: '1' },
+            query: { lang: Language.English, full: 'true' },
+        };
+
+        await getAllQuestionsHandler(req as Request, res as Response);
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ questions: expect.anything() }));
+
+        const result = jsonMock.mock.lastCall?.[0];
+        // console.log(result.questions);
+        expect(result.questions).to.have.length.greaterThan(1);
+    });
+
+    it('Get question', async () => {
+        req = {
+            params: { hruid: 'id05', version: '1', seq: '1'},
+            query: { lang: Language.English, full: 'true' },
+        };
+
+        await getQuestionHandler(req as Request, res as Response);
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ question: expect.anything() }));
+
+        // const result = jsonMock.mock.lastCall?.[0];
+        // console.log(result.question);
+    })
+
+    it('Get question with fallback sequence number and version', async () => {
+        req = {
+            params: { hruid: 'id05'},
+            query: { lang: Language.English, full: 'true' },
+        };
+
+        await getQuestionHandler(req as Request, res as Response);
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ question: expect.anything() }));
+
+        // const result = jsonMock.mock.lastCall?.[0];
+        // console.log(result.question);
+    })
+
+    it('Get question with fallback sequence number and version', async () => {
+        req = {
+            params: { hruid: 'id05'},
+            query: { lang: Language.English, full: 'true' },
+        };
+
+        await getQuestionHandler(req as Request, res as Response);
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ question: expect.anything() }));
+
+        // const result = jsonMock.mock.lastCall?.[0];
+        // console.log(result.question);
+    })
+
+    it('Get question hruid does not exist', async () => {
+        req = {
+            params: { hruid: 'id_not_exist'},
+            query: { lang: Language.English, full: 'true' },
+        };
+
+        await expect( async () => getQuestionHandler(req as Request, res as Response))
+            .rejects.toThrow(NotFoundException);
+    })
+
+    it('Get question no hruid given', async () => {
+        req = {
+            params: {},
+            query: { lang: Language.English, full: 'true' },
+        };
+
+        await expect( async () => getQuestionHandler(req as Request, res as Response))
+            .rejects.toThrow(BadRequestException);
+    })
+
+    /*
+    it('Create and delete question', async() => {
+        req = {
+            params: { hruid: 'id05', version: '1', seq: '2'},
+            query: { lang: Language.English },
+        };
+
+        await deleteQuestionHandler(req as Request, res as Response);
+
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ question: expect.anything() }));
+
+        const result = jsonMock.mock.lastCall?.[0];
+        console.log(result.question);
+    });
+
+     */
+
+    it('Update question', async() => {
+        const newContent = "updated question";
+        req = {
+            params: { hruid: 'id05', version: '1', seq: '1'},
+            query: { lang: Language.English },
+            body: { content: newContent }
+        };
+
+        await updateQuestionHandler(req as Request, res as Response);
+
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ question: expect.anything() }));
+
+        const result = jsonMock.mock.lastCall?.[0];
+        // console.log(result.question);
+        expect(result.question.content).to.eq(newContent);
+    });
+});

From 42526900d36607f58ed87d4b975abc2b151b23a5 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Mon, 7 Apr 2025 11:46:09 +0200
Subject: [PATCH 081/177] feat: answer tests

---
 backend/src/controllers/answers.ts          |  2 +-
 backend/src/routes/answers.ts               |  4 +-
 backend/tests/controllers/answers.test.ts   | 90 +++++++++++++++++++++
 backend/tests/controllers/questions.test.ts | 13 ---
 4 files changed, 93 insertions(+), 16 deletions(-)
 create mode 100644 backend/tests/controllers/answers.test.ts

diff --git a/backend/src/controllers/answers.ts b/backend/src/controllers/answers.ts
index 1bb53019..f605b1a3 100644
--- a/backend/src/controllers/answers.ts
+++ b/backend/src/controllers/answers.ts
@@ -5,7 +5,7 @@ import {createAnswer, deleteAnswer, getAnswer, getAnswersByQuestion, updateAnswe
 import {FALLBACK_SEQ_NUM} from "../config";
 import {AnswerData} from "@dwengo-1/common/interfaces/answer";
 
-export async function getAnswersHandler(req: Request, res: Response): Promise<void> {
+export async function getAllAnswersHandler(req: Request, res: Response): Promise<void> {
     const hruid = req.params.hruid;
     const version = req.params.version;
     const language = req.query.lang as string;
diff --git a/backend/src/routes/answers.ts b/backend/src/routes/answers.ts
index edb27813..a6280e49 100644
--- a/backend/src/routes/answers.ts
+++ b/backend/src/routes/answers.ts
@@ -3,13 +3,13 @@ import {
     createAnswerHandler,
     deleteAnswerHandler,
     getAnswerHandler,
-    getAnswersHandler,
+    getAllAnswersHandler,
     updateAnswerHandler
 } from "../controllers/answers";
 
 const router = express.Router({ mergeParams: true });
 
-router.get('/', getAnswersHandler);
+router.get('/', getAllAnswersHandler);
 
 router.post('/', createAnswerHandler)
 
diff --git a/backend/tests/controllers/answers.test.ts b/backend/tests/controllers/answers.test.ts
new file mode 100644
index 00000000..d357fd0c
--- /dev/null
+++ b/backend/tests/controllers/answers.test.ts
@@ -0,0 +1,90 @@
+import {Request, Response} from "express";
+import {beforeAll, beforeEach, describe, expect, it, Mock, vi} from "vitest";
+import {setupTestApp} from "../setup-tests";
+import {Language} from "@dwengo-1/common/util/language";
+import {getAllAnswersHandler, getAnswerHandler, updateAnswerHandler} from "../../src/controllers/answers";
+import {BadRequestException} from "../../src/exceptions/bad-request-exception";
+import {NotFoundException} from "../../src/exceptions/not-found-exception";
+
+describe('Questions controllers', () => {
+    let req: Partial<Request>;
+    let res: Partial<Response>;
+
+    let jsonMock: Mock;
+
+    beforeAll(async () => {
+        await setupTestApp();
+    });
+
+    beforeEach(() => {
+        jsonMock = vi.fn();
+        res = {
+            json: jsonMock,
+        };
+    });
+
+    it('Get answers list', async () => {
+        req = {
+            params: {hruid: 'id05', version: '1', seq: '2'},
+            query: {lang: Language.English, full: 'true'},
+        };
+
+        await getAllAnswersHandler(req as Request, res as Response);
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({answers: expect.anything()}));
+
+        const result = jsonMock.mock.lastCall?.[0];
+        // console.log(result.answers);
+        expect(result.questions).to.have.length.greaterThan(1);
+    });
+
+    it('Get answer', async () => {
+        req = {
+            params: {hruid: 'id05', version: '1', seq: '2', seqAnswer: '2'},
+            query: {lang: Language.English, full: 'true'},
+        };
+
+        await getAnswerHandler(req as Request, res as Response);
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({answer: expect.anything()}));
+
+        // const result = jsonMock.mock.lastCall?.[0];
+        // console.log(result.answer);
+    });
+
+    it('Get answer hruid does not exist', async () => {
+        req = {
+            params: { hruid: 'id_not_exist'},
+            query: { lang: Language.English, full: 'true' },
+        };
+
+        await expect( async () => getAnswerHandler(req as Request, res as Response))
+            .rejects.toThrow(NotFoundException);
+    })
+
+    it('Get answer no hruid given', async () => {
+        req = {
+            params: {},
+            query: { lang: Language.English, full: 'true' },
+        };
+
+        await expect( async () => getAnswerHandler(req as Request, res as Response))
+            .rejects.toThrow(BadRequestException);
+    })
+
+    it('Update question', async() => {
+        const newContent = "updated question";
+        req = {
+            params: { hruid: 'id05', version: '1', seq: '2', seqAnswer: '2'},
+            query: { lang: Language.English },
+            body: { content: newContent }
+        };
+
+        await updateAnswerHandler(req as Request, res as Response);
+
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ answer: expect.anything() }));
+
+        const result = jsonMock.mock.lastCall?.[0];
+        // console.log(result.question);
+        expect(result.answer.content).to.eq(newContent);
+    });
+
+});
diff --git a/backend/tests/controllers/questions.test.ts b/backend/tests/controllers/questions.test.ts
index 3d9c6537..26fd588a 100644
--- a/backend/tests/controllers/questions.test.ts
+++ b/backend/tests/controllers/questions.test.ts
@@ -67,19 +67,6 @@ describe('Questions controllers', () => {
         // console.log(result.question);
     })
 
-    it('Get question with fallback sequence number and version', async () => {
-        req = {
-            params: { hruid: 'id05'},
-            query: { lang: Language.English, full: 'true' },
-        };
-
-        await getQuestionHandler(req as Request, res as Response);
-        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ question: expect.anything() }));
-
-        // const result = jsonMock.mock.lastCall?.[0];
-        // console.log(result.question);
-    })
-
     it('Get question hruid does not exist', async () => {
         req = {
             params: { hruid: 'id_not_exist'},

From c07db3d999022212cc8f60cd7314993c36e2bb77 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Mon, 7 Apr 2025 11:53:47 +0200
Subject: [PATCH 082/177] fix: lint

---
 backend/src/data/questions/answer-repository.ts   |  5 +++--
 backend/src/data/questions/question-repository.ts |  3 ++-
 backend/src/services/answers.ts                   |  2 +-
 backend/src/services/questions.ts                 |  2 +-
 backend/tests/controllers/answers.test.ts         |  8 ++++----
 backend/tests/controllers/questions.test.ts       | 14 +++++++-------
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/backend/src/data/questions/answer-repository.ts b/backend/src/data/questions/answer-repository.ts
index 94798248..088ad623 100644
--- a/backend/src/data/questions/answer-repository.ts
+++ b/backend/src/data/questions/answer-repository.ts
@@ -2,6 +2,7 @@ import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
 import { Answer } from '../../entities/questions/answer.entity.js';
 import { Question } from '../../entities/questions/question.entity.js';
 import { Teacher } from '../../entities/users/teacher.entity.js';
+import {Loaded} from "@mikro-orm/core";
 
 export class AnswerRepository extends DwengoEntityRepository<Answer> {
     public async createAnswer(answer: { toQuestion: Question; author: Teacher; content: string }): Promise<Answer> {
@@ -19,7 +20,7 @@ export class AnswerRepository extends DwengoEntityRepository<Answer> {
             orderBy: { sequenceNumber: 'ASC' },
         });
     }
-    public async findAnswer(question: Question, sequenceNumber: number) {
+    public async findAnswer(question: Question, sequenceNumber: number): Promise<Loaded<Answer, never, "*", never> | null> {
         return this.findOne({
             toQuestion: question, sequenceNumber
         });
@@ -30,7 +31,7 @@ export class AnswerRepository extends DwengoEntityRepository<Answer> {
             sequenceNumber: sequenceNumber,
         });
     }
-    public async updateContent(answer: Answer, newContent: string){
+    public async updateContent(answer: Answer, newContent: string): Promise<Answer> {
         answer.content = newContent;
         await this.save(answer);
         return answer;
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 31a856a6..18bcd551 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -3,6 +3,7 @@ import { Question } from '../../entities/questions/question.entity.js';
 import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js';
 import { Student } from '../../entities/users/student.entity.js';
 import { LearningObject } from '../../entities/content/learning-object.entity.js';
+import {Loaded} from "@mikro-orm/core";
 
 export class QuestionRepository extends DwengoEntityRepository<Question> {
     public async createQuestion(question: { loId: LearningObjectIdentifier; author: Student; content: string }): Promise<Question> {
@@ -62,7 +63,7 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
         });
     }
 
-    public async findByLearningObjectAndSequenceNumber(loId: LearningObjectIdentifier, sequenceNumber: number){
+    public async findByLearningObjectAndSequenceNumber(loId: LearningObjectIdentifier, sequenceNumber: number): Promise<Loaded<Question, never, "*", never> | null> {
         return this.findOne({
             learningObjectHruid: loId.hruid,
             learningObjectLanguage: loId.language,
diff --git a/backend/src/services/answers.ts b/backend/src/services/answers.ts
index 27b9cb13..4844ff79 100644
--- a/backend/src/services/answers.ts
+++ b/backend/src/services/answers.ts
@@ -59,7 +59,7 @@ export async function deleteAnswer(questionId: QuestionId, sequenceNumber: numbe
     return mapToAnswerDTO(answer);
 }
 
-export async function updateAnswer(questionId: QuestionId, sequenceNumber: number, answerData: AnswerData){
+export async function updateAnswer(questionId: QuestionId, sequenceNumber: number, answerData: AnswerData): Promise<AnswerDTO> {
     const answerRepository = getAnswerRepository();
     const answer = await fetchAnswer(questionId, sequenceNumber);
 
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index a3c64b9f..71460691 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -52,7 +52,7 @@ export async function createQuestion(loId: LearningObjectIdentifier, questionDat
 
 export async function deleteQuestion(questionId: QuestionId): Promise<QuestionDTO> {
     const questionRepository = getQuestionRepository();
-    const question = await fetchQuestion(questionId); // throws error if not found
+    const question = await fetchQuestion(questionId); // Throws error if not found
 
     const loId : LearningObjectIdentifier = {
         hruid: questionId.learningObjectIdentifier.hruid,
diff --git a/backend/tests/controllers/answers.test.ts b/backend/tests/controllers/answers.test.ts
index d357fd0c..26d7568c 100644
--- a/backend/tests/controllers/answers.test.ts
+++ b/backend/tests/controllers/answers.test.ts
@@ -33,7 +33,7 @@ describe('Questions controllers', () => {
         expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({answers: expect.anything()}));
 
         const result = jsonMock.mock.lastCall?.[0];
-        // console.log(result.answers);
+        // Console.log(result.answers);
         expect(result.questions).to.have.length.greaterThan(1);
     });
 
@@ -46,8 +46,8 @@ describe('Questions controllers', () => {
         await getAnswerHandler(req as Request, res as Response);
         expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({answer: expect.anything()}));
 
-        // const result = jsonMock.mock.lastCall?.[0];
-        // console.log(result.answer);
+        // Const result = jsonMock.mock.lastCall?.[0];
+        // Console.log(result.answer);
     });
 
     it('Get answer hruid does not exist', async () => {
@@ -83,7 +83,7 @@ describe('Questions controllers', () => {
         expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ answer: expect.anything() }));
 
         const result = jsonMock.mock.lastCall?.[0];
-        // console.log(result.question);
+        // Console.log(result.question);
         expect(result.answer.content).to.eq(newContent);
     });
 
diff --git a/backend/tests/controllers/questions.test.ts b/backend/tests/controllers/questions.test.ts
index 26fd588a..593445c0 100644
--- a/backend/tests/controllers/questions.test.ts
+++ b/backend/tests/controllers/questions.test.ts
@@ -37,7 +37,7 @@ describe('Questions controllers', () => {
         expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ questions: expect.anything() }));
 
         const result = jsonMock.mock.lastCall?.[0];
-        // console.log(result.questions);
+        // Console.log(result.questions);
         expect(result.questions).to.have.length.greaterThan(1);
     });
 
@@ -50,8 +50,8 @@ describe('Questions controllers', () => {
         await getQuestionHandler(req as Request, res as Response);
         expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ question: expect.anything() }));
 
-        // const result = jsonMock.mock.lastCall?.[0];
-        // console.log(result.question);
+        // Const result = jsonMock.mock.lastCall?.[0];
+        // Console.log(result.question);
     })
 
     it('Get question with fallback sequence number and version', async () => {
@@ -63,8 +63,8 @@ describe('Questions controllers', () => {
         await getQuestionHandler(req as Request, res as Response);
         expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ question: expect.anything() }));
 
-        // const result = jsonMock.mock.lastCall?.[0];
-        // console.log(result.question);
+        // Const result = jsonMock.mock.lastCall?.[0];
+        // Console.log(result.question);
     })
 
     it('Get question hruid does not exist', async () => {
@@ -88,7 +88,7 @@ describe('Questions controllers', () => {
     })
 
     /*
-    it('Create and delete question', async() => {
+    It('Create and delete question', async() => {
         req = {
             params: { hruid: 'id05', version: '1', seq: '2'},
             query: { lang: Language.English },
@@ -117,7 +117,7 @@ describe('Questions controllers', () => {
         expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ question: expect.anything() }));
 
         const result = jsonMock.mock.lastCall?.[0];
-        // console.log(result.question);
+        // Console.log(result.question);
         expect(result.question.content).to.eq(newContent);
     });
 });

From 7b7934898596639190b617b3e1d6246377eef1e4 Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Mon, 7 Apr 2025 14:50:15 +0200
Subject: [PATCH 083/177] fix(backend): group toch niet deel van primaire
 sleutel van vragen en submissions gemaakt, maar verplicht veld

---
 backend/src/controllers/questions.ts              | 15 ++++++---------
 .../src/entities/assignments/submission.entity.ts |  3 +--
 backend/src/entities/questions/question.entity.ts |  2 +-
 backend/src/interfaces/question.ts                |  1 -
 backend/src/interfaces/submission.ts              |  1 -
 backend/src/routes/questions.ts                   |  6 +++---
 backend/tests/setup-tests.ts                      |  2 +-
 .../assignments/submission.testdata.ts            |  3 +++
 .../test_assets/questions/questions.testdata.ts   |  7 ++++++-
 common/src/interfaces/question.ts                 |  1 -
 10 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts
index 0cfddd9b..54b50fa9 100644
--- a/backend/src/controllers/questions.ts
+++ b/backend/src/controllers/questions.ts
@@ -4,7 +4,6 @@ import { FALLBACK_LANG, FALLBACK_SEQ_NUM } from '../config.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { Language } from '@dwengo-1/common/util/language';
-import {getGroup} from "../services/groups";
 
 function getObjectId(req: Request, res: Response): LearningObjectIdentifier | null {
     const { hruid, version } = req.params;
@@ -22,18 +21,16 @@ function getObjectId(req: Request, res: Response): LearningObjectIdentifier | nu
     };
 }
 
-async function getQuestionId(req: Request, res: Response): Promise<QuestionId | null> {
-    const { seq, classId, assignmentId, groupId } = req.params
+function getQuestionId(req: Request, res: Response): QuestionId | null {
+    const seq = req.params.seq;
     const learningObjectIdentifier = getObjectId(req, res);
-    const groupIdentifier = await getGroup(classId, parseInt(assignmentId), parseInt(groupId), false);
 
-    if (!learningObjectIdentifier || !groupIdentifier) {
+    if (!learningObjectIdentifier) {
         return null;
     }
 
     return {
         learningObjectIdentifier,
-        inGroup: groupIdentifier,
         sequenceNumber: seq ? Number(seq) : FALLBACK_SEQ_NUM,
     };
 }
@@ -56,7 +53,7 @@ export async function getAllQuestionsHandler(req: Request, res: Response): Promi
 }
 
 export async function getQuestionHandler(req: Request, res: Response): Promise<void> {
-    const questionId = await getQuestionId(req, res);
+    const questionId = getQuestionId(req, res);
 
     if (!questionId) {
         return;
@@ -72,7 +69,7 @@ export async function getQuestionHandler(req: Request, res: Response): Promise<v
 }
 
 export async function getQuestionAnswersHandler(req: Request, res: Response): Promise<void> {
-    const questionId = await getQuestionId(req, res);
+    const questionId = getQuestionId(req, res);
     const full = req.query.full === 'true';
 
     if (!questionId) {
@@ -106,7 +103,7 @@ export async function createQuestionHandler(req: Request, res: Response): Promis
 }
 
 export async function deleteQuestionHandler(req: Request, res: Response): Promise<void> {
-    const questionId = await getQuestionId(req, res);
+    const questionId = getQuestionId(req, res);
 
     if (!questionId) {
         return;
diff --git a/backend/src/entities/assignments/submission.entity.ts b/backend/src/entities/assignments/submission.entity.ts
index 7a0ffc1c..728dd436 100644
--- a/backend/src/entities/assignments/submission.entity.ts
+++ b/backend/src/entities/assignments/submission.entity.ts
@@ -22,8 +22,7 @@ export class Submission {
     submissionNumber?: number;
 
     @ManyToOne({
-        entity: () => Group,
-        primary: true
+        entity: () => Group
     })
     onBehalfOf!: Group;
 
diff --git a/backend/src/entities/questions/question.entity.ts b/backend/src/entities/questions/question.entity.ts
index bb36e8a3..c6df4e6a 100644
--- a/backend/src/entities/questions/question.entity.ts
+++ b/backend/src/entities/questions/question.entity.ts
@@ -21,7 +21,7 @@ export class Question {
     @PrimaryKey({ type: 'integer', autoincrement: true })
     sequenceNumber?: number;
 
-    @ManyToOne({ entity: () => Group, primary: true })
+    @ManyToOne({ entity: () => Group })
     inGroup!: Group;
 
     @ManyToOne({
diff --git a/backend/src/interfaces/question.ts b/backend/src/interfaces/question.ts
index 1b2b6fc9..91b90796 100644
--- a/backend/src/interfaces/question.ts
+++ b/backend/src/interfaces/question.ts
@@ -33,7 +33,6 @@ export function mapToQuestionDTOId(question: Question): QuestionId {
 
     return {
         learningObjectIdentifier,
-        inGroup: mapToGroupDTO(question.inGroup),
         sequenceNumber: question.sequenceNumber!,
     };
 }
diff --git a/backend/src/interfaces/submission.ts b/backend/src/interfaces/submission.ts
index 859370f6..bd80795a 100644
--- a/backend/src/interfaces/submission.ts
+++ b/backend/src/interfaces/submission.ts
@@ -38,7 +38,6 @@ export function mapToSubmission(submissionDTO: SubmissionDTO): Submission {
     submission.submitter = mapToStudent(submissionDTO.submitter);
     // Submission.submissionTime = submissionDTO.time;
     // Submission.onBehalfOf =  submissionDTO.group!;
-    // TODO fix group
     submission.content = submissionDTO.content;
 
     return submission;
diff --git a/backend/src/routes/questions.ts b/backend/src/routes/questions.ts
index 59e3fe58..31a71f3b 100644
--- a/backend/src/routes/questions.ts
+++ b/backend/src/routes/questions.ts
@@ -15,11 +15,11 @@ router.get('/', getAllQuestionsHandler);
 
 router.post('/', createQuestionHandler);
 
-router.delete('/:classId/assignment/:assignmentId/group/:groupId/:seq', deleteQuestionHandler);
+router.delete('/:seq', deleteQuestionHandler);
 
 // Information about a question with id
-router.get('/:classId/assignment/:assignmentId/group/:groupId/:seq', getQuestionHandler);
+router.get('/:seq', getQuestionHandler);
 
-router.get('/:classId/assignment/:assignmentId/group/:groupId/answers/:seq', getQuestionAnswersHandler);
+router.get('/answers/:seq', getQuestionAnswersHandler);
 
 export default router;
diff --git a/backend/tests/setup-tests.ts b/backend/tests/setup-tests.ts
index 016099f3..5bd2fbd6 100644
--- a/backend/tests/setup-tests.ts
+++ b/backend/tests/setup-tests.ts
@@ -37,7 +37,7 @@ export async function setupTestApp(): Promise<void> {
 
     learningObjects[1].attachments = attachments;
 
-    const questions = makeTestQuestions(em, students);
+    const questions = makeTestQuestions(em, students, groups);
     const answers = makeTestAnswers(em, teachers, questions);
     const submissions = makeTestSubmissions(em, students, groups);
 
diff --git a/backend/tests/test_assets/assignments/submission.testdata.ts b/backend/tests/test_assets/assignments/submission.testdata.ts
index f454b133..f6b49c6a 100644
--- a/backend/tests/test_assets/assignments/submission.testdata.ts
+++ b/backend/tests/test_assets/assignments/submission.testdata.ts
@@ -34,6 +34,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 1,
         submitter: students[0],
         submissionTime: new Date(2025, 2, 20),
+        onBehalfOf: groups[0],
         content: '',
     });
 
@@ -44,6 +45,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 2,
         submitter: students[0],
         submissionTime: new Date(2025, 2, 25),
+        onBehalfOf: groups[0],
         content: '',
     });
 
@@ -54,6 +56,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 1,
         submitter: students[1],
         submissionTime: new Date(2025, 2, 20),
+        onBehalfOf: groups[1],
         content: '',
     });
 
diff --git a/backend/tests/test_assets/questions/questions.testdata.ts b/backend/tests/test_assets/questions/questions.testdata.ts
index dff742bb..0ccd498e 100644
--- a/backend/tests/test_assets/questions/questions.testdata.ts
+++ b/backend/tests/test_assets/questions/questions.testdata.ts
@@ -2,12 +2,14 @@ import { EntityManager } from '@mikro-orm/core';
 import { Question } from '../../../src/entities/questions/question.entity';
 import { Language } from '@dwengo-1/common/util/language';
 import { Student } from '../../../src/entities/users/student.entity';
+import {Group} from "../../../src/entities/assignments/group.entity";
 
-export function makeTestQuestions(em: EntityManager, students: Student[]): Question[] {
+export function makeTestQuestions(em: EntityManager, students: Student[], groups: Group[]): Question[] {
     const question01 = em.create(Question, {
         learningObjectLanguage: Language.English,
         learningObjectVersion: 1,
         learningObjectHruid: 'id05',
+        inGroup: groups[0],
         sequenceNumber: 1,
         author: students[0],
         timestamp: new Date(),
@@ -18,6 +20,7 @@ export function makeTestQuestions(em: EntityManager, students: Student[]): Quest
         learningObjectLanguage: Language.English,
         learningObjectVersion: 1,
         learningObjectHruid: 'id05',
+        inGroup: groups[0],
         sequenceNumber: 2,
         author: students[2],
         timestamp: new Date(),
@@ -30,6 +33,7 @@ export function makeTestQuestions(em: EntityManager, students: Student[]): Quest
         learningObjectHruid: 'id04',
         sequenceNumber: 1,
         author: students[0],
+        inGroup: groups[0],
         timestamp: new Date(),
         content: 'question',
     });
@@ -40,6 +44,7 @@ export function makeTestQuestions(em: EntityManager, students: Student[]): Quest
         learningObjectHruid: 'id01',
         sequenceNumber: 1,
         author: students[1],
+        inGroup: groups[1],
         timestamp: new Date(),
         content: 'question',
     });
diff --git a/common/src/interfaces/question.ts b/common/src/interfaces/question.ts
index 69a9590d..9b00e1bd 100644
--- a/common/src/interfaces/question.ts
+++ b/common/src/interfaces/question.ts
@@ -14,5 +14,4 @@ export interface QuestionDTO {
 export interface QuestionId {
     learningObjectIdentifier: LearningObjectIdentifier;
     sequenceNumber: number;
-    inGroup: GroupDTO;
 }

From 03fa7c7b14f5521f3b8e06ff224ab855bcadf697 Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Mon, 7 Apr 2025 15:59:07 +0200
Subject: [PATCH 084/177] fix(backend): Fouten in de testen resulterend uit de
 aanpassingen opgelost.

---
 .../data/assignments/submission-repository.ts | 14 ++++-
 .../entities/assignments/assignment.entity.ts |  4 +-
 .../tests/data/questions/questions.test.ts    | 12 +++-
 .../database-learning-path-provider.test.ts   | 63 ++++++++++++++++---
 4 files changed, 80 insertions(+), 13 deletions(-)

diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts
index f5090adc..f5ace213 100644
--- a/backend/src/data/assignments/submission-repository.ts
+++ b/backend/src/data/assignments/submission-repository.ts
@@ -42,11 +42,21 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
     }
 
     public async findAllSubmissionsForGroup(group: Group): Promise<Submission[]> {
-        return this.find({ onBehalfOf: group });
+        return this.find(
+            { onBehalfOf: group },
+            {
+                populate: ["onBehalfOf.members"]
+            }
+        );
     }
 
     public async findAllSubmissionsForStudent(student: Student): Promise<Submission[]> {
-        return this.find({ submitter: student });
+        return this.find(
+            { submitter: student },
+            {
+                populate: ["onBehalfOf.members"]
+            }
+        );
     }
 
     public async deleteSubmissionByLearningObjectAndSubmissionNumber(loId: LearningObjectIdentifier, submissionNumber: number): Promise<void> {
diff --git a/backend/src/entities/assignments/assignment.entity.ts b/backend/src/entities/assignments/assignment.entity.ts
index 36b24344..52773909 100644
--- a/backend/src/entities/assignments/assignment.entity.ts
+++ b/backend/src/entities/assignments/assignment.entity.ts
@@ -1,4 +1,4 @@
-import { Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core';
+import {Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property} from '@mikro-orm/core';
 import { Class } from '../classes/class.entity.js';
 import { Group } from './group.entity.js';
 import { Language } from '@dwengo-1/common/util/language';
@@ -35,5 +35,5 @@ export class Assignment {
         entity: () => Group,
         mappedBy: 'assignment',
     })
-    groups!: Group[];
+    groups!: Collection<Group>;
 }
diff --git a/backend/tests/data/questions/questions.test.ts b/backend/tests/data/questions/questions.test.ts
index 055a9d79..567777f5 100644
--- a/backend/tests/data/questions/questions.test.ts
+++ b/backend/tests/data/questions/questions.test.ts
@@ -1,7 +1,12 @@
 import { beforeAll, describe, expect, it } from 'vitest';
 import { setupTestApp } from '../../setup-tests';
 import { QuestionRepository } from '../../../src/data/questions/question-repository';
-import { getQuestionRepository, getStudentRepository } from '../../../src/data/repositories';
+import {
+    getAssignmentRepository, getClassRepository,
+    getGroupRepository,
+    getQuestionRepository,
+    getStudentRepository
+} from '../../../src/data/repositories';
 import { StudentRepository } from '../../../src/data/users/student-repository';
 import { LearningObjectIdentifier } from '../../../src/entities/content/learning-object-identifier';
 import { Language } from '@dwengo-1/common/util/language';
@@ -27,8 +32,13 @@ describe('QuestionRepository', () => {
     it('should create new question', async () => {
         const id = new LearningObjectIdentifier('id03', Language.English, 1);
         const student = await studentRepository.findByUsername('Noordkaap');
+
+        const clazz = await getClassRepository().findById("id01");
+        const assignment = await getAssignmentRepository().findByClassAndId(clazz!, 1);
+        const group = await getGroupRepository().findByAssignmentAndGroupNumber(assignment!, 1);
         await questionRepository.createQuestion({
             loId: id,
+            inGroup: group!,
             author: student!,
             content: 'question?',
         });
diff --git a/backend/tests/services/learning-path/database-learning-path-provider.test.ts b/backend/tests/services/learning-path/database-learning-path-provider.test.ts
index b8a733e7..2c7ceb0b 100644
--- a/backend/tests/services/learning-path/database-learning-path-provider.test.ts
+++ b/backend/tests/services/learning-path/database-learning-path-provider.test.ts
@@ -3,6 +3,9 @@ import { LearningObject } from '../../../src/entities/content/learning-object.en
 import { setupTestApp } from '../../setup-tests.js';
 import { LearningPath } from '../../../src/entities/content/learning-path.entity.js';
 import {
+    getAssignmentRepository,
+    getClassRepository,
+    getGroupRepository,
     getLearningObjectRepository,
     getLearningPathRepository,
     getStudentRepository,
@@ -22,6 +25,10 @@ import { Student } from '../../../src/entities/users/student.entity.js';
 
 import { LearningObjectNode, LearningPathResponse } from '@dwengo-1/common/interfaces/learning-content';
 
+const STUDENT_A_USERNAME = "student_a";
+const STUDENT_B_USERNAME = "student_b";
+const CLASS_NAME = "test_class"
+
 async function initExampleData(): Promise<{ learningObject: LearningObject; learningPath: LearningPath }> {
     const learningObjectRepo = getLearningObjectRepository();
     const learningPathRepo = getLearningPathRepository();
@@ -37,7 +44,10 @@ async function initPersonalizationTestData(): Promise<{
     studentA: Student;
     studentB: Student;
 }> {
-    const studentRepo = getStudentRepository();
+    const studentRepo = getStudentRepository()
+    const classRepo = getClassRepository();
+    const assignmentRepo = getAssignmentRepository();
+    const groupRepo = getGroupRepository();
     const submissionRepo = getSubmissionRepository();
     const learningPathRepo = getLearningPathRepository();
     const learningObjectRepo = getLearningObjectRepository();
@@ -47,32 +57,69 @@ async function initPersonalizationTestData(): Promise<{
     await learningObjectRepo.save(learningContent.extraExerciseObject);
     await learningPathRepo.save(learningContent.learningPath);
 
+    // Create students
     const studentA = studentRepo.create({
-        username: 'student_a',
+        username: STUDENT_A_USERNAME,
         firstName: 'Aron',
         lastName: 'Student',
     });
     await studentRepo.save(studentA);
+
+    const studentB = studentRepo.create({
+        username: STUDENT_B_USERNAME,
+        firstName: 'Bill',
+        lastName: 'Student',
+    });
+    await studentRepo.save(studentB);
+
+    // Create class for students
+    const testClass = classRepo.create({
+        classId: CLASS_NAME,
+        displayName: "Test class"
+    });
+    await classRepo.save(testClass);
+
+    // Create assignment for students and assign them to different groups
+    const assignment = assignmentRepo.create({
+        id: 0,
+        title: "Test assignment",
+        description: "Test description",
+        learningPathHruid: learningContent.learningPath.hruid,
+        learningPathLanguage: learningContent.learningPath.language,
+        within: testClass
+    })
+
+    const groupA = groupRepo.create({
+        groupNumber: 0,
+        members: [studentA],
+        assignment
+    });
+    await groupRepo.save(groupA);
+
+    const groupB = groupRepo.create({
+        groupNumber: 1,
+        members: [studentB],
+        assignment
+    });
+    await groupRepo.save(groupB);
+
+    // Let each of the students make a submission in his own group.
     const submissionA = submissionRepo.create({
         learningObjectHruid: learningContent.branchingObject.hruid,
         learningObjectLanguage: learningContent.branchingObject.language,
         learningObjectVersion: learningContent.branchingObject.version,
+        onBehalfOf: groupA,
         submitter: studentA,
         submissionTime: new Date(),
         content: '[0]',
     });
     await submissionRepo.save(submissionA);
 
-    const studentB = studentRepo.create({
-        username: 'student_b',
-        firstName: 'Bill',
-        lastName: 'Student',
-    });
-    await studentRepo.save(studentB);
     const submissionB = submissionRepo.create({
         learningObjectHruid: learningContent.branchingObject.hruid,
         learningObjectLanguage: learningContent.branchingObject.language,
         learningObjectVersion: learningContent.branchingObject.version,
+        onBehalfOf: groupA,
         submitter: studentB,
         submissionTime: new Date(),
         content: '[1]',

From 09a11589d2f4cf4006c623ba7b9d3bbae4663f31 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Mon, 7 Apr 2025 16:30:52 +0200
Subject: [PATCH 085/177] feat: question answer frontend controller en queries

---
 backend/src/routes/questions.ts             |  2 +-
 frontend/src/controllers/answers.ts         | 40 +++++++++
 frontend/src/controllers/base-controller.ts | 12 +--
 frontend/src/controllers/questions.ts       | 35 +++++++-
 frontend/src/queries/answers.ts             | 57 +++++++++++++
 frontend/src/queries/questions.ts           | 91 +++++++++++++++++++++
 6 files changed, 229 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/controllers/answers.ts
 create mode 100644 frontend/src/queries/answers.ts
 create mode 100644 frontend/src/queries/questions.ts

diff --git a/backend/src/routes/questions.ts b/backend/src/routes/questions.ts
index e3651ba3..5135c197 100644
--- a/backend/src/routes/questions.ts
+++ b/backend/src/routes/questions.ts
@@ -16,6 +16,6 @@ router.delete('/:seq', deleteQuestionHandler);
 // Information about a question with id
 router.get('/:seq', getQuestionHandler);
 
-router.use('/:seq/answer', answerRoutes);
+router.use('/:seq/answers', answerRoutes);
 
 export default router;
diff --git a/frontend/src/controllers/answers.ts b/frontend/src/controllers/answers.ts
new file mode 100644
index 00000000..60d623f8
--- /dev/null
+++ b/frontend/src/controllers/answers.ts
@@ -0,0 +1,40 @@
+import type {AnswerData, AnswerDTO, AnswerId} from "@dwengo-1/common/interfaces/answer";
+import {BaseController} from "@/controllers/base-controller.ts";
+import type {QuestionId} from "@dwengo-1/common/interfaces/question";
+
+
+export interface AnswersResponse {
+    answers: AnswerDTO[] | AnswerId[]
+}
+
+export interface AnswerResponse {
+    answer: AnswerDTO
+}
+
+export class AnswerController extends BaseController {
+    constructor(questionId: QuestionId) {
+        this.loId = questionId.learningObjectIdentifier;
+        this.sequenceNumber = questionId.sequenceNumber;
+        super(`learningObject/${loId.hruid}/:${loId.version}/questions/${this.sequenceNumber}/answers`)
+    }
+
+    async getAll(full = true): Promise<AnswersResponse> {
+        return this.get<AnswersResponse>("/", {lang: this.loId.lang, full});
+    }
+
+    async getBy(seq: number): Promise<AnswerResponse> {
+        return this.get<AnswerResponse>(`/${seq}`, {lang: this.loId.lang});
+    }
+
+    async create(answerData: AnswerData) {
+        return this.post<AnswerResponse>("/", answerData, {lang: this.loId.lang});
+    }
+
+    async remove(seq: number): Promise<AnswerResponse> {
+        return this.delete<AnswerResponse>(`/${seq}`, {lang: this.loId.lang});
+    }
+
+    async update(seq: number, answerData: AnswerData): Promise<AnswerResponse> {
+        return this.put<AnswerResponse>(`/${seq}`, answerData,{lang: this.loId.lang});
+    }
+}
diff --git a/frontend/src/controllers/base-controller.ts b/frontend/src/controllers/base-controller.ts
index 72d71819..f923c84f 100644
--- a/frontend/src/controllers/base-controller.ts
+++ b/frontend/src/controllers/base-controller.ts
@@ -21,20 +21,20 @@ export abstract class BaseController {
         return response.data;
     }
 
-    protected async post<T>(path: string, body: unknown): Promise<T> {
-        const response = await apiClient.post<T>(this.absolutePathFor(path), body);
+    protected async post<T>(path: string, body: unknown, queryParams?: QueryParams): Promise<T> {
+        const response = await apiClient.post<T>(this.absolutePathFor(path), body, { params: queryParams });
         BaseController.assertSuccessResponse(response);
         return response.data;
     }
 
-    protected async delete<T>(path: string): Promise<T> {
-        const response = await apiClient.delete<T>(this.absolutePathFor(path));
+    protected async delete<T>(path: string, queryParams?: QueryParams): Promise<T> {
+        const response = await apiClient.delete<T>(this.absolutePathFor(path), { params: queryParams} );
         BaseController.assertSuccessResponse(response);
         return response.data;
     }
 
-    protected async put<T>(path: string, body: unknown): Promise<T> {
-        const response = await apiClient.put<T>(this.absolutePathFor(path), body);
+    protected async put<T>(path: string, body: unknown, queryParams?: QueryParams): Promise<T> {
+        const response = await apiClient.put<T>(this.absolutePathFor(path), body, { params: queryParams});
         BaseController.assertSuccessResponse(response);
         return response.data;
     }
diff --git a/frontend/src/controllers/questions.ts b/frontend/src/controllers/questions.ts
index 9b0182de..d190c30f 100644
--- a/frontend/src/controllers/questions.ts
+++ b/frontend/src/controllers/questions.ts
@@ -1,5 +1,38 @@
-import type { QuestionDTO, QuestionId } from "@dwengo-1/interfaces/question";
+import type {QuestionData, QuestionDTO, QuestionId} from "@dwengo-1/common/interfaces/question";
+import {BaseController} from "@/controllers/base-controller.ts";
+import type {LearningObjectIdentifierDTO} from "@dwengo-1/common/interfaces/learning-content";
 
 export interface QuestionsResponse {
     questions: QuestionDTO[] | QuestionId[];
 }
+
+export interface QuestionResponse {
+    question: QuestionDTO;
+}
+
+export class QuestionController extends BaseController {
+    constructor(loId: LearningObjectIdentifierDTO) {
+        this.loId = loId;
+        super(`learningObject/${loId.hruid}/:${loId.version}/questions`);
+    }
+
+    async getAll(full = true): Promise<QuestionsResponse> {
+        return this.get<QuestionsResponse>("/", {lang: this.loId.lang, full});
+    }
+
+    async getBy(sequenceNumber: number): Promise<QuestionResponse> {
+        return this.get<QuestionResponse>(`/${sequenceNumber}`, {lang: this.loId.lang});
+    }
+
+    async create(questionData: QuestionData): Promise<QuestionResponse> {
+        return this.post<QuestionResponse>("/", questionData, {lang: this.loId.lang})
+    }
+
+    async remove(sequenceNumber: number) {
+        return this.delete<QuestionResponse>(`/${sequenceNumber}`, {lang: this.loId.lang});
+    }
+
+    async update(sequenceNumber: number, questionData: QuestionData) {
+        return this.put<QuestionResponse>(`/${sequenceNumber}`, questionData, {lang: this.loId.lang});
+    }
+}
diff --git a/frontend/src/queries/answers.ts b/frontend/src/queries/answers.ts
new file mode 100644
index 00000000..4f599963
--- /dev/null
+++ b/frontend/src/queries/answers.ts
@@ -0,0 +1,57 @@
+import type { QuestionId} from "@dwengo-1/common/dist/interfaces/question.ts";
+import { type MaybeRefOrGetter, toValue} from "vue";
+import {
+    useMutation,
+    type UseMutationReturnType,
+    useQuery,
+    type UseQueryReturnType
+} from "@tanstack/vue-query";
+import {AnswerController, type AnswerResponse, type AnswersResponse} from "@/controllers/answers.ts";
+import type {AnswerData} from "@dwengo-1/common/dist/interfaces/answer.ts";
+
+// TODO caching
+
+export function useAnswersQuery(
+    questionId: MaybeRefOrGetter<QuestionId>,
+    full: MaybeRefOrGetter<boolean> = true,
+): UseQueryReturnType<AnswersResponse, Error> {
+    return useQuery({
+        queryFn: async () => new AnswerController(toValue(questionId)).getAll(toValue(full)),
+        enabled: () => Boolean(toValue(questionId)),
+    });
+}
+
+export function useAnswerQuery(
+    questionId: MaybeRefOrGetter<QuestionId>,
+    sequenceNumber: MaybeRefOrGetter<number>
+): UseQueryReturnType<AnswerResponse, Error> {
+    return useQuery({
+        queryFn: async () => new AnswerController(toValue(questionId)).getBy(toValue(sequenceNumber)),
+        enabled: () => Boolean(toValue(questionId)),
+    });
+}
+
+export function useCreateAnswerMutation(
+    questionId: MaybeRefOrGetter<QuestionId>,
+): UseMutationReturnType<AnswerResponse, Error, AnswerData, unknown> {
+    return useMutation({
+        mutationFn: async (data) => new AnswerController(toValue(questionId)).create(data),
+    });
+}
+
+export function useDeleteAnswerMutation(
+    questionId: MaybeRefOrGetter<QuestionId>,
+): UseMutationReturnType<AnswerResponse, Error, number, unknown> {
+    return useMutation({
+        mutationFn: async (seq) => new AnswerController(toValue(questionId)).remove(seq),
+    });
+}
+
+export function useUpdateAnswerMutation(
+    questionId: MaybeRefOrGetter<QuestionId>,
+): UseMutationReturnType<AnswerResponse, Error, { answerData: AnswerData, seq: number }, unknown> {
+    return useMutation({
+        mutationFn: async (data, seq) => new AnswerController(toValue(questionId)).update(seq, data),
+    });
+}
+
diff --git a/frontend/src/queries/questions.ts b/frontend/src/queries/questions.ts
new file mode 100644
index 00000000..fa6553de
--- /dev/null
+++ b/frontend/src/queries/questions.ts
@@ -0,0 +1,91 @@
+import {QuestionController, type QuestionResponse, type QuestionsResponse} from "@/controllers/questions.ts";
+import type {QuestionData, QuestionId} from "@dwengo-1/common/interfaces/question";
+import type {LearningObjectIdentifierDTO} from "@dwengo-1/common/interfaces/learning-content";
+import {computed, type MaybeRefOrGetter, toValue} from "vue";
+import {
+    useMutation,
+    type UseMutationReturnType,
+    useQuery,
+    useQueryClient,
+    type UseQueryReturnType
+} from "@tanstack/vue-query";
+
+
+export function questionsQueryKey(loId: LearningObjectIdentifierDTO, full: boolean): [string, string, number, string, boolean] {
+    return ["questions", loId.hruid, loId.version, loId.language, full];
+}
+
+export function questionQueryKey(questionId: QuestionId): [string, string, number, string, number] {
+    const loId = questionId.learningObjectIdentifier;
+    return ["question", loId.hruid, loId.version, loId.language, questionId.sequenceNumber];
+}
+
+export function useQuestionsQuery(
+    loId: MaybeRefOrGetter<LearningObjectIdentifierDTO>,
+    full: MaybeRefOrGetter<boolean> = true,
+): UseQueryReturnType<QuestionsResponse, Error> {
+    return useQuery({
+        queryKey: computed(() => questionsQueryKey(toValue(loId), toValue(full))),
+        queryFn: async () => new QuestionController(toValue(loId)).getAll(toValue(full)),
+        enabled: () => Boolean(toValue(loId)),
+    });
+}
+
+export function useQuestionQuery(
+    questionId: MaybeRefOrGetter<QuestionId>,
+): UseQueryReturnType<QuestionResponse, Error> {
+    const loId = toValue(questionId).learningObjectIdentifier;
+    const sequenceNumber = toValue(questionId).sequenceNumber;
+    return useQuery({
+        queryKey: computed(() => questionQueryKey(loId, sequenceNumber)),
+        queryFn: async () => new QuestionController(loId).getBy(sequenceNumber),
+        enabled: () => Boolean(toValue(questionId)),
+    });
+}
+
+export function useCreateQuestionMutation(
+    loId: MaybeRefOrGetter<LearningObjectIdentifierDTO>,
+): UseMutationReturnType<QuestionResponse, Error, QuestionData, unknown> {
+    const queryClient = useQueryClient();
+
+    return useMutation({
+        mutationFn: async (data) => new QuestionController(toValue(loId)).create(data),
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: questionsQueryKey(toValue(loId), true) });
+            await queryClient.invalidateQueries({ queryKey: questionsQueryKey(toValue(loId), false) });
+        },
+    });
+}
+
+export function useUpdateQuestionMutation(
+    questionId: MaybeRefOrGetter<QuestionId>,
+): UseMutationReturnType<QuestionResponse, Error, QuestionData, unknown> {
+    const queryClient = useQueryClient();
+    const loId = toValue(questionId).learningObjectIdentifier;
+    const sequenceNumber = toValue(questionId).sequenceNumber;
+
+    return useMutation({
+        mutationFn: async ( data ) => new QuestionController(loId).update(sequenceNumber, data),
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: questionsQueryKey(toValue(loId), true) });
+            await queryClient.invalidateQueries({ queryKey: questionsQueryKey(toValue(loId), false) });
+            await queryClient.invalidateQueries({ queryKey: questionQueryKey(toValue(questionId)) });
+        },
+    });
+}
+
+export function useDeleteQuestionMutation(
+    questionId: MaybeRefOrGetter<QuestionId>,
+): UseMutationReturnType<QuestionResponse, Error, void, unknown> {
+    const queryClient = useQueryClient();
+    const loId = toValue(questionId).learningObjectIdentifier;
+    const sequenceNumber = toValue(questionId).sequenceNumber;
+    return useMutation({
+        mutationFn: async () => new QuestionController(loId).remove(sequenceNumber),
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: questionsQueryKey(toValue(loId), true) });
+            await queryClient.invalidateQueries({ queryKey: questionsQueryKey(toValue(loId), false) });
+            await queryClient.invalidateQueries({ queryKey: questionQueryKey(toValue(questionId)) });
+        },
+    });
+}

From 5cea6929f9a37e61f62c6487b091d90e608f9592 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Mon, 7 Apr 2025 16:34:12 +0200
Subject: [PATCH 086/177] fix: linter

---
 backend/src/data/questions/answer-repository.ts   | 2 +-
 backend/src/data/questions/question-repository.ts | 2 +-
 frontend/src/controllers/answers.ts               | 2 +-
 frontend/src/controllers/questions.ts             | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/data/questions/answer-repository.ts b/backend/src/data/questions/answer-repository.ts
index 088ad623..1b353b28 100644
--- a/backend/src/data/questions/answer-repository.ts
+++ b/backend/src/data/questions/answer-repository.ts
@@ -20,7 +20,7 @@ export class AnswerRepository extends DwengoEntityRepository<Answer> {
             orderBy: { sequenceNumber: 'ASC' },
         });
     }
-    public async findAnswer(question: Question, sequenceNumber: number): Promise<Loaded<Answer, never, "*", never> | null> {
+    public async findAnswer(question: Question, sequenceNumber: number): Promise<Loaded<Answer> | null> {
         return this.findOne({
             toQuestion: question, sequenceNumber
         });
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 18bcd551..27a4ac19 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -63,7 +63,7 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
         });
     }
 
-    public async findByLearningObjectAndSequenceNumber(loId: LearningObjectIdentifier, sequenceNumber: number): Promise<Loaded<Question, never, "*", never> | null> {
+    public async findByLearningObjectAndSequenceNumber(loId: LearningObjectIdentifier, sequenceNumber: number): Promise<Loaded<Question> | null> {
         return this.findOne({
             learningObjectHruid: loId.hruid,
             learningObjectLanguage: loId.language,
diff --git a/frontend/src/controllers/answers.ts b/frontend/src/controllers/answers.ts
index 60d623f8..b95f27db 100644
--- a/frontend/src/controllers/answers.ts
+++ b/frontend/src/controllers/answers.ts
@@ -26,7 +26,7 @@ export class AnswerController extends BaseController {
         return this.get<AnswerResponse>(`/${seq}`, {lang: this.loId.lang});
     }
 
-    async create(answerData: AnswerData) {
+    async create(answerData: AnswerData): Promise<AnswerResponse> {
         return this.post<AnswerResponse>("/", answerData, {lang: this.loId.lang});
     }
 
diff --git a/frontend/src/controllers/questions.ts b/frontend/src/controllers/questions.ts
index d190c30f..28609e95 100644
--- a/frontend/src/controllers/questions.ts
+++ b/frontend/src/controllers/questions.ts
@@ -28,11 +28,11 @@ export class QuestionController extends BaseController {
         return this.post<QuestionResponse>("/", questionData, {lang: this.loId.lang})
     }
 
-    async remove(sequenceNumber: number) {
+    async remove(sequenceNumber: number): Promise<QuestionResponse> {
         return this.delete<QuestionResponse>(`/${sequenceNumber}`, {lang: this.loId.lang});
     }
 
-    async update(sequenceNumber: number, questionData: QuestionData) {
+    async update(sequenceNumber: number, questionData: QuestionData): Promise<QuestionResponse> {
         return this.put<QuestionResponse>(`/${sequenceNumber}`, questionData, {lang: this.loId.lang});
     }
 }

From a8895cc429914e9354836da1f522a4417aaca955 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Mon, 7 Apr 2025 14:44:59 +0000
Subject: [PATCH 087/177] style: fix linting issues met Prettier

---
 .../src/data/questions/answer-repository.ts   |  5 +-
 .../src/data/questions/question-repository.ts |  4 +-
 backend/src/routes/answers.ts                 | 14 ++----
 backend/src/services/answers.ts               | 22 +++++----
 backend/src/services/questions.ts             |  6 +--
 backend/tests/controllers/answers.test.ts     | 47 +++++++++----------
 backend/tests/controllers/questions.test.ts   | 46 ++++++++----------
 frontend/src/controllers/answers.ts           | 23 +++++----
 frontend/src/controllers/base-controller.ts   |  4 +-
 frontend/src/controllers/questions.ts         | 16 +++----
 frontend/src/queries/answers.ts               | 20 +++-----
 frontend/src/queries/questions.ts             | 18 +++----
 12 files changed, 104 insertions(+), 121 deletions(-)

diff --git a/backend/src/data/questions/answer-repository.ts b/backend/src/data/questions/answer-repository.ts
index 1b353b28..54f67a01 100644
--- a/backend/src/data/questions/answer-repository.ts
+++ b/backend/src/data/questions/answer-repository.ts
@@ -2,7 +2,7 @@ import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
 import { Answer } from '../../entities/questions/answer.entity.js';
 import { Question } from '../../entities/questions/question.entity.js';
 import { Teacher } from '../../entities/users/teacher.entity.js';
-import {Loaded} from "@mikro-orm/core";
+import { Loaded } from '@mikro-orm/core';
 
 export class AnswerRepository extends DwengoEntityRepository<Answer> {
     public async createAnswer(answer: { toQuestion: Question; author: Teacher; content: string }): Promise<Answer> {
@@ -22,7 +22,8 @@ export class AnswerRepository extends DwengoEntityRepository<Answer> {
     }
     public async findAnswer(question: Question, sequenceNumber: number): Promise<Loaded<Answer> | null> {
         return this.findOne({
-            toQuestion: question, sequenceNumber
+            toQuestion: question,
+            sequenceNumber,
         });
     }
     public async removeAnswerByQuestionAndSequenceNumber(question: Question, sequenceNumber: number): Promise<void> {
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 27a4ac19..cf9ecab0 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -3,7 +3,7 @@ import { Question } from '../../entities/questions/question.entity.js';
 import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js';
 import { Student } from '../../entities/users/student.entity.js';
 import { LearningObject } from '../../entities/content/learning-object.entity.js';
-import {Loaded} from "@mikro-orm/core";
+import { Loaded } from '@mikro-orm/core';
 
 export class QuestionRepository extends DwengoEntityRepository<Question> {
     public async createQuestion(question: { loId: LearningObjectIdentifier; author: Student; content: string }): Promise<Question> {
@@ -68,7 +68,7 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
             learningObjectHruid: loId.hruid,
             learningObjectLanguage: loId.language,
             learningObjectVersion: loId.version,
-            sequenceNumber
+            sequenceNumber,
         });
     }
 
diff --git a/backend/src/routes/answers.ts b/backend/src/routes/answers.ts
index a6280e49..5800733a 100644
--- a/backend/src/routes/answers.ts
+++ b/backend/src/routes/answers.ts
@@ -1,19 +1,13 @@
-import express from "express";
-import {
-    createAnswerHandler,
-    deleteAnswerHandler,
-    getAnswerHandler,
-    getAllAnswersHandler,
-    updateAnswerHandler
-} from "../controllers/answers";
+import express from 'express';
+import { createAnswerHandler, deleteAnswerHandler, getAnswerHandler, getAllAnswersHandler, updateAnswerHandler } from '../controllers/answers';
 
 const router = express.Router({ mergeParams: true });
 
 router.get('/', getAllAnswersHandler);
 
-router.post('/', createAnswerHandler)
+router.post('/', createAnswerHandler);
 
-router.get('/:seqAnswer', getAnswerHandler)
+router.get('/:seqAnswer', getAnswerHandler);
 
 router.delete('/:seqAnswer', deleteAnswerHandler);
 
diff --git a/backend/src/services/answers.ts b/backend/src/services/answers.ts
index 4844ff79..f2abad51 100644
--- a/backend/src/services/answers.ts
+++ b/backend/src/services/answers.ts
@@ -1,11 +1,11 @@
-import {getAnswerRepository} from "../data/repositories";
-import {Answer} from "../entities/questions/answer.entity";
-import {mapToAnswerDTO, mapToAnswerDTOId} from "../interfaces/answer";
-import {fetchTeacher} from "./teachers";
-import {fetchQuestion} from "./questions";
-import {QuestionId} from "@dwengo-1/common/interfaces/question";
-import {AnswerData, AnswerDTO, AnswerId} from "@dwengo-1/common/interfaces/answer";
-import {NotFoundException} from "../exceptions/not-found-exception";
+import { getAnswerRepository } from '../data/repositories';
+import { Answer } from '../entities/questions/answer.entity';
+import { mapToAnswerDTO, mapToAnswerDTOId } from '../interfaces/answer';
+import { fetchTeacher } from './teachers';
+import { fetchQuestion } from './questions';
+import { QuestionId } from '@dwengo-1/common/interfaces/question';
+import { AnswerData, AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
+import { NotFoundException } from '../exceptions/not-found-exception';
 
 export async function getAnswersByQuestion(questionId: QuestionId, full: boolean): Promise<AnswerDTO[] | AnswerId[]> {
     const answerRepository = getAnswerRepository();
@@ -27,7 +27,9 @@ export async function createAnswer(questionId: QuestionId, answerData: AnswerDat
     const content = answerData.content;
 
     const answer = await answerRepository.createAnswer({
-        toQuestion, author, content
+        toQuestion,
+        author,
+        content,
     });
     return mapToAnswerDTO(answer);
 }
@@ -37,7 +39,7 @@ async function fetchAnswer(questionId: QuestionId, sequenceNumber: number): Prom
     const question = await fetchQuestion(questionId);
     const answer = await answerRepository.findAnswer(question, sequenceNumber);
 
-    if (!answer){
+    if (!answer) {
         throw new NotFoundException('Answer with questionID and sequence number not found');
     }
 
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index 64bf4471..d2e6440e 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -56,11 +56,11 @@ export async function deleteQuestion(questionId: QuestionId): Promise<QuestionDT
     const questionRepository = getQuestionRepository();
     const question = await fetchQuestion(questionId); // Throws error if not found
 
-    const loId : LearningObjectIdentifier = {
+    const loId: LearningObjectIdentifier = {
         hruid: questionId.learningObjectIdentifier.hruid,
         language: questionId.learningObjectIdentifier.language,
-        version: questionId.learningObjectIdentifier.version || FALLBACK_VERSION_NUM
-    }
+        version: questionId.learningObjectIdentifier.version || FALLBACK_VERSION_NUM,
+    };
 
     await questionRepository.removeQuestionByLearningObjectAndSequenceNumber(loId, questionId.sequenceNumber);
     return mapToQuestionDTO(question);
diff --git a/backend/tests/controllers/answers.test.ts b/backend/tests/controllers/answers.test.ts
index 26d7568c..8edf2e91 100644
--- a/backend/tests/controllers/answers.test.ts
+++ b/backend/tests/controllers/answers.test.ts
@@ -1,10 +1,10 @@
-import {Request, Response} from "express";
-import {beforeAll, beforeEach, describe, expect, it, Mock, vi} from "vitest";
-import {setupTestApp} from "../setup-tests";
-import {Language} from "@dwengo-1/common/util/language";
-import {getAllAnswersHandler, getAnswerHandler, updateAnswerHandler} from "../../src/controllers/answers";
-import {BadRequestException} from "../../src/exceptions/bad-request-exception";
-import {NotFoundException} from "../../src/exceptions/not-found-exception";
+import { Request, Response } from 'express';
+import { beforeAll, beforeEach, describe, expect, it, Mock, vi } from 'vitest';
+import { setupTestApp } from '../setup-tests';
+import { Language } from '@dwengo-1/common/util/language';
+import { getAllAnswersHandler, getAnswerHandler, updateAnswerHandler } from '../../src/controllers/answers';
+import { BadRequestException } from '../../src/exceptions/bad-request-exception';
+import { NotFoundException } from '../../src/exceptions/not-found-exception';
 
 describe('Questions controllers', () => {
     let req: Partial<Request>;
@@ -25,12 +25,12 @@ describe('Questions controllers', () => {
 
     it('Get answers list', async () => {
         req = {
-            params: {hruid: 'id05', version: '1', seq: '2'},
-            query: {lang: Language.English, full: 'true'},
+            params: { hruid: 'id05', version: '1', seq: '2' },
+            query: { lang: Language.English, full: 'true' },
         };
 
         await getAllAnswersHandler(req as Request, res as Response);
-        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({answers: expect.anything()}));
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ answers: expect.anything() }));
 
         const result = jsonMock.mock.lastCall?.[0];
         // Console.log(result.answers);
@@ -39,12 +39,12 @@ describe('Questions controllers', () => {
 
     it('Get answer', async () => {
         req = {
-            params: {hruid: 'id05', version: '1', seq: '2', seqAnswer: '2'},
-            query: {lang: Language.English, full: 'true'},
+            params: { hruid: 'id05', version: '1', seq: '2', seqAnswer: '2' },
+            query: { lang: Language.English, full: 'true' },
         };
 
         await getAnswerHandler(req as Request, res as Response);
-        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({answer: expect.anything()}));
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ answer: expect.anything() }));
 
         // Const result = jsonMock.mock.lastCall?.[0];
         // Console.log(result.answer);
@@ -52,13 +52,12 @@ describe('Questions controllers', () => {
 
     it('Get answer hruid does not exist', async () => {
         req = {
-            params: { hruid: 'id_not_exist'},
+            params: { hruid: 'id_not_exist' },
             query: { lang: Language.English, full: 'true' },
         };
 
-        await expect( async () => getAnswerHandler(req as Request, res as Response))
-            .rejects.toThrow(NotFoundException);
-    })
+        await expect(async () => getAnswerHandler(req as Request, res as Response)).rejects.toThrow(NotFoundException);
+    });
 
     it('Get answer no hruid given', async () => {
         req = {
@@ -66,16 +65,15 @@ describe('Questions controllers', () => {
             query: { lang: Language.English, full: 'true' },
         };
 
-        await expect( async () => getAnswerHandler(req as Request, res as Response))
-            .rejects.toThrow(BadRequestException);
-    })
+        await expect(async () => getAnswerHandler(req as Request, res as Response)).rejects.toThrow(BadRequestException);
+    });
 
-    it('Update question', async() => {
-        const newContent = "updated question";
+    it('Update question', async () => {
+        const newContent = 'updated question';
         req = {
-            params: { hruid: 'id05', version: '1', seq: '2', seqAnswer: '2'},
+            params: { hruid: 'id05', version: '1', seq: '2', seqAnswer: '2' },
             query: { lang: Language.English },
-            body: { content: newContent }
+            body: { content: newContent },
         };
 
         await updateAnswerHandler(req as Request, res as Response);
@@ -86,5 +84,4 @@ describe('Questions controllers', () => {
         // Console.log(result.question);
         expect(result.answer.content).to.eq(newContent);
     });
-
 });
diff --git a/backend/tests/controllers/questions.test.ts b/backend/tests/controllers/questions.test.ts
index 593445c0..f2612fc7 100644
--- a/backend/tests/controllers/questions.test.ts
+++ b/backend/tests/controllers/questions.test.ts
@@ -1,14 +1,10 @@
-import {beforeAll, beforeEach, describe, expect, it, Mock, vi} from "vitest";
-import {Request, Response} from "express";
-import {setupTestApp} from "../setup-tests";
-import {
-    getAllQuestionsHandler,
-    getQuestionHandler, updateQuestionHandler
-} from "../../src/controllers/questions";
-import {Language} from "@dwengo-1/common/util/language";
-import {NotFoundException} from "../../src/exceptions/not-found-exception";
-import {BadRequestException} from "../../src/exceptions/bad-request-exception";
-
+import { beforeAll, beforeEach, describe, expect, it, Mock, vi } from 'vitest';
+import { Request, Response } from 'express';
+import { setupTestApp } from '../setup-tests';
+import { getAllQuestionsHandler, getQuestionHandler, updateQuestionHandler } from '../../src/controllers/questions';
+import { Language } from '@dwengo-1/common/util/language';
+import { NotFoundException } from '../../src/exceptions/not-found-exception';
+import { BadRequestException } from '../../src/exceptions/bad-request-exception';
 
 describe('Questions controllers', () => {
     let req: Partial<Request>;
@@ -43,7 +39,7 @@ describe('Questions controllers', () => {
 
     it('Get question', async () => {
         req = {
-            params: { hruid: 'id05', version: '1', seq: '1'},
+            params: { hruid: 'id05', version: '1', seq: '1' },
             query: { lang: Language.English, full: 'true' },
         };
 
@@ -52,11 +48,11 @@ describe('Questions controllers', () => {
 
         // Const result = jsonMock.mock.lastCall?.[0];
         // Console.log(result.question);
-    })
+    });
 
     it('Get question with fallback sequence number and version', async () => {
         req = {
-            params: { hruid: 'id05'},
+            params: { hruid: 'id05' },
             query: { lang: Language.English, full: 'true' },
         };
 
@@ -65,17 +61,16 @@ describe('Questions controllers', () => {
 
         // Const result = jsonMock.mock.lastCall?.[0];
         // Console.log(result.question);
-    })
+    });
 
     it('Get question hruid does not exist', async () => {
         req = {
-            params: { hruid: 'id_not_exist'},
+            params: { hruid: 'id_not_exist' },
             query: { lang: Language.English, full: 'true' },
         };
 
-        await expect( async () => getQuestionHandler(req as Request, res as Response))
-            .rejects.toThrow(NotFoundException);
-    })
+        await expect(async () => getQuestionHandler(req as Request, res as Response)).rejects.toThrow(NotFoundException);
+    });
 
     it('Get question no hruid given', async () => {
         req = {
@@ -83,9 +78,8 @@ describe('Questions controllers', () => {
             query: { lang: Language.English, full: 'true' },
         };
 
-        await expect( async () => getQuestionHandler(req as Request, res as Response))
-            .rejects.toThrow(BadRequestException);
-    })
+        await expect(async () => getQuestionHandler(req as Request, res as Response)).rejects.toThrow(BadRequestException);
+    });
 
     /*
     It('Create and delete question', async() => {
@@ -104,12 +98,12 @@ describe('Questions controllers', () => {
 
      */
 
-    it('Update question', async() => {
-        const newContent = "updated question";
+    it('Update question', async () => {
+        const newContent = 'updated question';
         req = {
-            params: { hruid: 'id05', version: '1', seq: '1'},
+            params: { hruid: 'id05', version: '1', seq: '1' },
             query: { lang: Language.English },
-            body: { content: newContent }
+            body: { content: newContent },
         };
 
         await updateQuestionHandler(req as Request, res as Response);
diff --git a/frontend/src/controllers/answers.ts b/frontend/src/controllers/answers.ts
index b95f27db..04235e77 100644
--- a/frontend/src/controllers/answers.ts
+++ b/frontend/src/controllers/answers.ts
@@ -1,40 +1,39 @@
-import type {AnswerData, AnswerDTO, AnswerId} from "@dwengo-1/common/interfaces/answer";
-import {BaseController} from "@/controllers/base-controller.ts";
-import type {QuestionId} from "@dwengo-1/common/interfaces/question";
-
+import type { AnswerData, AnswerDTO, AnswerId } from "@dwengo-1/common/interfaces/answer";
+import { BaseController } from "@/controllers/base-controller.ts";
+import type { QuestionId } from "@dwengo-1/common/interfaces/question";
 
 export interface AnswersResponse {
-    answers: AnswerDTO[] | AnswerId[]
+    answers: AnswerDTO[] | AnswerId[];
 }
 
 export interface AnswerResponse {
-    answer: AnswerDTO
+    answer: AnswerDTO;
 }
 
 export class AnswerController extends BaseController {
     constructor(questionId: QuestionId) {
         this.loId = questionId.learningObjectIdentifier;
         this.sequenceNumber = questionId.sequenceNumber;
-        super(`learningObject/${loId.hruid}/:${loId.version}/questions/${this.sequenceNumber}/answers`)
+        super(`learningObject/${loId.hruid}/:${loId.version}/questions/${this.sequenceNumber}/answers`);
     }
 
     async getAll(full = true): Promise<AnswersResponse> {
-        return this.get<AnswersResponse>("/", {lang: this.loId.lang, full});
+        return this.get<AnswersResponse>("/", { lang: this.loId.lang, full });
     }
 
     async getBy(seq: number): Promise<AnswerResponse> {
-        return this.get<AnswerResponse>(`/${seq}`, {lang: this.loId.lang});
+        return this.get<AnswerResponse>(`/${seq}`, { lang: this.loId.lang });
     }
 
     async create(answerData: AnswerData): Promise<AnswerResponse> {
-        return this.post<AnswerResponse>("/", answerData, {lang: this.loId.lang});
+        return this.post<AnswerResponse>("/", answerData, { lang: this.loId.lang });
     }
 
     async remove(seq: number): Promise<AnswerResponse> {
-        return this.delete<AnswerResponse>(`/${seq}`, {lang: this.loId.lang});
+        return this.delete<AnswerResponse>(`/${seq}`, { lang: this.loId.lang });
     }
 
     async update(seq: number, answerData: AnswerData): Promise<AnswerResponse> {
-        return this.put<AnswerResponse>(`/${seq}`, answerData,{lang: this.loId.lang});
+        return this.put<AnswerResponse>(`/${seq}`, answerData, { lang: this.loId.lang });
     }
 }
diff --git a/frontend/src/controllers/base-controller.ts b/frontend/src/controllers/base-controller.ts
index f923c84f..54cf6221 100644
--- a/frontend/src/controllers/base-controller.ts
+++ b/frontend/src/controllers/base-controller.ts
@@ -28,13 +28,13 @@ export abstract class BaseController {
     }
 
     protected async delete<T>(path: string, queryParams?: QueryParams): Promise<T> {
-        const response = await apiClient.delete<T>(this.absolutePathFor(path), { params: queryParams} );
+        const response = await apiClient.delete<T>(this.absolutePathFor(path), { params: queryParams });
         BaseController.assertSuccessResponse(response);
         return response.data;
     }
 
     protected async put<T>(path: string, body: unknown, queryParams?: QueryParams): Promise<T> {
-        const response = await apiClient.put<T>(this.absolutePathFor(path), body, { params: queryParams});
+        const response = await apiClient.put<T>(this.absolutePathFor(path), body, { params: queryParams });
         BaseController.assertSuccessResponse(response);
         return response.data;
     }
diff --git a/frontend/src/controllers/questions.ts b/frontend/src/controllers/questions.ts
index 28609e95..60a51d1a 100644
--- a/frontend/src/controllers/questions.ts
+++ b/frontend/src/controllers/questions.ts
@@ -1,6 +1,6 @@
-import type {QuestionData, QuestionDTO, QuestionId} from "@dwengo-1/common/interfaces/question";
-import {BaseController} from "@/controllers/base-controller.ts";
-import type {LearningObjectIdentifierDTO} from "@dwengo-1/common/interfaces/learning-content";
+import type { QuestionData, QuestionDTO, QuestionId } from "@dwengo-1/common/interfaces/question";
+import { BaseController } from "@/controllers/base-controller.ts";
+import type { LearningObjectIdentifierDTO } from "@dwengo-1/common/interfaces/learning-content";
 
 export interface QuestionsResponse {
     questions: QuestionDTO[] | QuestionId[];
@@ -17,22 +17,22 @@ export class QuestionController extends BaseController {
     }
 
     async getAll(full = true): Promise<QuestionsResponse> {
-        return this.get<QuestionsResponse>("/", {lang: this.loId.lang, full});
+        return this.get<QuestionsResponse>("/", { lang: this.loId.lang, full });
     }
 
     async getBy(sequenceNumber: number): Promise<QuestionResponse> {
-        return this.get<QuestionResponse>(`/${sequenceNumber}`, {lang: this.loId.lang});
+        return this.get<QuestionResponse>(`/${sequenceNumber}`, { lang: this.loId.lang });
     }
 
     async create(questionData: QuestionData): Promise<QuestionResponse> {
-        return this.post<QuestionResponse>("/", questionData, {lang: this.loId.lang})
+        return this.post<QuestionResponse>("/", questionData, { lang: this.loId.lang });
     }
 
     async remove(sequenceNumber: number): Promise<QuestionResponse> {
-        return this.delete<QuestionResponse>(`/${sequenceNumber}`, {lang: this.loId.lang});
+        return this.delete<QuestionResponse>(`/${sequenceNumber}`, { lang: this.loId.lang });
     }
 
     async update(sequenceNumber: number, questionData: QuestionData): Promise<QuestionResponse> {
-        return this.put<QuestionResponse>(`/${sequenceNumber}`, questionData, {lang: this.loId.lang});
+        return this.put<QuestionResponse>(`/${sequenceNumber}`, questionData, { lang: this.loId.lang });
     }
 }
diff --git a/frontend/src/queries/answers.ts b/frontend/src/queries/answers.ts
index 4f599963..f2d0f9c4 100644
--- a/frontend/src/queries/answers.ts
+++ b/frontend/src/queries/answers.ts
@@ -1,13 +1,8 @@
-import type { QuestionId} from "@dwengo-1/common/dist/interfaces/question.ts";
-import { type MaybeRefOrGetter, toValue} from "vue";
-import {
-    useMutation,
-    type UseMutationReturnType,
-    useQuery,
-    type UseQueryReturnType
-} from "@tanstack/vue-query";
-import {AnswerController, type AnswerResponse, type AnswersResponse} from "@/controllers/answers.ts";
-import type {AnswerData} from "@dwengo-1/common/dist/interfaces/answer.ts";
+import type { QuestionId } from "@dwengo-1/common/dist/interfaces/question.ts";
+import { type MaybeRefOrGetter, toValue } from "vue";
+import { useMutation, type UseMutationReturnType, useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
+import { AnswerController, type AnswerResponse, type AnswersResponse } from "@/controllers/answers.ts";
+import type { AnswerData } from "@dwengo-1/common/dist/interfaces/answer.ts";
 
 // TODO caching
 
@@ -23,7 +18,7 @@ export function useAnswersQuery(
 
 export function useAnswerQuery(
     questionId: MaybeRefOrGetter<QuestionId>,
-    sequenceNumber: MaybeRefOrGetter<number>
+    sequenceNumber: MaybeRefOrGetter<number>,
 ): UseQueryReturnType<AnswerResponse, Error> {
     return useQuery({
         queryFn: async () => new AnswerController(toValue(questionId)).getBy(toValue(sequenceNumber)),
@@ -49,9 +44,8 @@ export function useDeleteAnswerMutation(
 
 export function useUpdateAnswerMutation(
     questionId: MaybeRefOrGetter<QuestionId>,
-): UseMutationReturnType<AnswerResponse, Error, { answerData: AnswerData, seq: number }, unknown> {
+): UseMutationReturnType<AnswerResponse, Error, { answerData: AnswerData; seq: number }, unknown> {
     return useMutation({
         mutationFn: async (data, seq) => new AnswerController(toValue(questionId)).update(seq, data),
     });
 }
-
diff --git a/frontend/src/queries/questions.ts b/frontend/src/queries/questions.ts
index fa6553de..b69164a4 100644
--- a/frontend/src/queries/questions.ts
+++ b/frontend/src/queries/questions.ts
@@ -1,17 +1,19 @@
-import {QuestionController, type QuestionResponse, type QuestionsResponse} from "@/controllers/questions.ts";
-import type {QuestionData, QuestionId} from "@dwengo-1/common/interfaces/question";
-import type {LearningObjectIdentifierDTO} from "@dwengo-1/common/interfaces/learning-content";
-import {computed, type MaybeRefOrGetter, toValue} from "vue";
+import { QuestionController, type QuestionResponse, type QuestionsResponse } from "@/controllers/questions.ts";
+import type { QuestionData, QuestionId } from "@dwengo-1/common/interfaces/question";
+import type { LearningObjectIdentifierDTO } from "@dwengo-1/common/interfaces/learning-content";
+import { computed, type MaybeRefOrGetter, toValue } from "vue";
 import {
     useMutation,
     type UseMutationReturnType,
     useQuery,
     useQueryClient,
-    type UseQueryReturnType
+    type UseQueryReturnType,
 } from "@tanstack/vue-query";
 
-
-export function questionsQueryKey(loId: LearningObjectIdentifierDTO, full: boolean): [string, string, number, string, boolean] {
+export function questionsQueryKey(
+    loId: LearningObjectIdentifierDTO,
+    full: boolean,
+): [string, string, number, string, boolean] {
     return ["questions", loId.hruid, loId.version, loId.language, full];
 }
 
@@ -65,7 +67,7 @@ export function useUpdateQuestionMutation(
     const sequenceNumber = toValue(questionId).sequenceNumber;
 
     return useMutation({
-        mutationFn: async ( data ) => new QuestionController(loId).update(sequenceNumber, data),
+        mutationFn: async (data) => new QuestionController(loId).update(sequenceNumber, data),
         onSuccess: async () => {
             await queryClient.invalidateQueries({ queryKey: questionsQueryKey(toValue(loId), true) });
             await queryClient.invalidateQueries({ queryKey: questionsQueryKey(toValue(loId), false) });

From 399986f263ed43ae52d8814a5b09b78f9d3b3fca Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Mon, 7 Apr 2025 16:46:57 +0200
Subject: [PATCH 088/177] fix: typ fout in test

---
 backend/tests/controllers/answers.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/tests/controllers/answers.test.ts b/backend/tests/controllers/answers.test.ts
index 26d7568c..081cc176 100644
--- a/backend/tests/controllers/answers.test.ts
+++ b/backend/tests/controllers/answers.test.ts
@@ -34,7 +34,7 @@ describe('Questions controllers', () => {
 
         const result = jsonMock.mock.lastCall?.[0];
         // Console.log(result.answers);
-        expect(result.questions).to.have.length.greaterThan(1);
+        expect(result.answers).to.have.length.greaterThan(1);
     });
 
     it('Get answer', async () => {

From d59c61e2e2b3d0118e33295ce7cafa1d7dc8077d Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Mon, 7 Apr 2025 17:33:03 +0200
Subject: [PATCH 089/177] feat: frontend controller endpoints voor add en
 delete teacher en student van een klas

---
 frontend/src/controllers/classes.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts
index 6a5f489c..c6c80af0 100644
--- a/frontend/src/controllers/classes.ts
+++ b/frontend/src/controllers/classes.ts
@@ -46,10 +46,26 @@ export class ClassController extends BaseController {
         return this.get<StudentsResponse>(`/${id}/students`, { full });
     }
 
+    async addStudent(id: string, username: string): Promise<ClassResponse> {
+        return this.post<ClassResponse>(`/${id}/students`, { username });
+    }
+
+    async deleteStudent(id: string, username: string): Promise<ClassResponse> {
+        return this.delete<ClassResponse>(`/${id}/students/${ username }`);
+    }
+
     async getTeachers(id: string, full = true): Promise<TeachersResponse> {
         return this.get<TeachersResponse>(`/${id}/teachers`, { full });
     }
 
+    async addTeacher(id: string, username: string): Promise<ClassResponse> {
+        return this.post<ClassResponse>(`/${id}/teachers`, { username });
+    }
+
+    async deleteTeacher(id: string, username: string): Promise<ClassResponse> {
+        return this.delete<ClassResponse>(`/${id}/teachers/${ username }`);
+    }
+
     async getTeacherInvitations(id: string, full = true): Promise<TeacherInvitationsResponse> {
         return this.get<TeacherInvitationsResponse>(`/${id}/teacher-invitations`, { full });
     }

From 048bba5c7e5c3a0c44d9caf6e1435d3813e34768 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Mon, 7 Apr 2025 17:35:20 +0200
Subject: [PATCH 090/177] feat: PUT in frontend controller voor assignment

---
 frontend/src/controllers/assignments.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/controllers/assignments.ts b/frontend/src/controllers/assignments.ts
index 59ea2428..a66f8e84 100644
--- a/frontend/src/controllers/assignments.ts
+++ b/frontend/src/controllers/assignments.ts
@@ -33,6 +33,10 @@ export class AssignmentController extends BaseController {
         return this.delete<AssignmentResponse>(`/${num}`);
     }
 
+    async updateAssignment(num: number, data: Partial<AssignmentDTO>): Promise<AssignmentResponse> {
+        return this.put<AssignmentResponse>(`/${num}`, data);
+    }
+
     async getSubmissions(assignmentNumber: number, full = true): Promise<SubmissionsResponse> {
         return this.get<SubmissionsResponse>(`/${assignmentNumber}/submissions`, { full });
     }

From 6a1f5ac4e8cecfdccfa3828ce771a740e9a99d1b Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Mon, 7 Apr 2025 17:36:09 +0200
Subject: [PATCH 091/177] feat: PUT voor frontend controller groups toegevoegd

---
 frontend/src/controllers/groups.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/controllers/groups.ts b/frontend/src/controllers/groups.ts
index 05192636..de6592b5 100644
--- a/frontend/src/controllers/groups.ts
+++ b/frontend/src/controllers/groups.ts
@@ -32,6 +32,10 @@ export class GroupController extends BaseController {
         return this.delete<GroupResponse>(`/${num}`);
     }
 
+    async updateGroup(num: number, data: Partial<GroupDTO>): Promise<GroupResponse> {
+        return this.put<GroupResponse>(`/${num}`, data);
+    }
+
     async getSubmissions(groupNumber: number, full = true): Promise<SubmissionsResponse> {
         return this.get<SubmissionsResponse>(`/${groupNumber}/submissions`, { full });
     }

From aea0c3c7c92f7d90d88ced0dbc1d27491d681b5c Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Mon, 7 Apr 2025 17:37:23 +0200
Subject: [PATCH 092/177] feat: PUT voor frontend controller classes toegevoegd

---
 frontend/src/controllers/classes.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts
index c6c80af0..4a349e85 100644
--- a/frontend/src/controllers/classes.ts
+++ b/frontend/src/controllers/classes.ts
@@ -42,6 +42,10 @@ export class ClassController extends BaseController {
         return this.delete<ClassResponse>(`/${id}`);
     }
 
+    async updateClass(id: string, data: Partial<ClassDTO>): Promise<ClassResponse> {
+        return this.put<ClassResponse>(`/${id}`, data);
+    }
+
     async getStudents(id: string, full = true): Promise<StudentsResponse> {
         return this.get<StudentsResponse>(`/${id}/students`, { full });
     }

From 3f74c3491fe5187c57470ccbb66afaf1c777fdf9 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Mon, 7 Apr 2025 15:40:04 +0000
Subject: [PATCH 093/177] style: fix linting issues met Prettier

---
 frontend/src/controllers/classes.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts
index 4a349e85..03e3f560 100644
--- a/frontend/src/controllers/classes.ts
+++ b/frontend/src/controllers/classes.ts
@@ -55,7 +55,7 @@ export class ClassController extends BaseController {
     }
 
     async deleteStudent(id: string, username: string): Promise<ClassResponse> {
-        return this.delete<ClassResponse>(`/${id}/students/${ username }`);
+        return this.delete<ClassResponse>(`/${id}/students/${username}`);
     }
 
     async getTeachers(id: string, full = true): Promise<TeachersResponse> {
@@ -67,7 +67,7 @@ export class ClassController extends BaseController {
     }
 
     async deleteTeacher(id: string, username: string): Promise<ClassResponse> {
-        return this.delete<ClassResponse>(`/${id}/teachers/${ username }`);
+        return this.delete<ClassResponse>(`/${id}/teachers/${username}`);
     }
 
     async getTeacherInvitations(id: string, full = true): Promise<TeacherInvitationsResponse> {

From c10fc8db17ec20635348bd4c35dcc49339362719 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Mon, 7 Apr 2025 15:57:31 +0000
Subject: [PATCH 094/177] style: fix linting issues met Prettier

---
 frontend/src/controllers/questions.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/controllers/questions.ts b/frontend/src/controllers/questions.ts
index 979ecb7c..60a51d1a 100644
--- a/frontend/src/controllers/questions.ts
+++ b/frontend/src/controllers/questions.ts
@@ -2,7 +2,6 @@ import type { QuestionData, QuestionDTO, QuestionId } from "@dwengo-1/common/int
 import { BaseController } from "@/controllers/base-controller.ts";
 import type { LearningObjectIdentifierDTO } from "@dwengo-1/common/interfaces/learning-content";
 
-
 export interface QuestionsResponse {
     questions: QuestionDTO[] | QuestionId[];
 }

From 9135b9c5b02f918fe131bd2023a3b7c338947dd0 Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Mon, 7 Apr 2025 19:23:46 +0200
Subject: [PATCH 095/177] feat(backend): Functionaliteit toegevoegd om alle
 submissions zichtbaar voor een bepaalde leerling of leerkracht op te vragen.

---
 .../data/assignments/assignment-repository.ts |  13 +
 .../data/assignments/submission-repository.ts |  25 ++
 .../src/entities/assignments/group.entity.ts  |   4 +-
 .../data/assignments/assignments.test.ts      |   7 +
 .../data/assignments/submissions.test.ts      |  82 ++++-
 .../assignments/assignments.testdata.ts       |  12 +-
 .../assignments/groups.testdata.ts            |   8 +-
 .../assignments/submission.testdata.ts        |  24 +-
 package-lock.json                             | 319 ++++++++++--------
 9 files changed, 338 insertions(+), 156 deletions(-)

diff --git a/backend/src/data/assignments/assignment-repository.ts b/backend/src/data/assignments/assignment-repository.ts
index 3de5031d..296e67fd 100644
--- a/backend/src/data/assignments/assignment-repository.ts
+++ b/backend/src/data/assignments/assignment-repository.ts
@@ -6,6 +6,19 @@ export class AssignmentRepository extends DwengoEntityRepository<Assignment> {
     public async findByClassAndId(within: Class, id: number): Promise<Assignment | null> {
         return this.findOne({ within: within, id: id });
     }
+    public async findAllByResponsibleTeacher(teacherUsername: string): Promise<Assignment[]> {
+        return this.findAll({
+            where: {
+                within: {
+                    teachers: {
+                        $some: {
+                            username: teacherUsername
+                        }
+                    }
+                }
+            }
+        });
+    }
     public async findAllAssignmentsInClass(within: Class): Promise<Assignment[]> {
         return this.findAll({ where: { within: within } });
     }
diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts
index f5ace213..0a14bb0d 100644
--- a/backend/src/data/assignments/submission-repository.ts
+++ b/backend/src/data/assignments/submission-repository.ts
@@ -3,6 +3,7 @@ import { Group } from '../../entities/assignments/group.entity.js';
 import { Submission } from '../../entities/assignments/submission.entity.js';
 import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js';
 import { Student } from '../../entities/users/student.entity.js';
+import {Assignment} from "../../entities/assignments/assignment.entity";
 
 export class SubmissionRepository extends DwengoEntityRepository<Submission> {
     public async findSubmissionByLearningObjectAndSubmissionNumber(
@@ -50,6 +51,30 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
         );
     }
 
+    public async findAllSubmissionsForAllGroupsOfStudent(studentUsername: string): Promise<Submission[]> {
+        return this.findAll({
+            where: {
+                onBehalfOf: {
+                    members: {
+                        $some: {
+                            username: studentUsername
+                        }
+                    },
+                }
+            }
+        });
+    }
+
+    public async findAllSubmissionsForAssignment(assignment: Assignment): Promise<Submission[]> {
+        return this.findAll({
+            where: {
+                onBehalfOf: {
+                    assignment
+                }
+            }
+        });
+    }
+
     public async findAllSubmissionsForStudent(student: Student): Promise<Submission[]> {
         return this.find(
             { submitter: student },
diff --git a/backend/src/entities/assignments/group.entity.ts b/backend/src/entities/assignments/group.entity.ts
index cfe21f7f..1a69ed4b 100644
--- a/backend/src/entities/assignments/group.entity.ts
+++ b/backend/src/entities/assignments/group.entity.ts
@@ -1,4 +1,4 @@
-import { Entity, ManyToMany, ManyToOne, PrimaryKey } from '@mikro-orm/core';
+import {Collection, Entity, ManyToMany, ManyToOne, PrimaryKey} from '@mikro-orm/core';
 import { Assignment } from './assignment.entity.js';
 import { Student } from '../users/student.entity.js';
 import { GroupRepository } from '../../data/assignments/group-repository.js';
@@ -19,5 +19,5 @@ export class Group {
     @ManyToMany({
         entity: () => Student,
     })
-    members!: Student[];
+    members!: Collection<Student>;
 }
diff --git a/backend/tests/data/assignments/assignments.test.ts b/backend/tests/data/assignments/assignments.test.ts
index c26fb5ba..f587e979 100644
--- a/backend/tests/data/assignments/assignments.test.ts
+++ b/backend/tests/data/assignments/assignments.test.ts
@@ -31,6 +31,13 @@ describe('AssignmentRepository', () => {
         expect(assignments[0].title).toBe('tool');
     });
 
+    it('should find all by username of the responsible teacher', async () => {
+        const result = await assignmentRepository.findAllByResponsibleTeacher("FooFighters")
+        const resultIds = result.map(it => it.id).sort();
+
+        expect(resultIds).toEqual([1, 3, 4]);
+    });
+
     it('should not find removed assignment', async () => {
         const class_ = await classRepository.findById('id01');
         await assignmentRepository.deleteByClassAndId(class_!, 3);
diff --git a/backend/tests/data/assignments/submissions.test.ts b/backend/tests/data/assignments/submissions.test.ts
index 85e1bc11..9d72c963 100644
--- a/backend/tests/data/assignments/submissions.test.ts
+++ b/backend/tests/data/assignments/submissions.test.ts
@@ -1,6 +1,6 @@
-import { beforeAll, describe, expect, it } from 'vitest';
-import { setupTestApp } from '../../setup-tests';
-import { SubmissionRepository } from '../../../src/data/assignments/submission-repository';
+import {beforeAll, describe, expect, it} from 'vitest';
+import {setupTestApp} from '../../setup-tests';
+import {SubmissionRepository} from '../../../src/data/assignments/submission-repository';
 import {
     getAssignmentRepository,
     getClassRepository,
@@ -8,12 +8,32 @@ import {
     getStudentRepository,
     getSubmissionRepository,
 } from '../../../src/data/repositories';
-import { LearningObjectIdentifier } from '../../../src/entities/content/learning-object-identifier';
-import { Language } from '@dwengo-1/common/util/language';
-import { StudentRepository } from '../../../src/data/users/student-repository';
-import { GroupRepository } from '../../../src/data/assignments/group-repository';
-import { AssignmentRepository } from '../../../src/data/assignments/assignment-repository';
-import { ClassRepository } from '../../../src/data/classes/class-repository';
+import {LearningObjectIdentifier} from '../../../src/entities/content/learning-object-identifier';
+import {Language} from '@dwengo-1/common/util/language';
+import {StudentRepository} from '../../../src/data/users/student-repository';
+import {GroupRepository} from '../../../src/data/assignments/group-repository';
+import {AssignmentRepository} from '../../../src/data/assignments/assignment-repository';
+import {ClassRepository} from '../../../src/data/classes/class-repository';
+import {Submission} from "../../../src/entities/assignments/submission.entity";
+
+export function checkSubmissionsForStudentNoordkaap(result: Submission[]) {
+    sortSubmissions(result);
+
+    expect(result[0].learningObjectHruid).toBe("id01");
+    expect(result[0].submissionNumber).toBe(2);
+
+    expect(result[1].learningObjectHruid).toBe("id02");
+    expect(result[1].submissionNumber).toBe(1);
+
+    expect(result[2].learningObjectHruid).toBe("id02");
+    expect(result[2].submissionNumber).toBe(2);
+
+    expect(result[3].learningObjectHruid).toBe("id03");
+    expect(result[3].submissionNumber).toBe(1);
+
+    expect(result[4].learningObjectHruid).toBe("id03");
+    expect(result[4].submissionNumber).toBe(2);
+}
 
 describe('SubmissionRepository', () => {
     let submissionRepository: SubmissionRepository;
@@ -59,6 +79,42 @@ describe('SubmissionRepository', () => {
         expect(submission?.submissionTime.getDate()).toBe(25);
     });
 
+    it('should find all submissions for all groups of a student', async () => {
+        const result = await submissionRepository.findAllSubmissionsForAllGroupsOfStudent("Noordkaap");
+        expect(result.length).toBe(5);
+
+        checkSubmissionsForStudentNoordkaap(result);
+    });
+
+    it('should find all submissions for a certain assignment', async () => {
+        const clazz = await classRepository.findById('id01');
+        const assignment = await assignmentRepository.findByClassAndId(clazz!, 1);
+        const result = await submissionRepository.findAllSubmissionsForAssignment(assignment!);
+
+        sortSubmissions(result);
+
+        expect(result).toHaveLength(5);
+
+        expect(result[0].learningObjectHruid).toBe("id01");
+        expect(result[0].submissionNumber).toBe(1);
+
+        expect(result[1].learningObjectHruid).toBe("id02");
+        expect(result[1].submissionNumber).toBe(1);
+
+        expect(result[2].learningObjectHruid).toBe("id02");
+        expect(result[2].submissionNumber).toBe(2);
+
+        expect(result[3].learningObjectHruid).toBe("id03");
+        expect(result[3].submissionNumber).toBe(1);
+
+        expect(result[4].learningObjectHruid).toBe("id03");
+        expect(result[4].submissionNumber).toBe(2);
+
+        // But not submission7 (id01, submission number: 3), since it was submitted for an assignment
+
+        sortSubmissions(result);
+    });
+
     it('should not find a deleted submission', async () => {
         const id = new LearningObjectIdentifier('id01', Language.English, 1);
         await submissionRepository.deleteSubmissionByLearningObjectAndSubmissionNumber(id, 1);
@@ -68,3 +124,11 @@ describe('SubmissionRepository', () => {
         expect(submission).toBeNull();
     });
 });
+
+function sortSubmissions(submissions: Submission[]) {
+    submissions.sort((a, b) => {
+        if (a.learningObjectHruid < b.learningObjectHruid) return -1;
+        if (a.learningObjectHruid > b.learningObjectHruid) return 1;
+        return a.submissionNumber! - b.submissionNumber!;
+    });
+}
diff --git a/backend/tests/test_assets/assignments/assignments.testdata.ts b/backend/tests/test_assets/assignments/assignments.testdata.ts
index b0da638f..14253c0a 100644
--- a/backend/tests/test_assets/assignments/assignments.testdata.ts
+++ b/backend/tests/test_assets/assignments/assignments.testdata.ts
@@ -34,5 +34,15 @@ export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assign
         groups: [],
     });
 
-    return [assignment01, assignment02, assignment03];
+    const assignment04 = em.create(Assignment, {
+        within: classes[0],
+        id: 4,
+        title: 'another assignment',
+        description: 'with a description',
+        learningPathHruid: 'id01',
+        learningPathLanguage: Language.English,
+        groups: [],
+    });
+
+    return [assignment01, assignment02, assignment03, assignment04];
 }
diff --git a/backend/tests/test_assets/assignments/groups.testdata.ts b/backend/tests/test_assets/assignments/groups.testdata.ts
index a8ff8380..761f0736 100644
--- a/backend/tests/test_assets/assignments/groups.testdata.ts
+++ b/backend/tests/test_assets/assignments/groups.testdata.ts
@@ -28,5 +28,11 @@ export function makeTestGroups(em: EntityManager, students: Student[], assignmen
         members: students.slice(3, 4),
     });
 
-    return [group01, group02, group03, group04];
+    const group05 = em.create(Group, {
+        assignment: assignments[3],
+        groupNumber: 1,
+        members: students.slice(0, 2),
+    });
+
+    return [group01, group02, group03, group04, group05];
 }
diff --git a/backend/tests/test_assets/assignments/submission.testdata.ts b/backend/tests/test_assets/assignments/submission.testdata.ts
index f6b49c6a..da77539a 100644
--- a/backend/tests/test_assets/assignments/submission.testdata.ts
+++ b/backend/tests/test_assets/assignments/submission.testdata.ts
@@ -60,5 +60,27 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         content: '',
     });
 
-    return [submission01, submission02, submission03, submission04, submission05];
+    const submission06 = em.create(Submission, {
+        learningObjectHruid: 'id01',
+        learningObjectLanguage: Language.English,
+        learningObjectVersion: 1,
+        submissionNumber: 2,
+        submitter: students[1],
+        submissionTime: new Date(2025, 2, 25),
+        onBehalfOf: groups[4],
+        content: '',
+    });
+
+    const submission07 = em.create(Submission, {
+        learningObjectHruid: 'id01',
+        learningObjectLanguage: Language.English,
+        learningObjectVersion: 1,
+        submissionNumber: 3,
+        submitter: students[3],
+        submissionTime: new Date(2025, 3, 25),
+        onBehalfOf: groups[3],
+        content: '',
+    });
+
+    return [submission01, submission02, submission03, submission04, submission05, submission06, submission07];
 }
diff --git a/package-lock.json b/package-lock.json
index 27d261cb..acf0fca0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -72,6 +72,133 @@
                 "vitest": "^3.0.6"
             }
         },
+        "backend/node_modules/@mikro-orm/cli": {
+            "version": "6.4.9",
+            "resolved": "https://registry.npmjs.org/@mikro-orm/cli/-/cli-6.4.9.tgz",
+            "integrity": "sha512-LQzVsmar/0DoJkPGyz3OpB8pa9BCQtvYreEC71h0O+RcizppJjgBQNTkj5tJd2Iqvh4hSaMv6qTv0l5UK6F2Vw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jercle/yargonaut": "1.1.5",
+                "@mikro-orm/core": "6.4.9",
+                "@mikro-orm/knex": "6.4.9",
+                "fs-extra": "11.3.0",
+                "tsconfig-paths": "4.2.0",
+                "yargs": "17.7.2"
+            },
+            "bin": {
+                "mikro-orm": "cli",
+                "mikro-orm-esm": "esm"
+            },
+            "engines": {
+                "node": ">= 18.12.0"
+            }
+        },
+        "backend/node_modules/@mikro-orm/core": {
+            "version": "6.4.9",
+            "resolved": "https://registry.npmjs.org/@mikro-orm/core/-/core-6.4.9.tgz",
+            "integrity": "sha512-osB2TbvSH4ZL1s62LCBQFAnxPqLycX5fakPHOoztudixqfbVD5QQydeGizJXMMh2zKP6vRCwIJy3MeSuFxPjHg==",
+            "license": "MIT",
+            "dependencies": {
+                "dataloader": "2.2.3",
+                "dotenv": "16.4.7",
+                "esprima": "4.0.1",
+                "fs-extra": "11.3.0",
+                "globby": "11.1.0",
+                "mikro-orm": "6.4.9",
+                "reflect-metadata": "0.2.2"
+            },
+            "engines": {
+                "node": ">= 18.12.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/b4nan"
+            }
+        },
+        "backend/node_modules/@mikro-orm/knex": {
+            "version": "6.4.9",
+            "resolved": "https://registry.npmjs.org/@mikro-orm/knex/-/knex-6.4.9.tgz",
+            "integrity": "sha512-iGXJfe/TziVOQsWuxMIqkOpurysWzQA6kj3+FDtOkHJAijZhqhjSBnfUVHHY/JzU9o0M0rgLrDVJFry/uEaJEA==",
+            "license": "MIT",
+            "dependencies": {
+                "fs-extra": "11.3.0",
+                "knex": "3.1.0",
+                "sqlstring": "2.3.3"
+            },
+            "engines": {
+                "node": ">= 18.12.0"
+            },
+            "peerDependencies": {
+                "@mikro-orm/core": "^6.0.0",
+                "better-sqlite3": "*",
+                "libsql": "*",
+                "mariadb": "*"
+            },
+            "peerDependenciesMeta": {
+                "better-sqlite3": {
+                    "optional": true
+                },
+                "libsql": {
+                    "optional": true
+                },
+                "mariadb": {
+                    "optional": true
+                }
+            }
+        },
+        "backend/node_modules/@mikro-orm/postgresql": {
+            "version": "6.4.9",
+            "resolved": "https://registry.npmjs.org/@mikro-orm/postgresql/-/postgresql-6.4.9.tgz",
+            "integrity": "sha512-ZdVVFAL/TSbzpEmChGdH0oUpy2KiHLjNIeItZHRQgInn1X9p0qx28VVDR78p8qgRGkQ3LquxGTkvmWI0w7qi3A==",
+            "license": "MIT",
+            "dependencies": {
+                "@mikro-orm/knex": "6.4.9",
+                "pg": "8.13.3",
+                "postgres-array": "3.0.4",
+                "postgres-date": "2.1.0",
+                "postgres-interval": "4.0.2"
+            },
+            "engines": {
+                "node": ">= 18.12.0"
+            },
+            "peerDependencies": {
+                "@mikro-orm/core": "^6.0.0"
+            }
+        },
+        "backend/node_modules/@mikro-orm/reflection": {
+            "version": "6.4.9",
+            "resolved": "https://registry.npmjs.org/@mikro-orm/reflection/-/reflection-6.4.9.tgz",
+            "integrity": "sha512-fgY7yLrcZm3J/8dv9reUC4PQo7C2muImU31jmzz1SxmNKPJFDJl7OzcDZlM5NOisXzsWUBrcNdCyuQiWViVc3A==",
+            "license": "MIT",
+            "dependencies": {
+                "globby": "11.1.0",
+                "ts-morph": "25.0.1"
+            },
+            "engines": {
+                "node": ">= 18.12.0"
+            },
+            "peerDependencies": {
+                "@mikro-orm/core": "^6.0.0"
+            }
+        },
+        "backend/node_modules/@mikro-orm/sqlite": {
+            "version": "6.4.9",
+            "resolved": "https://registry.npmjs.org/@mikro-orm/sqlite/-/sqlite-6.4.9.tgz",
+            "integrity": "sha512-O7Jy/5DrTWpJI/3qkhRJHl+OcECx1N625LHDODAAauOK3+MJB/bj80TrvQhe6d/CHZMmvxZ7m2GzaL1NulKxRw==",
+            "license": "MIT",
+            "dependencies": {
+                "@mikro-orm/knex": "6.4.9",
+                "fs-extra": "11.3.0",
+                "sqlite3": "5.1.7",
+                "sqlstring-sqlite": "0.1.1"
+            },
+            "engines": {
+                "node": ">= 18.12.0"
+            },
+            "peerDependencies": {
+                "@mikro-orm/core": "^6.0.0"
+            }
+        },
         "backend/node_modules/globals": {
             "version": "15.15.0",
             "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
@@ -85,6 +212,48 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "backend/node_modules/mikro-orm": {
+            "version": "6.4.9",
+            "resolved": "https://registry.npmjs.org/mikro-orm/-/mikro-orm-6.4.9.tgz",
+            "integrity": "sha512-XwVrWNT4NNwS6kHIKFNDfvy8L1eWcBBEHeTVzFFYcnb2ummATaLxqeVkNEmKA68jmdtfQdUmWBqGdbcIPwtL2Q==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 18.12.0"
+            }
+        },
+        "backend/node_modules/pg": {
+            "version": "8.13.3",
+            "resolved": "https://registry.npmjs.org/pg/-/pg-8.13.3.tgz",
+            "integrity": "sha512-P6tPt9jXbL9HVu/SSRERNYaYG++MjnscnegFh9pPHihfoBSujsrka0hyuymMzeJKFWrcG8wvCKy8rCe8e5nDUQ==",
+            "license": "MIT",
+            "dependencies": {
+                "pg-connection-string": "^2.7.0",
+                "pg-pool": "^3.7.1",
+                "pg-protocol": "^1.7.1",
+                "pg-types": "^2.1.0",
+                "pgpass": "1.x"
+            },
+            "engines": {
+                "node": ">= 8.0.0"
+            },
+            "optionalDependencies": {
+                "pg-cloudflare": "^1.1.1"
+            },
+            "peerDependencies": {
+                "pg-native": ">=3.0.1"
+            },
+            "peerDependenciesMeta": {
+                "pg-native": {
+                    "optional": true
+                }
+            }
+        },
+        "backend/node_modules/pg-connection-string": {
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.7.0.tgz",
+            "integrity": "sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA==",
+            "license": "MIT"
+        },
         "common": {
             "name": "@dwengo-1/common",
             "version": "0.1.1"
@@ -1816,133 +1985,6 @@
                 "jsep": "^0.4.0||^1.0.0"
             }
         },
-        "node_modules/@mikro-orm/cli": {
-            "version": "6.4.9",
-            "resolved": "https://registry.npmjs.org/@mikro-orm/cli/-/cli-6.4.9.tgz",
-            "integrity": "sha512-LQzVsmar/0DoJkPGyz3OpB8pa9BCQtvYreEC71h0O+RcizppJjgBQNTkj5tJd2Iqvh4hSaMv6qTv0l5UK6F2Vw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jercle/yargonaut": "1.1.5",
-                "@mikro-orm/core": "6.4.9",
-                "@mikro-orm/knex": "6.4.9",
-                "fs-extra": "11.3.0",
-                "tsconfig-paths": "4.2.0",
-                "yargs": "17.7.2"
-            },
-            "bin": {
-                "mikro-orm": "cli",
-                "mikro-orm-esm": "esm"
-            },
-            "engines": {
-                "node": ">= 18.12.0"
-            }
-        },
-        "node_modules/@mikro-orm/core": {
-            "version": "6.4.9",
-            "resolved": "https://registry.npmjs.org/@mikro-orm/core/-/core-6.4.9.tgz",
-            "integrity": "sha512-osB2TbvSH4ZL1s62LCBQFAnxPqLycX5fakPHOoztudixqfbVD5QQydeGizJXMMh2zKP6vRCwIJy3MeSuFxPjHg==",
-            "license": "MIT",
-            "dependencies": {
-                "dataloader": "2.2.3",
-                "dotenv": "16.4.7",
-                "esprima": "4.0.1",
-                "fs-extra": "11.3.0",
-                "globby": "11.1.0",
-                "mikro-orm": "6.4.9",
-                "reflect-metadata": "0.2.2"
-            },
-            "engines": {
-                "node": ">= 18.12.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/b4nan"
-            }
-        },
-        "node_modules/@mikro-orm/knex": {
-            "version": "6.4.9",
-            "resolved": "https://registry.npmjs.org/@mikro-orm/knex/-/knex-6.4.9.tgz",
-            "integrity": "sha512-iGXJfe/TziVOQsWuxMIqkOpurysWzQA6kj3+FDtOkHJAijZhqhjSBnfUVHHY/JzU9o0M0rgLrDVJFry/uEaJEA==",
-            "license": "MIT",
-            "dependencies": {
-                "fs-extra": "11.3.0",
-                "knex": "3.1.0",
-                "sqlstring": "2.3.3"
-            },
-            "engines": {
-                "node": ">= 18.12.0"
-            },
-            "peerDependencies": {
-                "@mikro-orm/core": "^6.0.0",
-                "better-sqlite3": "*",
-                "libsql": "*",
-                "mariadb": "*"
-            },
-            "peerDependenciesMeta": {
-                "better-sqlite3": {
-                    "optional": true
-                },
-                "libsql": {
-                    "optional": true
-                },
-                "mariadb": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@mikro-orm/postgresql": {
-            "version": "6.4.9",
-            "resolved": "https://registry.npmjs.org/@mikro-orm/postgresql/-/postgresql-6.4.9.tgz",
-            "integrity": "sha512-ZdVVFAL/TSbzpEmChGdH0oUpy2KiHLjNIeItZHRQgInn1X9p0qx28VVDR78p8qgRGkQ3LquxGTkvmWI0w7qi3A==",
-            "license": "MIT",
-            "dependencies": {
-                "@mikro-orm/knex": "6.4.9",
-                "pg": "8.13.3",
-                "postgres-array": "3.0.4",
-                "postgres-date": "2.1.0",
-                "postgres-interval": "4.0.2"
-            },
-            "engines": {
-                "node": ">= 18.12.0"
-            },
-            "peerDependencies": {
-                "@mikro-orm/core": "^6.0.0"
-            }
-        },
-        "node_modules/@mikro-orm/reflection": {
-            "version": "6.4.9",
-            "resolved": "https://registry.npmjs.org/@mikro-orm/reflection/-/reflection-6.4.9.tgz",
-            "integrity": "sha512-fgY7yLrcZm3J/8dv9reUC4PQo7C2muImU31jmzz1SxmNKPJFDJl7OzcDZlM5NOisXzsWUBrcNdCyuQiWViVc3A==",
-            "license": "MIT",
-            "dependencies": {
-                "globby": "11.1.0",
-                "ts-morph": "25.0.1"
-            },
-            "engines": {
-                "node": ">= 18.12.0"
-            },
-            "peerDependencies": {
-                "@mikro-orm/core": "^6.0.0"
-            }
-        },
-        "node_modules/@mikro-orm/sqlite": {
-            "version": "6.4.9",
-            "resolved": "https://registry.npmjs.org/@mikro-orm/sqlite/-/sqlite-6.4.9.tgz",
-            "integrity": "sha512-O7Jy/5DrTWpJI/3qkhRJHl+OcECx1N625LHDODAAauOK3+MJB/bj80TrvQhe6d/CHZMmvxZ7m2GzaL1NulKxRw==",
-            "license": "MIT",
-            "dependencies": {
-                "@mikro-orm/knex": "6.4.9",
-                "fs-extra": "11.3.0",
-                "sqlite3": "5.1.7",
-                "sqlstring-sqlite": "0.1.1"
-            },
-            "engines": {
-                "node": ">= 18.12.0"
-            },
-            "peerDependencies": {
-                "@mikro-orm/core": "^6.0.0"
-            }
-        },
         "node_modules/@napi-rs/snappy-android-arm-eabi": {
             "version": "7.2.2",
             "resolved": "https://registry.npmjs.org/@napi-rs/snappy-android-arm-eabi/-/snappy-android-arm-eabi-7.2.2.tgz",
@@ -7849,15 +7891,6 @@
                 "node": ">=8.6"
             }
         },
-        "node_modules/mikro-orm": {
-            "version": "6.4.9",
-            "resolved": "https://registry.npmjs.org/mikro-orm/-/mikro-orm-6.4.9.tgz",
-            "integrity": "sha512-XwVrWNT4NNwS6kHIKFNDfvy8L1eWcBBEHeTVzFFYcnb2ummATaLxqeVkNEmKA68jmdtfQdUmWBqGdbcIPwtL2Q==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 18.12.0"
-            }
-        },
         "node_modules/mime-db": {
             "version": "1.54.0",
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
@@ -8649,14 +8682,15 @@
             "license": "MIT"
         },
         "node_modules/pg": {
-            "version": "8.13.3",
-            "resolved": "https://registry.npmjs.org/pg/-/pg-8.13.3.tgz",
-            "integrity": "sha512-P6tPt9jXbL9HVu/SSRERNYaYG++MjnscnegFh9pPHihfoBSujsrka0hyuymMzeJKFWrcG8wvCKy8rCe8e5nDUQ==",
+            "version": "8.14.1",
+            "resolved": "https://registry.npmjs.org/pg/-/pg-8.14.1.tgz",
+            "integrity": "sha512-0TdbqfjwIun9Fm/r89oB7RFQ0bLgduAhiIqIXOsyKoiC/L54DbuAAzIEN/9Op0f1Po9X7iCPXGoa/Ah+2aI8Xw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "pg-connection-string": "^2.7.0",
-                "pg-pool": "^3.7.1",
-                "pg-protocol": "^1.7.1",
+                "pg-pool": "^3.8.0",
+                "pg-protocol": "^1.8.0",
                 "pg-types": "^2.1.0",
                 "pgpass": "1.x"
             },
@@ -8762,7 +8796,8 @@
             "version": "2.7.0",
             "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.7.0.tgz",
             "integrity": "sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/pgpass": {
             "version": "1.0.5",

From 64fd66a1deeb87b3cc40f8d6f3273cf6453fe23c Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Mon, 7 Apr 2025 21:48:28 +0200
Subject: [PATCH 096/177] feat(backend): Submissions kunnen nu per leerobject,
 assignment en optioneel groepslid opgevraagd worden

---
 .../data/assignments/submission-repository.ts | 36 +++++++-----
 .../data/assignments/submissions.test.ts      | 58 +++++++++++--------
 .../assignments/groups.testdata.ts            | 20 +++++++
 .../assignments/submission.testdata.ts        | 27 ++++++---
 4 files changed, 94 insertions(+), 47 deletions(-)

diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts
index 0a14bb0d..00cdac14 100644
--- a/backend/src/data/assignments/submission-repository.ts
+++ b/backend/src/data/assignments/submission-repository.ts
@@ -51,26 +51,32 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
         );
     }
 
-    public async findAllSubmissionsForAllGroupsOfStudent(studentUsername: string): Promise<Submission[]> {
-        return this.findAll({
-            where: {
-                onBehalfOf: {
-                    members: {
-                        $some: {
-                            username: studentUsername
-                        }
-                    },
+    /**
+     * Looks up all submissions for the given learning object which were submitted as part of the given assignment.
+     * When forStudentUsername is set, only the submissions of the given user's group are shown.
+     */
+    public async findAllSubmissionsForLearningObjectAndAssignment(
+        loId: LearningObjectIdentifier,
+        assignment: Assignment,
+        forStudentUsername?: string
+    ): Promise<Submission[]> {
+        let onBehalfOf = forStudentUsername ? {
+            assignment,
+            members: {
+                $some: {
+                    username: forStudentUsername
                 }
             }
-        });
-    }
+        } : {
+            assignment
+        };
 
-    public async findAllSubmissionsForAssignment(assignment: Assignment): Promise<Submission[]> {
         return this.findAll({
             where: {
-                onBehalfOf: {
-                    assignment
-                }
+                learningObjectHruid: loId.hruid,
+                learningObjectLanguage: loId.language,
+                learningObjectVersion: loId.version,
+                onBehalfOf
             }
         });
     }
diff --git a/backend/tests/data/assignments/submissions.test.ts b/backend/tests/data/assignments/submissions.test.ts
index 9d72c963..a723e86f 100644
--- a/backend/tests/data/assignments/submissions.test.ts
+++ b/backend/tests/data/assignments/submissions.test.ts
@@ -15,6 +15,8 @@ import {GroupRepository} from '../../../src/data/assignments/group-repository';
 import {AssignmentRepository} from '../../../src/data/assignments/assignment-repository';
 import {ClassRepository} from '../../../src/data/classes/class-repository';
 import {Submission} from "../../../src/entities/assignments/submission.entity";
+import {Class} from "../../../src/entities/classes/class.entity";
+import {Assignment} from "../../../src/entities/assignments/assignment.entity";
 
 export function checkSubmissionsForStudentNoordkaap(result: Submission[]) {
     sortSubmissions(result);
@@ -79,40 +81,48 @@ describe('SubmissionRepository', () => {
         expect(submission?.submissionTime.getDate()).toBe(25);
     });
 
-    it('should find all submissions for all groups of a student', async () => {
-        const result = await submissionRepository.findAllSubmissionsForAllGroupsOfStudent("Noordkaap");
-        expect(result.length).toBe(5);
-
-        checkSubmissionsForStudentNoordkaap(result);
-    });
-
-    it('should find all submissions for a certain assignment', async () => {
-        const clazz = await classRepository.findById('id01');
-        const assignment = await assignmentRepository.findByClassAndId(clazz!, 1);
-        const result = await submissionRepository.findAllSubmissionsForAssignment(assignment!);
-
+    let clazz: Class | null;
+    let assignment: Assignment | null;
+    let loId: LearningObjectIdentifier;
+    it('should find all submissions for a certain learning object and assignment', async () => {
+        clazz = await classRepository.findById('id01');
+        assignment = await assignmentRepository.findByClassAndId(clazz!, 1);
+        loId = {
+            hruid: "id02",
+            language: Language.English,
+            version: 1
+        };
+        const result = await submissionRepository.findAllSubmissionsForLearningObjectAndAssignment(loId, assignment!);
         sortSubmissions(result);
 
-        expect(result).toHaveLength(5);
+        expect(result).toHaveLength(3);
 
-        expect(result[0].learningObjectHruid).toBe("id01");
+        // submission3 should be found (for learning object 'id02' by group #1 for Assignment #1 in class 'id01')
+        expect(result[0].learningObjectHruid).toBe(loId.hruid);
         expect(result[0].submissionNumber).toBe(1);
 
-        expect(result[1].learningObjectHruid).toBe("id02");
-        expect(result[1].submissionNumber).toBe(1);
+        // submission4 should be found (for learning object 'id02' by group #1 for Assignment #1 in class 'id01')
+        expect(result[1].learningObjectHruid).toBe(loId.hruid);
+        expect(result[1].submissionNumber).toBe(2);
 
-        expect(result[2].learningObjectHruid).toBe("id02");
-        expect(result[2].submissionNumber).toBe(2);
+        // submission8 should be found (for learning object 'id02' by group #2 for Assignment #1 in class 'id01')
+        expect(result[2].learningObjectHruid).toBe(loId.hruid);
+        expect(result[2].submissionNumber).toBe(3);
+    });
 
-        expect(result[3].learningObjectHruid).toBe("id03");
-        expect(result[3].submissionNumber).toBe(1);
+    it("should find only the submissions for a certain learning object and assignment made for the user's group", async () => {
+        const result =
+            await submissionRepository.findAllSubmissionsForLearningObjectAndAssignment(loId, assignment!, "Tool");
+        // (student Tool is in group #2)
 
-        expect(result[4].learningObjectHruid).toBe("id03");
-        expect(result[4].submissionNumber).toBe(2);
+        expect(result).toHaveLength(1);
 
-        // But not submission7 (id01, submission number: 3), since it was submitted for an assignment
+        // submission8 should be found (for learning object 'id02' by group #2 for Assignment #1 in class 'id01')
+        expect(result[0].learningObjectHruid).toBe(loId.hruid);
+        expect(result[0].submissionNumber).toBe(3);
 
-        sortSubmissions(result);
+        // The other submissions found in the previous test case should not be found anymore as they were made on
+        // behalf of group #1 which Tool is no member of.
     });
 
     it('should not find a deleted submission', async () => {
diff --git a/backend/tests/test_assets/assignments/groups.testdata.ts b/backend/tests/test_assets/assignments/groups.testdata.ts
index 761f0736..c82887bb 100644
--- a/backend/tests/test_assets/assignments/groups.testdata.ts
+++ b/backend/tests/test_assets/assignments/groups.testdata.ts
@@ -4,30 +4,50 @@ import { Assignment } from '../../../src/entities/assignments/assignment.entity'
 import { Student } from '../../../src/entities/users/student.entity';
 
 export function makeTestGroups(em: EntityManager, students: Student[], assignments: Assignment[]): Group[] {
+    /*
+     * Group #1 for Assignment #1 in class 'id01'
+     * => Assigned to do learning path 'id02'
+     */
     const group01 = em.create(Group, {
         assignment: assignments[0],
         groupNumber: 1,
         members: students.slice(0, 2),
     });
 
+    /*
+     * Group #2 for Assignment #1 in class 'id01'
+     * => Assigned to do learning path 'id02'
+     */
     const group02 = em.create(Group, {
         assignment: assignments[0],
         groupNumber: 2,
         members: students.slice(2, 4),
     });
 
+    /*
+     * Group #3 for Assignment #1 in class 'id01'
+     * => Assigned to do learning path 'id02'
+     */
     const group03 = em.create(Group, {
         assignment: assignments[0],
         groupNumber: 3,
         members: students.slice(4, 6),
     });
 
+    /*
+     * Group #4 for Assignment #2 in class 'id02'
+     * => Assigned to do learning path 'id01'
+     */
     const group04 = em.create(Group, {
         assignment: assignments[1],
         groupNumber: 4,
         members: students.slice(3, 4),
     });
 
+    /*
+     * Group #5 for Assignment #4 in class 'id01'
+     * => Assigned to do learning path 'id01'
+     */
     const group05 = em.create(Group, {
         assignment: assignments[3],
         groupNumber: 1,
diff --git a/backend/tests/test_assets/assignments/submission.testdata.ts b/backend/tests/test_assets/assignments/submission.testdata.ts
index da77539a..812d1289 100644
--- a/backend/tests/test_assets/assignments/submission.testdata.ts
+++ b/backend/tests/test_assets/assignments/submission.testdata.ts
@@ -12,7 +12,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 1,
         submitter: students[0],
         submissionTime: new Date(2025, 2, 20),
-        onBehalfOf: groups[0],
+        onBehalfOf: groups[0], // group #1 for Assignment #1 in class 'id01'
         content: 'sub1',
     });
 
@@ -23,7 +23,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 2,
         submitter: students[0],
         submissionTime: new Date(2025, 2, 25),
-        onBehalfOf: groups[0],
+        onBehalfOf: groups[0], // group #1 for Assignment #1 in class 'id01'
         content: '',
     });
 
@@ -34,7 +34,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 1,
         submitter: students[0],
         submissionTime: new Date(2025, 2, 20),
-        onBehalfOf: groups[0],
+        onBehalfOf: groups[0], // group #1 for Assignment #1 in class 'id01'
         content: '',
     });
 
@@ -45,7 +45,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 2,
         submitter: students[0],
         submissionTime: new Date(2025, 2, 25),
-        onBehalfOf: groups[0],
+        onBehalfOf: groups[0], // group #1 for Assignment #1 in class 'id01'
         content: '',
     });
 
@@ -56,7 +56,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 1,
         submitter: students[1],
         submissionTime: new Date(2025, 2, 20),
-        onBehalfOf: groups[1],
+        onBehalfOf: groups[1], // Group #2 for Assignment #1 in class 'id01'
         content: '',
     });
 
@@ -67,7 +67,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 2,
         submitter: students[1],
         submissionTime: new Date(2025, 2, 25),
-        onBehalfOf: groups[4],
+        onBehalfOf: groups[4], // Group #5 for Assignment #4 in class 'id01'
         content: '',
     });
 
@@ -78,9 +78,20 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 3,
         submitter: students[3],
         submissionTime: new Date(2025, 3, 25),
-        onBehalfOf: groups[3],
+        onBehalfOf: groups[3], // Group #4 for Assignment #2 in class 'id02'
         content: '',
     });
 
-    return [submission01, submission02, submission03, submission04, submission05, submission06, submission07];
+    const submission08 = em.create(Submission, {
+        learningObjectHruid: 'id02',
+        learningObjectLanguage: Language.English,
+        learningObjectVersion: 1,
+        submissionNumber: 3,
+        submitter: students[1],
+        submissionTime: new Date(2025, 4, 7),
+        onBehalfOf: groups[1], // Group #2 for Assignment #1 in class 'id01'
+        content: '',
+    });
+
+    return [submission01, submission02, submission03, submission04, submission05, submission06, submission07, submission08];
 }

From 12d21f3c49c59b9207956f361ef0a541215d1b1f Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Mon, 7 Apr 2025 23:48:35 +0200
Subject: [PATCH 097/177] fix: check student in klas, conflict error

---
 backend/src/services/students.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/src/services/students.ts b/backend/src/services/students.ts
index dc40e468..a8300db5 100644
--- a/backend/src/services/students.ts
+++ b/backend/src/services/students.ts
@@ -23,6 +23,8 @@ import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request';
+import {BadRequestException} from "../exceptions/bad-request-exception";
+import {ConflictException} from "../exceptions/conflict-exception";
 
 export async function getAllStudents(full: boolean): Promise<StudentDTO[] | string[]> {
     const studentRepository = getStudentRepository();
@@ -135,6 +137,10 @@ export async function createClassJoinRequest(username: string, classId: string):
     const student = await fetchStudent(username); // Throws error if student not found
     const cls = await fetchClass(classId);
 
+    if (cls.students.contains(student)) {
+        throw new ConflictException("Student already in this class");
+    }
+
     const request = mapToStudentRequest(student, cls);
     await requestRepo.save(request, { preventOverwrite: true });
     return mapToStudentRequestDTO(request);

From 7887a5aec42bb8cea6c356838148d38a79339bfd Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Mon, 7 Apr 2025 23:49:15 +0200
Subject: [PATCH 098/177] fix: voeg student toe aan klas indien leeraar accept

---
 backend/src/services/teachers.ts | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts
index 3ebc6609..4e67d27d 100644
--- a/backend/src/services/teachers.ts
+++ b/backend/src/services/teachers.ts
@@ -22,13 +22,15 @@ import { Question } from '../entities/questions/question.entity.js';
 import { ClassJoinRequestRepository } from '../data/classes/class-join-request-repository.js';
 import { Student } from '../entities/users/student.entity.js';
 import { NotFoundException } from '../exceptions/not-found-exception.js';
-import { getClassStudents, getClassStudentsDTO } from './classes.js';
+import {addClassStudent, fetchClass, getClassStudents, getClassStudentsDTO} from './classes.js';
 import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher';
 import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 import { StudentDTO } from '@dwengo-1/common/interfaces/student';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request';
 import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request';
+import {BadRequestException} from "../exceptions/bad-request-exception";
+import {ConflictException} from "../exceptions/conflict-exception";
 
 export async function getAllTeachers(full: boolean): Promise<TeacherDTO[] | string[]> {
     const teacherRepository: TeacherRepository = getTeacherRepository();
@@ -145,13 +147,12 @@ export async function getJoinRequestsByClass(classId: string): Promise<ClassJoin
 
 export async function updateClassJoinRequestStatus(studentUsername: string, classId: string, accepted = true): Promise<ClassJoinRequestDTO> {
     const requestRepo: ClassJoinRequestRepository = getClassJoinRequestRepository();
-    const classRepo: ClassRepository = getClassRepository();
 
     const student: Student = await fetchStudent(studentUsername);
-    const cls: Class | null = await classRepo.findById(classId);
+    const cls = await fetchClass(classId);
 
-    if (!cls) {
-        throw new NotFoundException('Class not found');
+    if (cls.students.contains(student)) {
+        throw new ConflictException("Student already in this class");
     }
 
     const request: ClassJoinRequest | null = await requestRepo.findByStudentAndClass(student, cls);
@@ -160,8 +161,14 @@ export async function updateClassJoinRequestStatus(studentUsername: string, clas
         throw new NotFoundException('Join request not found');
     }
 
-    request.status = accepted ? ClassJoinRequestStatus.Accepted : ClassJoinRequestStatus.Declined;
+    request.status = ClassJoinRequestStatus.Declined;
+
+    if (accepted){
+        request.status = ClassJoinRequestStatus.Accepted;
+        await addClassStudent(classId, studentUsername);
+    }
 
     await requestRepo.save(request);
+
     return mapToStudentRequestDTO(request);
 }

From 65bce19fcf48b46c4b1ec5da145e65b4b5af18d1 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Mon, 7 Apr 2025 23:49:35 +0200
Subject: [PATCH 099/177] fix: query naar param

---
 backend/src/controllers/teachers.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend/src/controllers/teachers.ts b/backend/src/controllers/teachers.ts
index 9275ca92..c8063f80 100644
--- a/backend/src/controllers/teachers.ts
+++ b/backend/src/controllers/teachers.ts
@@ -81,16 +81,15 @@ export async function getTeacherQuestionHandler(req: Request, res: Response): Pr
 }
 
 export async function getStudentJoinRequestHandler(req: Request, res: Response): Promise<void> {
-    const username = req.query.username as string;
     const classId = req.params.classId;
-    requireFields({ username, classId });
+    requireFields({ classId });
 
     const joinRequests = await getJoinRequestsByClass(classId);
     res.json({ joinRequests });
 }
 
 export async function updateStudentJoinRequestHandler(req: Request, res: Response): Promise<void> {
-    const studentUsername = req.query.studentUsername as string;
+    const studentUsername = req.params.studentUsername;
     const classId = req.params.classId;
     const accepted = req.body.accepted !== 'false'; // Default = true
     requireFields({ studentUsername, classId });

From c7155fb438d0a88e5bb252f37ced08158c8a82cd Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Mon, 7 Apr 2025 23:50:27 +0200
Subject: [PATCH 100/177] feat: extra tests op nieuwe func student en teacher

---
 backend/tests/controllers/students.test.ts | 35 +++++++++++++---------
 backend/tests/controllers/teachers.test.ts | 13 ++++++--
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/backend/tests/controllers/students.test.ts b/backend/tests/controllers/students.test.ts
index 93f35c48..7bb07f8c 100644
--- a/backend/tests/controllers/students.test.ts
+++ b/backend/tests/controllers/students.test.ts
@@ -198,15 +198,34 @@ describe('Student controllers', () => {
         );
     });
 
-    it('Create join request', async () => {
+    it('Create and delete join request', async () => {
         req = {
-            params: { username: 'Noordkaap' },
+            params: { username: 'TheDoors' },
             body: { classId: 'id02' },
         };
 
         await createStudentRequestHandler(req as Request, res as Response);
 
         expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ request: expect.anything() }));
+
+        req = {
+            params: { username: 'TheDoors', classId: 'id02' },
+        };
+
+        await deleteClassJoinRequestHandler(req as Request, res as Response);
+
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ request: expect.anything() }));
+
+        await expect(async () => deleteClassJoinRequestHandler(req as Request, res as Response)).rejects.toThrow(NotFoundException);
+    });
+
+    it('Create join request student already in class error', async () => {
+        req = {
+            params: { username: 'Noordkaap' },
+            body: { classId: 'id02' },
+        };
+
+        await expect(async () => createStudentRequestHandler(req as Request, res as Response)).rejects.toThrow(ConflictException);
     });
 
     it('Create join request duplicate', async () => {
@@ -217,16 +236,4 @@ describe('Student controllers', () => {
 
         await expect(async () => createStudentRequestHandler(req as Request, res as Response)).rejects.toThrow(ConflictException);
     });
-
-    it('Delete join request', async () => {
-        req = {
-            params: { username: 'Noordkaap', classId: 'id02' },
-        };
-
-        await deleteClassJoinRequestHandler(req as Request, res as Response);
-
-        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ request: expect.anything() }));
-
-        await expect(async () => deleteClassJoinRequestHandler(req as Request, res as Response)).rejects.toThrow(NotFoundException);
-    });
 });
diff --git a/backend/tests/controllers/teachers.test.ts b/backend/tests/controllers/teachers.test.ts
index bee23987..21533876 100644
--- a/backend/tests/controllers/teachers.test.ts
+++ b/backend/tests/controllers/teachers.test.ts
@@ -16,6 +16,7 @@ import { BadRequestException } from '../../src/exceptions/bad-request-exception.
 import { EntityAlreadyExistsException } from '../../src/exceptions/entity-already-exists-exception.js';
 import { getStudentRequestsHandler } from '../../src/controllers/students.js';
 import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher';
+import {getClassHandler} from "../../src/controllers/classes";
 
 describe('Teacher controllers', () => {
     let req: Partial<Request>;
@@ -168,7 +169,6 @@ describe('Teacher controllers', () => {
 
     it('Get join requests by class', async () => {
         req = {
-            query: { username: 'LimpBizkit' },
             params: { classId: 'id02' },
         };
 
@@ -183,8 +183,7 @@ describe('Teacher controllers', () => {
 
     it('Update join request status', async () => {
         req = {
-            query: { username: 'LimpBizkit', studentUsername: 'PinkFloyd' },
-            params: { classId: 'id02' },
+            params: { classId: 'id02', studentUsername: 'PinkFloyd'},
             body: { accepted: 'true' },
         };
 
@@ -200,5 +199,13 @@ describe('Teacher controllers', () => {
 
         const status: boolean = jsonMock.mock.lastCall?.[0].requests[0].status;
         expect(status).toBeTruthy();
+
+        req = {
+            params: { id: 'id02' }
+        }
+
+        await getClassHandler(req as Request, res as Response);
+        const students: string[] = jsonMock.mock.lastCall?.[0].class.students;
+        expect(students).contains("PinkFloyd");
     });
 });

From 1dce9c65c64cc97c9b8db608cd3a4e33ff4b18e9 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Mon, 7 Apr 2025 22:00:34 +0000
Subject: [PATCH 101/177] style: fix linting issues met Prettier

---
 backend/src/services/students.ts           |  6 +++---
 backend/src/services/teachers.ts           | 10 +++++-----
 backend/tests/controllers/teachers.test.ts | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/src/services/students.ts b/backend/src/services/students.ts
index a8300db5..5fc3427f 100644
--- a/backend/src/services/students.ts
+++ b/backend/src/services/students.ts
@@ -23,8 +23,8 @@ import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request';
-import {BadRequestException} from "../exceptions/bad-request-exception";
-import {ConflictException} from "../exceptions/conflict-exception";
+import { BadRequestException } from '../exceptions/bad-request-exception';
+import { ConflictException } from '../exceptions/conflict-exception';
 
 export async function getAllStudents(full: boolean): Promise<StudentDTO[] | string[]> {
     const studentRepository = getStudentRepository();
@@ -138,7 +138,7 @@ export async function createClassJoinRequest(username: string, classId: string):
     const cls = await fetchClass(classId);
 
     if (cls.students.contains(student)) {
-        throw new ConflictException("Student already in this class");
+        throw new ConflictException('Student already in this class');
     }
 
     const request = mapToStudentRequest(student, cls);
diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts
index 4e67d27d..4973ce81 100644
--- a/backend/src/services/teachers.ts
+++ b/backend/src/services/teachers.ts
@@ -22,15 +22,15 @@ import { Question } from '../entities/questions/question.entity.js';
 import { ClassJoinRequestRepository } from '../data/classes/class-join-request-repository.js';
 import { Student } from '../entities/users/student.entity.js';
 import { NotFoundException } from '../exceptions/not-found-exception.js';
-import {addClassStudent, fetchClass, getClassStudents, getClassStudentsDTO} from './classes.js';
+import { addClassStudent, fetchClass, getClassStudents, getClassStudentsDTO } from './classes.js';
 import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher';
 import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 import { StudentDTO } from '@dwengo-1/common/interfaces/student';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request';
 import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request';
-import {BadRequestException} from "../exceptions/bad-request-exception";
-import {ConflictException} from "../exceptions/conflict-exception";
+import { BadRequestException } from '../exceptions/bad-request-exception';
+import { ConflictException } from '../exceptions/conflict-exception';
 
 export async function getAllTeachers(full: boolean): Promise<TeacherDTO[] | string[]> {
     const teacherRepository: TeacherRepository = getTeacherRepository();
@@ -152,7 +152,7 @@ export async function updateClassJoinRequestStatus(studentUsername: string, clas
     const cls = await fetchClass(classId);
 
     if (cls.students.contains(student)) {
-        throw new ConflictException("Student already in this class");
+        throw new ConflictException('Student already in this class');
     }
 
     const request: ClassJoinRequest | null = await requestRepo.findByStudentAndClass(student, cls);
@@ -163,7 +163,7 @@ export async function updateClassJoinRequestStatus(studentUsername: string, clas
 
     request.status = ClassJoinRequestStatus.Declined;
 
-    if (accepted){
+    if (accepted) {
         request.status = ClassJoinRequestStatus.Accepted;
         await addClassStudent(classId, studentUsername);
     }
diff --git a/backend/tests/controllers/teachers.test.ts b/backend/tests/controllers/teachers.test.ts
index 21533876..c29ecbb3 100644
--- a/backend/tests/controllers/teachers.test.ts
+++ b/backend/tests/controllers/teachers.test.ts
@@ -16,7 +16,7 @@ import { BadRequestException } from '../../src/exceptions/bad-request-exception.
 import { EntityAlreadyExistsException } from '../../src/exceptions/entity-already-exists-exception.js';
 import { getStudentRequestsHandler } from '../../src/controllers/students.js';
 import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher';
-import {getClassHandler} from "../../src/controllers/classes";
+import { getClassHandler } from '../../src/controllers/classes';
 
 describe('Teacher controllers', () => {
     let req: Partial<Request>;
@@ -183,7 +183,7 @@ describe('Teacher controllers', () => {
 
     it('Update join request status', async () => {
         req = {
-            params: { classId: 'id02', studentUsername: 'PinkFloyd'},
+            params: { classId: 'id02', studentUsername: 'PinkFloyd' },
             body: { accepted: 'true' },
         };
 
@@ -201,11 +201,11 @@ describe('Teacher controllers', () => {
         expect(status).toBeTruthy();
 
         req = {
-            params: { id: 'id02' }
-        }
+            params: { id: 'id02' },
+        };
 
         await getClassHandler(req as Request, res as Response);
         const students: string[] = jsonMock.mock.lastCall?.[0].class.students;
-        expect(students).contains("PinkFloyd");
+        expect(students).contains('PinkFloyd');
     });
 });

From c863dc627ff1fec33152aff8450e2c5882746fef Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Tue, 8 Apr 2025 00:26:59 +0200
Subject: [PATCH 102/177] feat(backend): Vragen kunnen nu per leerobject,
 assignment en optioneel groepslid opgevraagd worden

---
 backend/src/controllers/questions.ts          | 74 ++++++++++++++++---
 backend/src/controllers/submissions.ts        | 34 ++++++++-
 .../data/assignments/assignment-repository.ts |  3 +
 .../src/data/questions/question-repository.ts | 31 ++++++++
 backend/src/routes/submissions.ts             | 13 ++--
 backend/src/services/questions.ts             | 25 ++++++-
 backend/src/services/submissions.ts           | 23 +++++-
 7 files changed, 181 insertions(+), 22 deletions(-)

diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts
index 54b50fa9..da1d020e 100644
--- a/backend/src/controllers/questions.ts
+++ b/backend/src/controllers/questions.ts
@@ -1,11 +1,28 @@
 import { Request, Response } from 'express';
-import { createQuestion, deleteQuestion, getAllQuestions, getAnswersByQuestion, getQuestion } from '../services/questions.js';
+import {
+    createQuestion,
+    deleteQuestion,
+    getAllQuestions,
+    getAnswersByQuestion,
+    getQuestion,
+    getQuestionsAboutLearningObjectInAssignment
+} from '../services/questions.js';
 import { FALLBACK_LANG, FALLBACK_SEQ_NUM } from '../config.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { Language } from '@dwengo-1/common/util/language';
+import {AnswerDTO, AnswerId} from "@dwengo-1/common/interfaces/answer";
 
-function getObjectId(req: Request, res: Response): LearningObjectIdentifier | null {
+interface QuestionPathParams {
+    hruid: string;
+    version: string;
+}
+
+interface QuestionQueryParams {
+    lang: string;
+}
+
+function getObjectId(req: Request<QuestionPathParams, any, any, QuestionQueryParams>, res: Response): LearningObjectIdentifier | null {
     const { hruid, version } = req.params;
     const lang = req.query.lang;
 
@@ -21,7 +38,10 @@ function getObjectId(req: Request, res: Response): LearningObjectIdentifier | nu
     };
 }
 
-function getQuestionId(req: Request, res: Response): QuestionId | null {
+interface GetQuestionIdPathParams extends QuestionPathParams {
+    seq: string;
+}
+function getQuestionId(req: Request<GetQuestionIdPathParams, any, any, QuestionQueryParams>, res: Response): QuestionId | null {
     const seq = req.params.seq;
     const learningObjectIdentifier = getObjectId(req, res);
 
@@ -35,15 +55,35 @@ function getQuestionId(req: Request, res: Response): QuestionId | null {
     };
 }
 
-export async function getAllQuestionsHandler(req: Request, res: Response): Promise<void> {
+interface GetAllQuestionsQueryParams extends QuestionQueryParams {
+    classId?: string,
+    assignmentId?: number,
+    forStudent?: string,
+    full?: boolean
+}
+
+export async function getAllQuestionsHandler(
+    req: Request<QuestionPathParams, QuestionDTO[] | QuestionId[], unknown, GetAllQuestionsQueryParams>,
+    res: Response
+): Promise<void> {
     const objectId = getObjectId(req, res);
-    const full = req.query.full === 'true';
+    const full = req.query.full;
 
     if (!objectId) {
         return;
     }
-
-    const questions = await getAllQuestions(objectId, full);
+    let questions: QuestionDTO[] | QuestionId[];
+    if (req.query.classId && req.query.assignmentId) {
+        questions = await getQuestionsAboutLearningObjectInAssignment(
+            objectId,
+            req.query.classId,
+            req.query.assignmentId,
+            full ?? false,
+            req.query.forStudent
+        );
+    } else {
+        questions = await getAllQuestions(objectId, full ?? false);
+    }
 
     if (!questions) {
         res.status(404).json({ error: `Questions not found.` });
@@ -52,7 +92,10 @@ export async function getAllQuestionsHandler(req: Request, res: Response): Promi
     }
 }
 
-export async function getQuestionHandler(req: Request, res: Response): Promise<void> {
+export async function getQuestionHandler(
+    req: Request<GetQuestionIdPathParams, QuestionDTO[] | QuestionId[], unknown, QuestionQueryParams>,
+    res: Response
+): Promise<void> {
     const questionId = getQuestionId(req, res);
 
     if (!questionId) {
@@ -68,9 +111,15 @@ export async function getQuestionHandler(req: Request, res: Response): Promise<v
     }
 }
 
-export async function getQuestionAnswersHandler(req: Request, res: Response): Promise<void> {
+interface GetQuestionAnswersQueryParams extends QuestionQueryParams {
+    full: boolean
+}
+export async function getQuestionAnswersHandler(
+    req: Request<GetQuestionIdPathParams, {answers: AnswerDTO[] | AnswerId[]}, unknown, GetQuestionAnswersQueryParams>,
+    res: Response
+): Promise<void> {
     const questionId = getQuestionId(req, res);
-    const full = req.query.full === 'true';
+    const full = req.query.full;
 
     if (!questionId) {
         return;
@@ -102,7 +151,10 @@ export async function createQuestionHandler(req: Request, res: Response): Promis
     }
 }
 
-export async function deleteQuestionHandler(req: Request, res: Response): Promise<void> {
+export async function deleteQuestionHandler(
+    req: Request<GetQuestionIdPathParams, QuestionDTO, unknown, QuestionQueryParams>,
+    res: Response
+): Promise<void> {
     const questionId = getQuestionId(req, res);
 
     if (!questionId) {
diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts
index 239eb6d7..3a5aa391 100644
--- a/backend/src/controllers/submissions.ts
+++ b/backend/src/controllers/submissions.ts
@@ -1,13 +1,45 @@
 import { Request, Response } from 'express';
-import { createSubmission, deleteSubmission, getSubmission } from '../services/submissions.js';
+import {
+    createSubmission,
+    deleteSubmission,
+    getSubmission,
+    getSubmissionsForLearningObjectAndAssignment
+} from '../services/submissions.js';
 import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
 import { Language, languageMap } from '@dwengo-1/common/util/language';
+import {Submission} from "../entities/assignments/submission.entity";
 
 interface SubmissionParams {
     hruid: string;
     id: number;
 }
 
+interface SubmissionQuery {
+    language: string,
+    version: number;
+}
+
+interface SubmissionsQuery extends SubmissionQuery {
+    classId: string,
+    assignmentId: number,
+    studentUsername?: string
+}
+
+export async function getSubmissionsHandler(
+    req: Request<SubmissionParams, Submission[], null, SubmissionsQuery>,
+    res: Response
+): Promise<void> {
+    const loHruid = req.params.hruid;
+    const lang = languageMap[req.query.language as string] || Language.Dutch;
+    const version = (req.query.version || 1) as number;
+
+    const submissions = await getSubmissionsForLearningObjectAndAssignment(
+        loHruid, lang, version, req.query.classId, req.query.assignmentId
+    );
+
+    res.json(submissions);
+}
+
 export async function getSubmissionHandler(req: Request<SubmissionParams>, res: Response): Promise<void> {
     const lohruid = req.params.hruid;
     const submissionNumber = Number(req.params.id);
diff --git a/backend/src/data/assignments/assignment-repository.ts b/backend/src/data/assignments/assignment-repository.ts
index 296e67fd..c6766af9 100644
--- a/backend/src/data/assignments/assignment-repository.ts
+++ b/backend/src/data/assignments/assignment-repository.ts
@@ -6,6 +6,9 @@ export class AssignmentRepository extends DwengoEntityRepository<Assignment> {
     public async findByClassAndId(within: Class, id: number): Promise<Assignment | null> {
         return this.findOne({ within: within, id: id });
     }
+    public async findByClassIdAndAssignmentId(withinClass: string, id: number): Promise<Assignment | null> {
+        return this.findOne({ within: { classId: withinClass }, id: id });
+    }
     public async findAllByResponsibleTeacher(teacherUsername: string): Promise<Assignment[]> {
         return this.findAll({
             where: {
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 51df5afe..f36b1074 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -4,6 +4,7 @@ import { LearningObjectIdentifier } from '../../entities/content/learning-object
 import { Student } from '../../entities/users/student.entity.js';
 import { LearningObject } from '../../entities/content/learning-object.entity.js';
 import {Group} from "../../entities/assignments/group.entity";
+import {Assignment} from "../../entities/assignments/assignment.entity";
 
 export class QuestionRepository extends DwengoEntityRepository<Question> {
     public async createQuestion(question: { loId: LearningObjectIdentifier; author: Student; inGroup: Group, content: string }): Promise<Question> {
@@ -64,4 +65,34 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
             orderBy: { timestamp: 'DESC' }, // New to old
         });
     }
+
+    /**
+     * Looks up all questions for the given learning object which were asked as part of the given assignment.
+     * When forStudentUsername is set, only the questions within the given user's group are shown.
+     */
+    public async findAllQuestionsAboutLearningObjectInAssignment(
+        loId: LearningObjectIdentifier,
+        assignment: Assignment,
+        forStudentUsername?: string
+    ): Promise<Question[]> {
+        let inGroup = forStudentUsername ? {
+            assignment,
+            members: {
+                $some: {
+                    username: forStudentUsername
+                }
+            }
+        } : {
+            assignment
+        };
+
+        return this.findAll({
+            where: {
+                learningObjectHruid: loId.hruid,
+                learningObjectLanguage: loId.language,
+                learningObjectVersion: loId.version,
+                inGroup
+            }
+        });
+    }
 }
diff --git a/backend/src/routes/submissions.ts b/backend/src/routes/submissions.ts
index 8e9831b9..930e1a59 100644
--- a/backend/src/routes/submissions.ts
+++ b/backend/src/routes/submissions.ts
@@ -1,13 +1,14 @@
 import express from 'express';
-import { createSubmissionHandler, deleteSubmissionHandler, getSubmissionHandler } from '../controllers/submissions.js';
+import {
+    createSubmissionHandler,
+    deleteSubmissionHandler,
+    getSubmissionHandler,
+    getSubmissionsHandler
+} from '../controllers/submissions.js';
 const router = express.Router({ mergeParams: true });
 
 // Root endpoint used to search objects
-router.get('/', (_req, res) => {
-    res.json({
-        submissions: ['0', '1'],
-    });
-});
+router.get('/', getSubmissionsHandler);
 
 router.post('/:id', createSubmissionHandler);
 
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index 0bf5c734..95c0f6fd 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -1,5 +1,5 @@
 import {
-    getAnswerRepository,
+    getAnswerRepository, getAssignmentRepository,
     getClassRepository,
     getGroupRepository,
     getQuestionRepository
@@ -13,8 +13,27 @@ import { LearningObjectIdentifier } from '../entities/content/learning-object-id
 import { mapToStudent } from '../interfaces/student.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
-import {AssignmentDTO} from "@dwengo-1/common/interfaces/assignment";
-import {mapToAssignment} from "../interfaces/assignment";
+import { AssignmentDTO } from "@dwengo-1/common/interfaces/assignment";
+import { mapToAssignment } from "../interfaces/assignment";
+
+export async function getQuestionsAboutLearningObjectInAssignment(
+    loId: LearningObjectIdentifier,
+    classId: string,
+    assignmentId: number,
+    full: boolean,
+    studentUsername?: string
+): Promise<QuestionDTO[] | QuestionId[]> {
+    const assignment = await getAssignmentRepository()
+        .findByClassIdAndAssignmentId(classId, assignmentId);
+
+    const questions = await getQuestionRepository()
+        .findAllQuestionsAboutLearningObjectInAssignment(loId, assignment!, studentUsername);
+
+    if (full)
+        return questions.map(q => mapToQuestionDTO(q));
+    else
+        return questions.map(q => mapToQuestionDTOId(q));
+}
 
 export async function getAllQuestions(id: LearningObjectIdentifier, full: boolean): Promise<QuestionDTO[] | QuestionId[]> {
     const questionRepository: QuestionRepository = getQuestionRepository();
diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts
index 1d8a7874..08a19481 100644
--- a/backend/src/services/submissions.ts
+++ b/backend/src/services/submissions.ts
@@ -1,4 +1,4 @@
-import { getSubmissionRepository } from '../data/repositories.js';
+import {getAssignmentRepository, getSubmissionRepository} from '../data/repositories.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { mapToSubmission, mapToSubmissionDTO } from '../interfaces/submission.js';
 import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
@@ -55,3 +55,24 @@ export async function deleteSubmission(
 
     return submission;
 }
+
+/**
+ * Returns all the submissions made by on behalf of any group the given student is in.
+ */
+export async function getSubmissionsForLearningObjectAndAssignment(
+    learningObjectHruid: string,
+    language: Language,
+    version: number,
+    classId: string,
+    assignmentId: number,
+    studentUsername?: string
+): Promise<SubmissionDTO[]> {
+    const loId = new LearningObjectIdentifier(learningObjectHruid, language, version);
+    const assignment = await getAssignmentRepository()
+                                                .findByClassIdAndAssignmentId(classId, assignmentId);
+
+    const submissions = await getSubmissionRepository()
+                    .findAllSubmissionsForLearningObjectAndAssignment(loId, assignment!, studentUsername);
+
+    return submissions.map(s => mapToSubmissionDTO(s));
+}

From d21377cda43b5191aa85073de0fed68234f2c784 Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Tue, 8 Apr 2025 00:59:36 +0200
Subject: [PATCH 103/177] feat(backend): Testen voor nieuwe functie in
 QuestionRepository toegevoegd.

---
 .../tests/data/questions/questions.test.ts    | 60 ++++++++++++++++++-
 .../questions/questions.testdata.ts           | 32 ++++++++--
 2 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/backend/tests/data/questions/questions.test.ts b/backend/tests/data/questions/questions.test.ts
index 567777f5..3ea71294 100644
--- a/backend/tests/data/questions/questions.test.ts
+++ b/backend/tests/data/questions/questions.test.ts
@@ -10,6 +10,9 @@ import {
 import { StudentRepository } from '../../../src/data/users/student-repository';
 import { LearningObjectIdentifier } from '../../../src/entities/content/learning-object-identifier';
 import { Language } from '@dwengo-1/common/util/language';
+import {Question} from "../../../src/entities/questions/question.entity";
+import {Class} from "../../../src/entities/classes/class.entity";
+import {Assignment} from "../../../src/entities/assignments/assignment.entity";
 
 describe('QuestionRepository', () => {
     let questionRepository: QuestionRepository;
@@ -26,7 +29,7 @@ describe('QuestionRepository', () => {
         const questions = await questionRepository.findAllQuestionsAboutLearningObject(id);
 
         expect(questions).toBeTruthy();
-        expect(questions).toHaveLength(2);
+        expect(questions).toHaveLength(4);
     });
 
     it('should create new question', async () => {
@@ -48,6 +51,53 @@ describe('QuestionRepository', () => {
         expect(question).toHaveLength(1);
     });
 
+    let clazz: Class | null;
+    let assignment: Assignment | null;
+    let loId: LearningObjectIdentifier;
+    it('should find all questions for a certain learning object and assignment', async () => {
+        clazz = await getClassRepository().findById('id01');
+        assignment = await getAssignmentRepository().findByClassAndId(clazz!, 1);
+        loId = {
+            hruid: "id05",
+            language: Language.English,
+            version: 1
+        };
+        const result = await questionRepository.findAllQuestionsAboutLearningObjectInAssignment(loId, assignment!);
+        sortQuestions(result);
+
+        expect(result).toHaveLength(3);
+
+        // question01: About learning object 'id05', in group #1 for Assignment #1 in class 'id01'
+        expect(result[0].learningObjectHruid).toEqual(loId.hruid);
+        expect(result[0].sequenceNumber).toEqual(1);
+
+        // question02: About learning object 'id05', in group #1 for Assignment #1 in class 'id01'
+        expect(result[1].learningObjectHruid).toEqual(loId.hruid);
+        expect(result[1].sequenceNumber).toEqual(2);
+
+        // question05: About learning object 'id05', in group #2 for Assignment #1 in class 'id01'
+        expect(result[2].learningObjectHruid).toEqual(loId.hruid);
+        expect(result[2].sequenceNumber).toEqual(3);
+
+        // question06: About learning object 'id05', but for Assignment #2 in class 'id01' => not expected.
+    });
+
+    it("should find only the questions for a certain learning object and assignment asked by the user's group", async () => {
+        const result =
+            await questionRepository.findAllQuestionsAboutLearningObjectInAssignment(loId, assignment!, "Tool");
+        // (student Tool is in group #2)
+
+        expect(result).toHaveLength(1);
+
+        // question01 and question02 are in group #1 => not displayed.
+
+        // question05: About learning object 'id05', in group #2 for Assignment #1 in class 'id01'
+        expect(result[0].learningObjectHruid).toEqual(loId.hruid);
+        expect(result[0].sequenceNumber).toEqual(3);
+
+        // question06: About learning object 'id05', but for Assignment #2 in class 'id01' => not expected.
+    });
+
     it('should not find removed question', async () => {
         const id = new LearningObjectIdentifier('id04', Language.English, 1);
         await questionRepository.removeQuestionByLearningObjectAndSequenceNumber(id, 1);
@@ -57,3 +107,11 @@ describe('QuestionRepository', () => {
         expect(question).toHaveLength(0);
     });
 });
+
+function sortQuestions(questions: Question[]) {
+    questions.sort((a, b) => {
+        if (a.learningObjectHruid < b.learningObjectHruid) return -1
+        else if (a.learningObjectHruid > b.learningObjectHruid) return 1
+        else return a.sequenceNumber! - b.sequenceNumber!
+    });
+}
diff --git a/backend/tests/test_assets/questions/questions.testdata.ts b/backend/tests/test_assets/questions/questions.testdata.ts
index 0ccd498e..1e4a37ef 100644
--- a/backend/tests/test_assets/questions/questions.testdata.ts
+++ b/backend/tests/test_assets/questions/questions.testdata.ts
@@ -9,7 +9,7 @@ export function makeTestQuestions(em: EntityManager, students: Student[], groups
         learningObjectLanguage: Language.English,
         learningObjectVersion: 1,
         learningObjectHruid: 'id05',
-        inGroup: groups[0],
+        inGroup: groups[0], // Group #1 for Assignment #1 in class 'id01'
         sequenceNumber: 1,
         author: students[0],
         timestamp: new Date(),
@@ -20,7 +20,7 @@ export function makeTestQuestions(em: EntityManager, students: Student[], groups
         learningObjectLanguage: Language.English,
         learningObjectVersion: 1,
         learningObjectHruid: 'id05',
-        inGroup: groups[0],
+        inGroup: groups[0], // Group #1 for Assignment #1 in class 'id01'
         sequenceNumber: 2,
         author: students[2],
         timestamp: new Date(),
@@ -33,7 +33,7 @@ export function makeTestQuestions(em: EntityManager, students: Student[], groups
         learningObjectHruid: 'id04',
         sequenceNumber: 1,
         author: students[0],
-        inGroup: groups[0],
+        inGroup: groups[0], // Group #1 for Assignment #1 in class 'id01'
         timestamp: new Date(),
         content: 'question',
     });
@@ -44,10 +44,32 @@ export function makeTestQuestions(em: EntityManager, students: Student[], groups
         learningObjectHruid: 'id01',
         sequenceNumber: 1,
         author: students[1],
-        inGroup: groups[1],
+        inGroup: groups[1], // Group #2 for Assignment #1 in class 'id01'
         timestamp: new Date(),
         content: 'question',
     });
 
-    return [question01, question02, question03, question04];
+    const question05 = em.create(Question, {
+        learningObjectLanguage: Language.English,
+        learningObjectVersion: 1,
+        learningObjectHruid: 'id05',
+        sequenceNumber: 3,
+        author: students[1],
+        inGroup: groups[1], // Group #2 for Assignment #1 in class 'id01'
+        timestamp: new Date(),
+        content: 'question',
+    });
+
+    const question06 = em.create(Question, {
+        learningObjectLanguage: Language.English,
+        learningObjectVersion: 1,
+        learningObjectHruid: 'id05',
+        sequenceNumber: 4,
+        author: students[2],
+        inGroup: groups[3], // Group #4 for Assignment #2 in class 'id02'
+        timestamp: new Date(),
+        content: 'question',
+    });
+
+    return [question01, question02, question03, question04, question05, question06];
 }

From 3c3a1d89c6c37dcdc78b09620dcc27e842aa6985 Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Tue, 8 Apr 2025 01:05:27 +0200
Subject: [PATCH 104/177] style(backend): Lint

---
 backend/src/controllers/submissions.ts        |  4 ++--
 .../data/assignments/submission-repository.ts |  2 +-
 .../src/data/questions/question-repository.ts |  2 +-
 backend/src/interfaces/group.ts               |  2 +-
 backend/src/services/questions.ts             |  5 ++---
 .../data/assignments/submissions.test.ts      | 14 ++++++-------
 .../tests/data/questions/questions.test.ts    | 20 +++++++++----------
 .../assignments/submission.testdata.ts        |  8 ++++----
 8 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts
index 3a5aa391..ac6c3bb9 100644
--- a/backend/src/controllers/submissions.ts
+++ b/backend/src/controllers/submissions.ts
@@ -30,8 +30,8 @@ export async function getSubmissionsHandler(
     res: Response
 ): Promise<void> {
     const loHruid = req.params.hruid;
-    const lang = languageMap[req.query.language as string] || Language.Dutch;
-    const version = (req.query.version || 1) as number;
+    const lang = languageMap[req.query.language] || Language.Dutch;
+    const version = (req.query.version || 1);
 
     const submissions = await getSubmissionsForLearningObjectAndAssignment(
         loHruid, lang, version, req.query.classId, req.query.assignmentId
diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts
index 00cdac14..89832899 100644
--- a/backend/src/data/assignments/submission-repository.ts
+++ b/backend/src/data/assignments/submission-repository.ts
@@ -60,7 +60,7 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
         assignment: Assignment,
         forStudentUsername?: string
     ): Promise<Submission[]> {
-        let onBehalfOf = forStudentUsername ? {
+        const onBehalfOf = forStudentUsername ? {
             assignment,
             members: {
                 $some: {
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index f36b1074..714c3818 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -75,7 +75,7 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
         assignment: Assignment,
         forStudentUsername?: string
     ): Promise<Question[]> {
-        let inGroup = forStudentUsername ? {
+        const inGroup = forStudentUsername ? {
             assignment,
             members: {
                 $some: {
diff --git a/backend/src/interfaces/group.ts b/backend/src/interfaces/group.ts
index da3ad845..d21762db 100644
--- a/backend/src/interfaces/group.ts
+++ b/backend/src/interfaces/group.ts
@@ -12,7 +12,7 @@ export function mapToGroup(groupDto: GroupDTO, clazz: Class): Group {
 
     return getGroupRepository().create({
         groupNumber: groupDto.groupNumber,
-        assignment: mapToAssignment(assignmentDto, clazz!),
+        assignment: mapToAssignment(assignmentDto, clazz),
         members: groupDto.members.map(studentDto => mapToStudent(studentDto as StudentDTO))
     });
 }
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index 95c0f6fd..5f5c22b7 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -30,9 +30,8 @@ export async function getQuestionsAboutLearningObjectInAssignment(
         .findAllQuestionsAboutLearningObjectInAssignment(loId, assignment!, studentUsername);
 
     if (full)
-        return questions.map(q => mapToQuestionDTO(q));
-    else
-        return questions.map(q => mapToQuestionDTOId(q));
+        {return questions.map(q => mapToQuestionDTO(q));}
+    return questions.map(q => mapToQuestionDTOId(q));
 }
 
 export async function getAllQuestions(id: LearningObjectIdentifier, full: boolean): Promise<QuestionDTO[] | QuestionId[]> {
diff --git a/backend/tests/data/assignments/submissions.test.ts b/backend/tests/data/assignments/submissions.test.ts
index a723e86f..2aa43f4c 100644
--- a/backend/tests/data/assignments/submissions.test.ts
+++ b/backend/tests/data/assignments/submissions.test.ts
@@ -97,15 +97,15 @@ describe('SubmissionRepository', () => {
 
         expect(result).toHaveLength(3);
 
-        // submission3 should be found (for learning object 'id02' by group #1 for Assignment #1 in class 'id01')
+        // Submission3 should be found (for learning object 'id02' by group #1 for Assignment #1 in class 'id01')
         expect(result[0].learningObjectHruid).toBe(loId.hruid);
         expect(result[0].submissionNumber).toBe(1);
 
-        // submission4 should be found (for learning object 'id02' by group #1 for Assignment #1 in class 'id01')
+        // Submission4 should be found (for learning object 'id02' by group #1 for Assignment #1 in class 'id01')
         expect(result[1].learningObjectHruid).toBe(loId.hruid);
         expect(result[1].submissionNumber).toBe(2);
 
-        // submission8 should be found (for learning object 'id02' by group #2 for Assignment #1 in class 'id01')
+        // Submission8 should be found (for learning object 'id02' by group #2 for Assignment #1 in class 'id01')
         expect(result[2].learningObjectHruid).toBe(loId.hruid);
         expect(result[2].submissionNumber).toBe(3);
     });
@@ -117,12 +117,12 @@ describe('SubmissionRepository', () => {
 
         expect(result).toHaveLength(1);
 
-        // submission8 should be found (for learning object 'id02' by group #2 for Assignment #1 in class 'id01')
+        // Submission8 should be found (for learning object 'id02' by group #2 for Assignment #1 in class 'id01')
         expect(result[0].learningObjectHruid).toBe(loId.hruid);
         expect(result[0].submissionNumber).toBe(3);
 
         // The other submissions found in the previous test case should not be found anymore as they were made on
-        // behalf of group #1 which Tool is no member of.
+        // Behalf of group #1 which Tool is no member of.
     });
 
     it('should not find a deleted submission', async () => {
@@ -137,8 +137,8 @@ describe('SubmissionRepository', () => {
 
 function sortSubmissions(submissions: Submission[]) {
     submissions.sort((a, b) => {
-        if (a.learningObjectHruid < b.learningObjectHruid) return -1;
-        if (a.learningObjectHruid > b.learningObjectHruid) return 1;
+        if (a.learningObjectHruid < b.learningObjectHruid) {return -1;}
+        if (a.learningObjectHruid > b.learningObjectHruid) {return 1;}
         return a.submissionNumber! - b.submissionNumber!;
     });
 }
diff --git a/backend/tests/data/questions/questions.test.ts b/backend/tests/data/questions/questions.test.ts
index 3ea71294..34a3852c 100644
--- a/backend/tests/data/questions/questions.test.ts
+++ b/backend/tests/data/questions/questions.test.ts
@@ -67,19 +67,19 @@ describe('QuestionRepository', () => {
 
         expect(result).toHaveLength(3);
 
-        // question01: About learning object 'id05', in group #1 for Assignment #1 in class 'id01'
+        // Question01: About learning object 'id05', in group #1 for Assignment #1 in class 'id01'
         expect(result[0].learningObjectHruid).toEqual(loId.hruid);
         expect(result[0].sequenceNumber).toEqual(1);
 
-        // question02: About learning object 'id05', in group #1 for Assignment #1 in class 'id01'
+        // Question02: About learning object 'id05', in group #1 for Assignment #1 in class 'id01'
         expect(result[1].learningObjectHruid).toEqual(loId.hruid);
         expect(result[1].sequenceNumber).toEqual(2);
 
-        // question05: About learning object 'id05', in group #2 for Assignment #1 in class 'id01'
+        // Question05: About learning object 'id05', in group #2 for Assignment #1 in class 'id01'
         expect(result[2].learningObjectHruid).toEqual(loId.hruid);
         expect(result[2].sequenceNumber).toEqual(3);
 
-        // question06: About learning object 'id05', but for Assignment #2 in class 'id01' => not expected.
+        // Question06: About learning object 'id05', but for Assignment #2 in class 'id01' => not expected.
     });
 
     it("should find only the questions for a certain learning object and assignment asked by the user's group", async () => {
@@ -89,13 +89,13 @@ describe('QuestionRepository', () => {
 
         expect(result).toHaveLength(1);
 
-        // question01 and question02 are in group #1 => not displayed.
+        // Question01 and question02 are in group #1 => not displayed.
 
-        // question05: About learning object 'id05', in group #2 for Assignment #1 in class 'id01'
+        // Question05: About learning object 'id05', in group #2 for Assignment #1 in class 'id01'
         expect(result[0].learningObjectHruid).toEqual(loId.hruid);
         expect(result[0].sequenceNumber).toEqual(3);
 
-        // question06: About learning object 'id05', but for Assignment #2 in class 'id01' => not expected.
+        // Question06: About learning object 'id05', but for Assignment #2 in class 'id01' => not expected.
     });
 
     it('should not find removed question', async () => {
@@ -110,8 +110,8 @@ describe('QuestionRepository', () => {
 
 function sortQuestions(questions: Question[]) {
     questions.sort((a, b) => {
-        if (a.learningObjectHruid < b.learningObjectHruid) return -1
-        else if (a.learningObjectHruid > b.learningObjectHruid) return 1
-        else return a.sequenceNumber! - b.sequenceNumber!
+        if (a.learningObjectHruid < b.learningObjectHruid) {return -1}
+        else if (a.learningObjectHruid > b.learningObjectHruid) {return 1}
+        return a.sequenceNumber! - b.sequenceNumber!
     });
 }
diff --git a/backend/tests/test_assets/assignments/submission.testdata.ts b/backend/tests/test_assets/assignments/submission.testdata.ts
index 812d1289..81db2229 100644
--- a/backend/tests/test_assets/assignments/submission.testdata.ts
+++ b/backend/tests/test_assets/assignments/submission.testdata.ts
@@ -12,7 +12,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 1,
         submitter: students[0],
         submissionTime: new Date(2025, 2, 20),
-        onBehalfOf: groups[0], // group #1 for Assignment #1 in class 'id01'
+        onBehalfOf: groups[0], // Group #1 for Assignment #1 in class 'id01'
         content: 'sub1',
     });
 
@@ -23,7 +23,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 2,
         submitter: students[0],
         submissionTime: new Date(2025, 2, 25),
-        onBehalfOf: groups[0], // group #1 for Assignment #1 in class 'id01'
+        onBehalfOf: groups[0], // Group #1 for Assignment #1 in class 'id01'
         content: '',
     });
 
@@ -34,7 +34,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 1,
         submitter: students[0],
         submissionTime: new Date(2025, 2, 20),
-        onBehalfOf: groups[0], // group #1 for Assignment #1 in class 'id01'
+        onBehalfOf: groups[0], // Group #1 for Assignment #1 in class 'id01'
         content: '',
     });
 
@@ -45,7 +45,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
         submissionNumber: 2,
         submitter: students[0],
         submissionTime: new Date(2025, 2, 25),
-        onBehalfOf: groups[0], // group #1 for Assignment #1 in class 'id01'
+        onBehalfOf: groups[0], // Group #1 for Assignment #1 in class 'id01'
         content: '',
     });
 

From b47d8af16138b88af5ec95ef4ce909f64d79e9d9 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Tue, 8 Apr 2025 09:30:06 +0200
Subject: [PATCH 105/177] docs: pas commentaar aan

---
 frontend/src/views/classes/TeacherClasses.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
index fdac2e25..57e8ea0a 100644
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -49,13 +49,13 @@
 
     // Function to handle a accepted invitation request
     function acceptRequest(): void {
-        //TODO > waiting on updated frontend controllers
+        //TODO
         console.log("request accepted");
     }
 
     // Function to handle a denied invitation request
     function denyRequest(): void {
-        //TODO > waiting on frontend controllers
+        //TODO
         console.log("request denied");
     }
 
@@ -90,7 +90,7 @@
                 dialog.value = true;
                 showSnackbar(t("created"), "success");
 
-                // Reload the table with classes
+                // Reload the table with classes so the new class appears
                 await refetch();
             } catch (_) {
                 showSnackbar(t("wrong"), "error");

From 1ff640506635892b0a4d8faee025e5ff46908e05 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Tue, 8 Apr 2025 09:43:32 +0200
Subject: [PATCH 106/177] refactor: steek seed in tool folder

---
 backend/package.json       |  2 +-
 backend/{ => tool}/seed.ts | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)
 rename backend/{ => tool}/seed.ts (57%)

diff --git a/backend/package.json b/backend/package.json
index 1ef8e85f..3a89eb87 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -7,7 +7,7 @@
     "main": "dist/app.js",
     "scripts": {
         "build": "cross-env NODE_ENV=production tsc --build",
-        "dev": "cross-env NODE_ENV=development tsx seed.ts; tsx watch --env-file=.env.development.local src/app.ts",
+        "dev": "cross-env NODE_ENV=development tsx tool/seed.ts; tsx watch --env-file=.env.development.local src/app.ts",
         "start": "cross-env NODE_ENV=production node --env-file=.env dist/app.js",
         "format": "prettier --write src/",
         "format-check": "prettier --check src/",
diff --git a/backend/seed.ts b/backend/tool/seed.ts
similarity index 57%
rename from backend/seed.ts
rename to backend/tool/seed.ts
index 1798af3a..a51a7c5b 100644
--- a/backend/seed.ts
+++ b/backend/tool/seed.ts
@@ -1,19 +1,19 @@
-import { forkEntityManager, initORM } from "./src/orm.js";
+import { forkEntityManager, initORM } from "../src/orm.js";
 import dotenv from 'dotenv';
-import { makeTestAssignemnts } from "./tests/test_assets/assignments/assignments.testdata.js";
-import { makeTestGroups } from "./tests/test_assets/assignments/groups.testdata.js";
-import { makeTestSubmissions } from "./tests/test_assets/assignments/submission.testdata.js";
-import { makeTestClassJoinRequests } from "./tests/test_assets/classes/class-join-requests.testdata.js";
-import { makeTestClasses } from "./tests/test_assets/classes/classes.testdata.js";
-import { makeTestTeacherInvitations } from "./tests/test_assets/classes/teacher-invitations.testdata.js";
-import { makeTestAttachments } from "./tests/test_assets/content/attachments.testdata.js";
-import { makeTestLearningObjects } from "./tests/test_assets/content/learning-objects.testdata.js";
-import { makeTestLearningPaths } from "./tests/test_assets/content/learning-paths.testdata.js";
-import { makeTestAnswers } from "./tests/test_assets/questions/answers.testdata.js";
-import { makeTestQuestions } from "./tests/test_assets/questions/questions.testdata.js";
-import { makeTestStudents } from "./tests/test_assets/users/students.testdata.js";
-import { makeTestTeachers } from "./tests/test_assets/users/teachers.testdata.js";
-import { getLogger, Logger } from './src/logging/initalize.js';
+import { makeTestAssignemnts } from "../tests/test_assets/assignments/assignments.testdata.js";
+import { makeTestGroups } from "../tests/test_assets/assignments/groups.testdata.js";
+import { makeTestSubmissions } from "../tests/test_assets/assignments/submission.testdata.js";
+import { makeTestClassJoinRequests } from "../tests/test_assets/classes/class-join-requests.testdata.js";
+import { makeTestClasses } from "../tests/test_assets/classes/classes.testdata.js";
+import { makeTestTeacherInvitations } from "../tests/test_assets/classes/teacher-invitations.testdata.js";
+import { makeTestAttachments } from "../tests/test_assets/content/attachments.testdata.js";
+import { makeTestLearningObjects } from "../tests/test_assets/content/learning-objects.testdata.js";
+import { makeTestLearningPaths } from "../tests/test_assets/content/learning-paths.testdata.js";
+import { makeTestAnswers } from "../tests/test_assets/questions/answers.testdata.js";
+import { makeTestQuestions } from "../tests/test_assets/questions/questions.testdata.js";
+import { makeTestStudents } from "../tests/test_assets/users/students.testdata.js";
+import { makeTestTeachers } from "../tests/test_assets/users/teachers.testdata.js";
+import { getLogger, Logger } from '../src/logging/initalize.js';
 
 const logger: Logger = getLogger();
 

From fc675710b4171bf15c2065616e4d02a396bd0c5a Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Tue, 8 Apr 2025 10:25:30 +0200
Subject: [PATCH 107/177] fix(backend): Falende testen gerepareerd.

---
 .../data/assignments/submission-repository.ts    | 11 +++++++++--
 backend/src/interfaces/group.ts                  | 16 +++++++++++++---
 backend/src/interfaces/question.ts               |  4 ++--
 backend/src/services/groups.ts                   |  6 +++---
 backend/src/services/students.ts                 |  8 +++++---
 backend/tests/controllers/students.test.ts       |  1 +
 common/src/interfaces/group.ts                   |  2 +-
 7 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts
index 89832899..a79dc417 100644
--- a/backend/src/data/assignments/submission-repository.ts
+++ b/backend/src/data/assignments/submission-repository.ts
@@ -82,12 +82,19 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
     }
 
     public async findAllSubmissionsForStudent(student: Student): Promise<Submission[]> {
-        return this.find(
+        const result = await this.find(
             { submitter: student },
             {
-                populate: ["onBehalfOf.members"]
+                populate: [
+                    "onBehalfOf.members"
+                ]
             }
         );
+
+        // Workaround: For some reason, without this MikroORM generates an UPDATE query with a syntax error in some tests
+        this.em.clear();
+
+        return result;
     }
 
     public async deleteSubmissionByLearningObjectAndSubmissionNumber(loId: LearningObjectIdentifier, submissionNumber: number): Promise<void> {
diff --git a/backend/src/interfaces/group.ts b/backend/src/interfaces/group.ts
index d21762db..d3785137 100644
--- a/backend/src/interfaces/group.ts
+++ b/backend/src/interfaces/group.ts
@@ -1,7 +1,7 @@
 import { Group } from '../entities/assignments/group.entity.js';
-import {mapToAssignment, mapToAssignmentDTO} from './assignment.js';
+import {mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId} from './assignment.js';
 import {mapToStudent, mapToStudentDTO} from './student.js';
-import { GroupDTO } from '@dwengo-1/common/interfaces/group';
+import {GroupDTO} from '@dwengo-1/common/interfaces/group';
 import {getGroupRepository} from "../data/repositories";
 import {AssignmentDTO} from "@dwengo-1/common/interfaces/assignment";
 import {Class} from "../entities/classes/class.entity";
@@ -13,7 +13,7 @@ export function mapToGroup(groupDto: GroupDTO, clazz: Class): Group {
     return getGroupRepository().create({
         groupNumber: groupDto.groupNumber,
         assignment: mapToAssignment(assignmentDto, clazz),
-        members: groupDto.members.map(studentDto => mapToStudent(studentDto as StudentDTO))
+        members: groupDto.members!.map(studentDto => mapToStudent(studentDto as StudentDTO))
     });
 }
 
@@ -26,6 +26,16 @@ export function mapToGroupDTO(group: Group): GroupDTO {
 }
 
 export function mapToGroupDTOId(group: Group): GroupDTO {
+    return {
+        assignment: mapToAssignmentDTOId(group.assignment),
+        groupNumber: group.groupNumber!,
+    };
+}
+
+/**
+ * Map to group DTO where other objects are only referenced by their id.
+ */
+export function mapToShallowGroupDTO(group: Group): GroupDTO {
     return {
         assignment: group.assignment.id!,
         groupNumber: group.groupNumber!,
diff --git a/backend/src/interfaces/question.ts b/backend/src/interfaces/question.ts
index 91b90796..5419618a 100644
--- a/backend/src/interfaces/question.ts
+++ b/backend/src/interfaces/question.ts
@@ -2,7 +2,7 @@ import { Question } from '../entities/questions/question.entity.js';
 import { mapToStudentDTO } from './student.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
-import {mapToGroupDTO} from "./group";
+import { mapToGroupDTOId } from "./group";
 
 function getLearningObjectIdentifier(question: Question): LearningObjectIdentifier {
     return {
@@ -22,7 +22,7 @@ export function mapToQuestionDTO(question: Question): QuestionDTO {
         learningObjectIdentifier,
         sequenceNumber: question.sequenceNumber!,
         author: mapToStudentDTO(question.author),
-        inGroup: mapToGroupDTO(question.inGroup),
+        inGroup: mapToGroupDTOId(question.inGroup),
         timestamp: question.timestamp.toISOString(),
         content: question.content,
     };
diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts
index 346c1ee1..b009e772 100644
--- a/backend/src/services/groups.ts
+++ b/backend/src/services/groups.ts
@@ -6,7 +6,7 @@ import {
     getSubmissionRepository,
 } from '../data/repositories.js';
 import { Group } from '../entities/assignments/group.entity.js';
-import { mapToGroupDTO, mapToGroupDTOId } from '../interfaces/group.js';
+import { mapToGroupDTO, mapToShallowGroupDTO } from '../interfaces/group.js';
 import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submission.js';
 import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
@@ -38,7 +38,7 @@ export async function getGroup(classId: string, assignmentNumber: number, groupN
         return mapToGroupDTO(group);
     }
 
-    return mapToGroupDTOId(group);
+    return mapToShallowGroupDTO(group);
 }
 
 export async function createGroup(groupData: GroupDTO, classid: string, assignmentNumber: number): Promise<Group | null> {
@@ -103,7 +103,7 @@ export async function getAllGroups(classId: string, assignmentNumber: number, fu
         return groups.map(mapToGroupDTO);
     }
 
-    return groups.map(mapToGroupDTOId);
+    return groups.map(mapToShallowGroupDTO);
 }
 
 export async function getGroupSubmissions(
diff --git a/backend/src/services/students.ts b/backend/src/services/students.ts
index dc40e468..be2d270b 100644
--- a/backend/src/services/students.ts
+++ b/backend/src/services/students.ts
@@ -7,7 +7,7 @@ import {
     getSubmissionRepository,
 } from '../data/repositories.js';
 import { mapToClassDTO } from '../interfaces/class.js';
-import { mapToGroupDTO, mapToGroupDTOId } from '../interfaces/group.js';
+import { mapToGroupDTO, mapToShallowGroupDTO } from '../interfaces/group.js';
 import { mapToStudent, mapToStudentDTO } from '../interfaces/student.js';
 import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submission.js';
 import { getAllAssignments } from './assignments.js';
@@ -23,6 +23,7 @@ import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request';
+import {Submission} from "../entities/assignments/submission.entity";
 
 export async function getAllStudents(full: boolean): Promise<StudentDTO[] | string[]> {
     const studentRepository = getStudentRepository();
@@ -100,14 +101,15 @@ export async function getStudentGroups(username: string, full: boolean): Promise
         return groups.map(mapToGroupDTO);
     }
 
-    return groups.map(mapToGroupDTOId);
+    return groups.map(mapToShallowGroupDTO);
 }
 
 export async function getStudentSubmissions(username: string, full: boolean): Promise<SubmissionDTO[] | SubmissionDTOId[]> {
     const student = await fetchStudent(username);
 
     const submissionRepository = getSubmissionRepository();
-    const submissions = await submissionRepository.findAllSubmissionsForStudent(student);
+
+    const submissions: Submission[] = await submissionRepository.findAllSubmissionsForStudent(student);
 
     if (full) {
         return submissions.map(mapToSubmissionDTO);
diff --git a/backend/tests/controllers/students.test.ts b/backend/tests/controllers/students.test.ts
index 93f35c48..35f9a9cf 100644
--- a/backend/tests/controllers/students.test.ts
+++ b/backend/tests/controllers/students.test.ts
@@ -147,6 +147,7 @@ describe('Student controllers', () => {
 
         const result = jsonMock.mock.lastCall?.[0];
         expect(result.submissions).to.have.length.greaterThan(0);
+
     });
 
     it('Student questions', async () => {
diff --git a/common/src/interfaces/group.ts b/common/src/interfaces/group.ts
index ca95770a..16e22780 100644
--- a/common/src/interfaces/group.ts
+++ b/common/src/interfaces/group.ts
@@ -4,5 +4,5 @@ import { StudentDTO } from './student';
 export interface GroupDTO {
     assignment: number | AssignmentDTO;
     groupNumber: number;
-    members: string[] | StudentDTO[];
+    members?: string[] | StudentDTO[];
 }

From a5e82858ab79f2f18dbdb0374af1e5d05d65e666 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Tue, 8 Apr 2025 10:39:22 +0200
Subject: [PATCH 108/177] test: alle testen slagen na aanpassen testdata

---
 backend/tests/controllers/students.test.ts           |  8 ++++----
 backend/tests/controllers/teachers.test.ts           | 12 ++++++------
 backend/tests/data/assignments/assignments.test.ts   |  4 ++--
 backend/tests/data/assignments/groups.test.ts        |  6 +++---
 backend/tests/data/assignments/submissions.test.ts   |  2 +-
 .../tests/data/classes/class-join-request.test.ts    |  4 ++--
 backend/tests/data/classes/classes.test.ts           |  6 +++---
 .../tests/data/classes/teacher-invitation.test.ts    |  4 ++--
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/backend/tests/controllers/students.test.ts b/backend/tests/controllers/students.test.ts
index 93f35c48..18331f2d 100644
--- a/backend/tests/controllers/students.test.ts
+++ b/backend/tests/controllers/students.test.ts
@@ -186,7 +186,7 @@ describe('Student controllers', () => {
 
     it('Get join request by student and class', async () => {
         req = {
-            params: { username: 'PinkFloyd', classId: 'id02' },
+            params: { username: 'PinkFloyd', classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89' },
         };
 
         await getStudentRequestHandler(req as Request, res as Response);
@@ -201,7 +201,7 @@ describe('Student controllers', () => {
     it('Create join request', async () => {
         req = {
             params: { username: 'Noordkaap' },
-            body: { classId: 'id02' },
+            body: { classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89' },
         };
 
         await createStudentRequestHandler(req as Request, res as Response);
@@ -212,7 +212,7 @@ describe('Student controllers', () => {
     it('Create join request duplicate', async () => {
         req = {
             params: { username: 'Tool' },
-            body: { classId: 'id02' },
+            body: { classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89' },
         };
 
         await expect(async () => createStudentRequestHandler(req as Request, res as Response)).rejects.toThrow(ConflictException);
@@ -220,7 +220,7 @@ describe('Student controllers', () => {
 
     it('Delete join request', async () => {
         req = {
-            params: { username: 'Noordkaap', classId: 'id02' },
+            params: { username: 'Noordkaap', classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89' },
         };
 
         await deleteClassJoinRequestHandler(req as Request, res as Response);
diff --git a/backend/tests/controllers/teachers.test.ts b/backend/tests/controllers/teachers.test.ts
index bee23987..cdcb6229 100644
--- a/backend/tests/controllers/teachers.test.ts
+++ b/backend/tests/controllers/teachers.test.ts
@@ -104,9 +104,9 @@ describe('Teacher controllers', () => {
         const result = jsonMock.mock.lastCall?.[0];
 
         const teacherUsernames = result.teachers.map((s: TeacherDTO) => s.username);
-        expect(teacherUsernames).toContain('FooFighters');
+        expect(teacherUsernames).toContain('testleerkracht1');
 
-        expect(result.teachers).toHaveLength(4);
+        expect(result.teachers).toHaveLength(5);
     });
 
     it('Deleting non-existent student', async () => {
@@ -117,7 +117,7 @@ describe('Teacher controllers', () => {
 
     it('Get teacher classes', async () => {
         req = {
-            params: { username: 'FooFighters' },
+            params: { username: 'testleerkracht1' },
             query: { full: 'true' },
         };
 
@@ -132,7 +132,7 @@ describe('Teacher controllers', () => {
 
     it('Get teacher students', async () => {
         req = {
-            params: { username: 'FooFighters' },
+            params: { username: 'testleerkracht1' },
             query: { full: 'true' },
         };
 
@@ -169,7 +169,7 @@ describe('Teacher controllers', () => {
     it('Get join requests by class', async () => {
         req = {
             query: { username: 'LimpBizkit' },
-            params: { classId: 'id02' },
+            params: { classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89' },
         };
 
         await getStudentJoinRequestHandler(req as Request, res as Response);
@@ -184,7 +184,7 @@ describe('Teacher controllers', () => {
     it('Update join request status', async () => {
         req = {
             query: { username: 'LimpBizkit', studentUsername: 'PinkFloyd' },
-            params: { classId: 'id02' },
+            params: { classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89' },
             body: { accepted: 'true' },
         };
 
diff --git a/backend/tests/data/assignments/assignments.test.ts b/backend/tests/data/assignments/assignments.test.ts
index c26fb5ba..c2bdbeef 100644
--- a/backend/tests/data/assignments/assignments.test.ts
+++ b/backend/tests/data/assignments/assignments.test.ts
@@ -15,7 +15,7 @@ describe('AssignmentRepository', () => {
     });
 
     it('should return the requested assignment', async () => {
-        const class_ = await classRepository.findById('id02');
+        const class_ = await classRepository.findById('34d484a1-295f-4e9f-bfdc-3e7a23d86a89');
         const assignment = await assignmentRepository.findByClassAndId(class_!, 2);
 
         expect(assignment).toBeTruthy();
@@ -23,7 +23,7 @@ describe('AssignmentRepository', () => {
     });
 
     it('should return all assignments for a class', async () => {
-        const class_ = await classRepository.findById('id02');
+        const class_ = await classRepository.findById('34d484a1-295f-4e9f-bfdc-3e7a23d86a89');
         const assignments = await assignmentRepository.findAllAssignmentsInClass(class_!);
 
         expect(assignments).toBeTruthy();
diff --git a/backend/tests/data/assignments/groups.test.ts b/backend/tests/data/assignments/groups.test.ts
index 96684d68..f7fb3046 100644
--- a/backend/tests/data/assignments/groups.test.ts
+++ b/backend/tests/data/assignments/groups.test.ts
@@ -18,7 +18,7 @@ describe('GroupRepository', () => {
     });
 
     it('should return the requested group', async () => {
-        const class_ = await classRepository.findById('id01');
+        const class_ = await classRepository.findById('8764b861-90a6-42e5-9732-c0d9eb2f55f9');
         const assignment = await assignmentRepository.findByClassAndId(class_!, 1);
 
         const group = await groupRepository.findByAssignmentAndGroupNumber(assignment!, 1);
@@ -27,7 +27,7 @@ describe('GroupRepository', () => {
     });
 
     it('should return all groups for assignment', async () => {
-        const class_ = await classRepository.findById('id01');
+        const class_ = await classRepository.findById('8764b861-90a6-42e5-9732-c0d9eb2f55f9');
         const assignment = await assignmentRepository.findByClassAndId(class_!, 1);
 
         const groups = await groupRepository.findAllGroupsForAssignment(assignment!);
@@ -37,7 +37,7 @@ describe('GroupRepository', () => {
     });
 
     it('should not find removed group', async () => {
-        const class_ = await classRepository.findById('id02');
+        const class_ = await classRepository.findById('34d484a1-295f-4e9f-bfdc-3e7a23d86a89');
         const assignment = await assignmentRepository.findByClassAndId(class_!, 2);
 
         await groupRepository.deleteByAssignmentAndGroupNumber(assignment!, 1);
diff --git a/backend/tests/data/assignments/submissions.test.ts b/backend/tests/data/assignments/submissions.test.ts
index 85e1bc11..37d0f2ee 100644
--- a/backend/tests/data/assignments/submissions.test.ts
+++ b/backend/tests/data/assignments/submissions.test.ts
@@ -50,7 +50,7 @@ describe('SubmissionRepository', () => {
 
     it('should find the most recent submission for a group', async () => {
         const id = new LearningObjectIdentifier('id03', Language.English, 1);
-        const class_ = await classRepository.findById('id01');
+        const class_ = await classRepository.findById('8764b861-90a6-42e5-9732-c0d9eb2f55f9');
         const assignment = await assignmentRepository.findByClassAndId(class_!, 1);
         const group = await groupRepository.findByAssignmentAndGroupNumber(assignment!, 1);
         const submission = await submissionRepository.findMostRecentSubmissionForGroup(id, group!);
diff --git a/backend/tests/data/classes/class-join-request.test.ts b/backend/tests/data/classes/class-join-request.test.ts
index cd53bf05..afb83766 100644
--- a/backend/tests/data/classes/class-join-request.test.ts
+++ b/backend/tests/data/classes/class-join-request.test.ts
@@ -26,7 +26,7 @@ describe('ClassJoinRequestRepository', () => {
     });
 
     it('should list all requests to a single class', async () => {
-        const class_ = await cassRepository.findById('id02');
+        const class_ = await cassRepository.findById('34d484a1-295f-4e9f-bfdc-3e7a23d86a89');
         const requests = await classJoinRequestRepository.findAllOpenRequestsTo(class_!);
 
         expect(requests).toBeTruthy();
@@ -35,7 +35,7 @@ describe('ClassJoinRequestRepository', () => {
 
     it('should not find a removed request', async () => {
         const student = await studentRepository.findByUsername('SmashingPumpkins');
-        const class_ = await cassRepository.findById('id03');
+        const class_ = await cassRepository.findById('80dcc3e0-1811-4091-9361-42c0eee91cfa');
         await classJoinRequestRepository.deleteBy(student!, class_!);
 
         const request = await classJoinRequestRepository.findAllRequestsBy(student!);
diff --git a/backend/tests/data/classes/classes.test.ts b/backend/tests/data/classes/classes.test.ts
index 22306ba6..f87f83ed 100644
--- a/backend/tests/data/classes/classes.test.ts
+++ b/backend/tests/data/classes/classes.test.ts
@@ -18,16 +18,16 @@ describe('ClassRepository', () => {
     });
 
     it('should return requested class', async () => {
-        const classVar = await classRepository.findById('id01');
+        const classVar = await classRepository.findById('8764b861-90a6-42e5-9732-c0d9eb2f55f9');
 
         expect(classVar).toBeTruthy();
         expect(classVar?.displayName).toBe('class01');
     });
 
     it('class should be gone after deletion', async () => {
-        await classRepository.deleteById('id04');
+        await classRepository.deleteById('33d03536-83b8-4880-9982-9bbf2f908ddf');
 
-        const classVar = await classRepository.findById('id04');
+        const classVar = await classRepository.findById('33d03536-83b8-4880-9982-9bbf2f908ddf');
 
         expect(classVar).toBeNull();
     });
diff --git a/backend/tests/data/classes/teacher-invitation.test.ts b/backend/tests/data/classes/teacher-invitation.test.ts
index dd03634a..f8afa36d 100644
--- a/backend/tests/data/classes/teacher-invitation.test.ts
+++ b/backend/tests/data/classes/teacher-invitation.test.ts
@@ -34,7 +34,7 @@ describe('ClassRepository', () => {
     });
 
     it('should return all invitations for a class', async () => {
-        const class_ = await classRepository.findById('id02');
+        const class_ = await classRepository.findById('34d484a1-295f-4e9f-bfdc-3e7a23d86a89');
         const invitations = await teacherInvitationRepository.findAllInvitationsForClass(class_!);
 
         expect(invitations).toBeTruthy();
@@ -42,7 +42,7 @@ describe('ClassRepository', () => {
     });
 
     it('should not find a removed invitation', async () => {
-        const class_ = await classRepository.findById('id01');
+        const class_ = await classRepository.findById('8764b861-90a6-42e5-9732-c0d9eb2f55f9');
         const sender = await teacherRepository.findByUsername('FooFighters');
         const receiver = await teacherRepository.findByUsername('LimpBizkit');
         await teacherInvitationRepository.deleteBy(class_!, sender!, receiver!);

From ba725f67b25fb64c0d5596c9c0f9c745c5f8b40e Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Tue, 8 Apr 2025 10:46:26 +0200
Subject: [PATCH 109/177] fix(backend): Falende testen gerepareerd.

---
 backend/src/controllers/questions.ts          | 10 +++++++--
 .../data/assignments/assignments.test.ts      |  4 +++-
 .../data/assignments/submissions.test.ts      | 21 +------------------
 .../tests/data/questions/questions.test.ts    |  2 +-
 4 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts
index da1d020e..f1426b38 100644
--- a/backend/src/controllers/questions.ts
+++ b/backend/src/controllers/questions.ts
@@ -22,7 +22,10 @@ interface QuestionQueryParams {
     lang: string;
 }
 
-function getObjectId(req: Request<QuestionPathParams, any, any, QuestionQueryParams>, res: Response): LearningObjectIdentifier | null {
+function getObjectId<ResBody, ReqBody>(
+    req: Request<QuestionPathParams, ResBody, ReqBody, QuestionQueryParams>,
+    res: Response
+): LearningObjectIdentifier | null {
     const { hruid, version } = req.params;
     const lang = req.query.lang;
 
@@ -41,7 +44,10 @@ function getObjectId(req: Request<QuestionPathParams, any, any, QuestionQueryPar
 interface GetQuestionIdPathParams extends QuestionPathParams {
     seq: string;
 }
-function getQuestionId(req: Request<GetQuestionIdPathParams, any, any, QuestionQueryParams>, res: Response): QuestionId | null {
+function getQuestionId<ReqBody, ResBody>(
+    req: Request<GetQuestionIdPathParams, ReqBody, ResBody, QuestionQueryParams>,
+    res: Response
+): QuestionId | null {
     const seq = req.params.seq;
     const learningObjectIdentifier = getObjectId(req, res);
 
diff --git a/backend/tests/data/assignments/assignments.test.ts b/backend/tests/data/assignments/assignments.test.ts
index f587e979..aad084e3 100644
--- a/backend/tests/data/assignments/assignments.test.ts
+++ b/backend/tests/data/assignments/assignments.test.ts
@@ -33,7 +33,9 @@ describe('AssignmentRepository', () => {
 
     it('should find all by username of the responsible teacher', async () => {
         const result = await assignmentRepository.findAllByResponsibleTeacher("FooFighters")
-        const resultIds = result.map(it => it.id).sort();
+        const resultIds = result
+                                                .map(it => it.id)
+                                                .sort((a, b) => (a ?? 0) - (b ?? 0));
 
         expect(resultIds).toEqual([1, 3, 4]);
     });
diff --git a/backend/tests/data/assignments/submissions.test.ts b/backend/tests/data/assignments/submissions.test.ts
index 2aa43f4c..c7920734 100644
--- a/backend/tests/data/assignments/submissions.test.ts
+++ b/backend/tests/data/assignments/submissions.test.ts
@@ -18,25 +18,6 @@ import {Submission} from "../../../src/entities/assignments/submission.entity";
 import {Class} from "../../../src/entities/classes/class.entity";
 import {Assignment} from "../../../src/entities/assignments/assignment.entity";
 
-export function checkSubmissionsForStudentNoordkaap(result: Submission[]) {
-    sortSubmissions(result);
-
-    expect(result[0].learningObjectHruid).toBe("id01");
-    expect(result[0].submissionNumber).toBe(2);
-
-    expect(result[1].learningObjectHruid).toBe("id02");
-    expect(result[1].submissionNumber).toBe(1);
-
-    expect(result[2].learningObjectHruid).toBe("id02");
-    expect(result[2].submissionNumber).toBe(2);
-
-    expect(result[3].learningObjectHruid).toBe("id03");
-    expect(result[3].submissionNumber).toBe(1);
-
-    expect(result[4].learningObjectHruid).toBe("id03");
-    expect(result[4].submissionNumber).toBe(2);
-}
-
 describe('SubmissionRepository', () => {
     let submissionRepository: SubmissionRepository;
     let studentRepository: StudentRepository;
@@ -135,7 +116,7 @@ describe('SubmissionRepository', () => {
     });
 });
 
-function sortSubmissions(submissions: Submission[]) {
+function sortSubmissions(submissions: Submission[]): void {
     submissions.sort((a, b) => {
         if (a.learningObjectHruid < b.learningObjectHruid) {return -1;}
         if (a.learningObjectHruid > b.learningObjectHruid) {return 1;}
diff --git a/backend/tests/data/questions/questions.test.ts b/backend/tests/data/questions/questions.test.ts
index 34a3852c..e8069070 100644
--- a/backend/tests/data/questions/questions.test.ts
+++ b/backend/tests/data/questions/questions.test.ts
@@ -108,7 +108,7 @@ describe('QuestionRepository', () => {
     });
 });
 
-function sortQuestions(questions: Question[]) {
+function sortQuestions(questions: Question[]): void {
     questions.sort((a, b) => {
         if (a.learningObjectHruid < b.learningObjectHruid) {return -1}
         else if (a.learningObjectHruid > b.learningObjectHruid) {return 1}

From 8a55c0f0038c8f424347471acc9a3c47335b2592 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Tue, 8 Apr 2025 08:56:50 +0000
Subject: [PATCH 110/177] style: fix linting issues met Prettier

---
 backend/src/controllers/questions.ts          | 16 ++++----
 backend/src/controllers/submissions.ts        | 28 +++++--------
 .../data/assignments/assignment-repository.ts | 10 ++---
 .../data/assignments/submission-repository.ts | 34 ++++++++--------
 .../src/data/questions/question-repository.ts | 32 ++++++++-------
 .../entities/assignments/assignment.entity.ts |  2 +-
 .../src/entities/assignments/group.entity.ts  |  2 +-
 .../entities/assignments/submission.entity.ts |  4 +-
 .../src/entities/questions/question.entity.ts |  2 +-
 backend/src/interfaces/group.ts               | 16 ++++----
 backend/src/interfaces/question.ts            |  2 +-
 backend/src/routes/submissions.ts             |  7 +---
 backend/src/services/questions.ts             | 26 +++++--------
 backend/src/services/students.ts              |  2 +-
 backend/src/services/submissions.ts           | 10 ++---
 backend/tests/controllers/students.test.ts    |  1 -
 .../data/assignments/assignments.test.ts      |  6 +--
 .../data/assignments/submissions.test.ts      | 39 ++++++++++---------
 .../tests/data/questions/questions.test.ts    | 29 +++++++-------
 .../database-learning-path-provider.test.ts   | 22 +++++------
 .../questions/questions.testdata.ts           |  2 +-
 common/src/interfaces/question.ts             |  2 +-
 22 files changed, 137 insertions(+), 157 deletions(-)

diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts
index f1426b38..26efb4f4 100644
--- a/backend/src/controllers/questions.ts
+++ b/backend/src/controllers/questions.ts
@@ -5,13 +5,13 @@ import {
     getAllQuestions,
     getAnswersByQuestion,
     getQuestion,
-    getQuestionsAboutLearningObjectInAssignment
+    getQuestionsAboutLearningObjectInAssignment,
 } from '../services/questions.js';
 import { FALLBACK_LANG, FALLBACK_SEQ_NUM } from '../config.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { Language } from '@dwengo-1/common/util/language';
-import {AnswerDTO, AnswerId} from "@dwengo-1/common/interfaces/answer";
+import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
 
 interface QuestionPathParams {
     hruid: string;
@@ -62,10 +62,10 @@ function getQuestionId<ReqBody, ResBody>(
 }
 
 interface GetAllQuestionsQueryParams extends QuestionQueryParams {
-    classId?: string,
-    assignmentId?: number,
-    forStudent?: string,
-    full?: boolean
+    classId?: string;
+    assignmentId?: number;
+    forStudent?: string;
+    full?: boolean;
 }
 
 export async function getAllQuestionsHandler(
@@ -118,10 +118,10 @@ export async function getQuestionHandler(
 }
 
 interface GetQuestionAnswersQueryParams extends QuestionQueryParams {
-    full: boolean
+    full: boolean;
 }
 export async function getQuestionAnswersHandler(
-    req: Request<GetQuestionIdPathParams, {answers: AnswerDTO[] | AnswerId[]}, unknown, GetQuestionAnswersQueryParams>,
+    req: Request<GetQuestionIdPathParams, { answers: AnswerDTO[] | AnswerId[] }, unknown, GetQuestionAnswersQueryParams>,
     res: Response
 ): Promise<void> {
     const questionId = getQuestionId(req, res);
diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts
index ac6c3bb9..73f1317f 100644
--- a/backend/src/controllers/submissions.ts
+++ b/backend/src/controllers/submissions.ts
@@ -1,13 +1,8 @@
 import { Request, Response } from 'express';
-import {
-    createSubmission,
-    deleteSubmission,
-    getSubmission,
-    getSubmissionsForLearningObjectAndAssignment
-} from '../services/submissions.js';
+import { createSubmission, deleteSubmission, getSubmission, getSubmissionsForLearningObjectAndAssignment } from '../services/submissions.js';
 import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
 import { Language, languageMap } from '@dwengo-1/common/util/language';
-import {Submission} from "../entities/assignments/submission.entity";
+import { Submission } from '../entities/assignments/submission.entity';
 
 interface SubmissionParams {
     hruid: string;
@@ -15,27 +10,22 @@ interface SubmissionParams {
 }
 
 interface SubmissionQuery {
-    language: string,
+    language: string;
     version: number;
 }
 
 interface SubmissionsQuery extends SubmissionQuery {
-    classId: string,
-    assignmentId: number,
-    studentUsername?: string
+    classId: string;
+    assignmentId: number;
+    studentUsername?: string;
 }
 
-export async function getSubmissionsHandler(
-    req: Request<SubmissionParams, Submission[], null, SubmissionsQuery>,
-    res: Response
-): Promise<void> {
+export async function getSubmissionsHandler(req: Request<SubmissionParams, Submission[], null, SubmissionsQuery>, res: Response): Promise<void> {
     const loHruid = req.params.hruid;
     const lang = languageMap[req.query.language] || Language.Dutch;
-    const version = (req.query.version || 1);
+    const version = req.query.version || 1;
 
-    const submissions = await getSubmissionsForLearningObjectAndAssignment(
-        loHruid, lang, version, req.query.classId, req.query.assignmentId
-    );
+    const submissions = await getSubmissionsForLearningObjectAndAssignment(loHruid, lang, version, req.query.classId, req.query.assignmentId);
 
     res.json(submissions);
 }
diff --git a/backend/src/data/assignments/assignment-repository.ts b/backend/src/data/assignments/assignment-repository.ts
index c6766af9..db12a74f 100644
--- a/backend/src/data/assignments/assignment-repository.ts
+++ b/backend/src/data/assignments/assignment-repository.ts
@@ -15,11 +15,11 @@ export class AssignmentRepository extends DwengoEntityRepository<Assignment> {
                 within: {
                     teachers: {
                         $some: {
-                            username: teacherUsername
-                        }
-                    }
-                }
-            }
+                            username: teacherUsername,
+                        },
+                    },
+                },
+            },
         });
     }
     public async findAllAssignmentsInClass(within: Class): Promise<Assignment[]> {
diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts
index a79dc417..c82ed9c3 100644
--- a/backend/src/data/assignments/submission-repository.ts
+++ b/backend/src/data/assignments/submission-repository.ts
@@ -3,7 +3,7 @@ import { Group } from '../../entities/assignments/group.entity.js';
 import { Submission } from '../../entities/assignments/submission.entity.js';
 import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js';
 import { Student } from '../../entities/users/student.entity.js';
-import {Assignment} from "../../entities/assignments/assignment.entity";
+import { Assignment } from '../../entities/assignments/assignment.entity';
 
 export class SubmissionRepository extends DwengoEntityRepository<Submission> {
     public async findSubmissionByLearningObjectAndSubmissionNumber(
@@ -46,7 +46,7 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
         return this.find(
             { onBehalfOf: group },
             {
-                populate: ["onBehalfOf.members"]
+                populate: ['onBehalfOf.members'],
             }
         );
     }
@@ -60,24 +60,26 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
         assignment: Assignment,
         forStudentUsername?: string
     ): Promise<Submission[]> {
-        const onBehalfOf = forStudentUsername ? {
-            assignment,
-            members: {
-                $some: {
-                    username: forStudentUsername
-                }
-            }
-        } : {
-            assignment
-        };
+        const onBehalfOf = forStudentUsername
+            ? {
+                  assignment,
+                  members: {
+                      $some: {
+                          username: forStudentUsername,
+                      },
+                  },
+              }
+            : {
+                  assignment,
+              };
 
         return this.findAll({
             where: {
                 learningObjectHruid: loId.hruid,
                 learningObjectLanguage: loId.language,
                 learningObjectVersion: loId.version,
-                onBehalfOf
-            }
+                onBehalfOf,
+            },
         });
     }
 
@@ -85,9 +87,7 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
         const result = await this.find(
             { submitter: student },
             {
-                populate: [
-                    "onBehalfOf.members"
-                ]
+                populate: ['onBehalfOf.members'],
             }
         );
 
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 714c3818..6b961e07 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -3,11 +3,11 @@ import { Question } from '../../entities/questions/question.entity.js';
 import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js';
 import { Student } from '../../entities/users/student.entity.js';
 import { LearningObject } from '../../entities/content/learning-object.entity.js';
-import {Group} from "../../entities/assignments/group.entity";
-import {Assignment} from "../../entities/assignments/assignment.entity";
+import { Group } from '../../entities/assignments/group.entity';
+import { Assignment } from '../../entities/assignments/assignment.entity';
 
 export class QuestionRepository extends DwengoEntityRepository<Question> {
-    public async createQuestion(question: { loId: LearningObjectIdentifier; author: Student; inGroup: Group, content: string }): Promise<Question> {
+    public async createQuestion(question: { loId: LearningObjectIdentifier; author: Student; inGroup: Group; content: string }): Promise<Question> {
         const questionEntity = this.create({
             learningObjectHruid: question.loId.hruid,
             learningObjectLanguage: question.loId.language,
@@ -75,24 +75,26 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
         assignment: Assignment,
         forStudentUsername?: string
     ): Promise<Question[]> {
-        const inGroup = forStudentUsername ? {
-            assignment,
-            members: {
-                $some: {
-                    username: forStudentUsername
-                }
-            }
-        } : {
-            assignment
-        };
+        const inGroup = forStudentUsername
+            ? {
+                  assignment,
+                  members: {
+                      $some: {
+                          username: forStudentUsername,
+                      },
+                  },
+              }
+            : {
+                  assignment,
+              };
 
         return this.findAll({
             where: {
                 learningObjectHruid: loId.hruid,
                 learningObjectLanguage: loId.language,
                 learningObjectVersion: loId.version,
-                inGroup
-            }
+                inGroup,
+            },
         });
     }
 }
diff --git a/backend/src/entities/assignments/assignment.entity.ts b/backend/src/entities/assignments/assignment.entity.ts
index 52773909..e3f75489 100644
--- a/backend/src/entities/assignments/assignment.entity.ts
+++ b/backend/src/entities/assignments/assignment.entity.ts
@@ -1,4 +1,4 @@
-import {Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property} from '@mikro-orm/core';
+import { Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core';
 import { Class } from '../classes/class.entity.js';
 import { Group } from './group.entity.js';
 import { Language } from '@dwengo-1/common/util/language';
diff --git a/backend/src/entities/assignments/group.entity.ts b/backend/src/entities/assignments/group.entity.ts
index 1a69ed4b..55770b7f 100644
--- a/backend/src/entities/assignments/group.entity.ts
+++ b/backend/src/entities/assignments/group.entity.ts
@@ -1,4 +1,4 @@
-import {Collection, Entity, ManyToMany, ManyToOne, PrimaryKey} from '@mikro-orm/core';
+import { Collection, Entity, ManyToMany, ManyToOne, PrimaryKey } from '@mikro-orm/core';
 import { Assignment } from './assignment.entity.js';
 import { Student } from '../users/student.entity.js';
 import { GroupRepository } from '../../data/assignments/group-repository.js';
diff --git a/backend/src/entities/assignments/submission.entity.ts b/backend/src/entities/assignments/submission.entity.ts
index 728dd436..82d49a40 100644
--- a/backend/src/entities/assignments/submission.entity.ts
+++ b/backend/src/entities/assignments/submission.entity.ts
@@ -22,7 +22,7 @@ export class Submission {
     submissionNumber?: number;
 
     @ManyToOne({
-        entity: () => Group
+        entity: () => Group,
     })
     onBehalfOf!: Group;
 
@@ -34,8 +34,6 @@ export class Submission {
     @Property({ type: 'datetime' })
     submissionTime!: Date;
 
-
-
     @Property({ type: 'json' })
     content!: string;
 }
diff --git a/backend/src/entities/questions/question.entity.ts b/backend/src/entities/questions/question.entity.ts
index c6df4e6a..44ff3e32 100644
--- a/backend/src/entities/questions/question.entity.ts
+++ b/backend/src/entities/questions/question.entity.ts
@@ -2,7 +2,7 @@ import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core';
 import { Student } from '../users/student.entity.js';
 import { QuestionRepository } from '../../data/questions/question-repository.js';
 import { Language } from '@dwengo-1/common/util/language';
-import {Group} from "../assignments/group.entity";
+import { Group } from '../assignments/group.entity';
 
 @Entity({ repository: () => QuestionRepository })
 export class Question {
diff --git a/backend/src/interfaces/group.ts b/backend/src/interfaces/group.ts
index d3785137..295c7e0f 100644
--- a/backend/src/interfaces/group.ts
+++ b/backend/src/interfaces/group.ts
@@ -1,11 +1,11 @@
 import { Group } from '../entities/assignments/group.entity.js';
-import {mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId} from './assignment.js';
-import {mapToStudent, mapToStudentDTO} from './student.js';
-import {GroupDTO} from '@dwengo-1/common/interfaces/group';
-import {getGroupRepository} from "../data/repositories";
-import {AssignmentDTO} from "@dwengo-1/common/interfaces/assignment";
-import {Class} from "../entities/classes/class.entity";
-import {StudentDTO} from "@dwengo-1/common/interfaces/student";
+import { mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId } from './assignment.js';
+import { mapToStudent, mapToStudentDTO } from './student.js';
+import { GroupDTO } from '@dwengo-1/common/interfaces/group';
+import { getGroupRepository } from '../data/repositories';
+import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
+import { Class } from '../entities/classes/class.entity';
+import { StudentDTO } from '@dwengo-1/common/interfaces/student';
 
 export function mapToGroup(groupDto: GroupDTO, clazz: Class): Group {
     const assignmentDto = groupDto.assignment as AssignmentDTO;
@@ -13,7 +13,7 @@ export function mapToGroup(groupDto: GroupDTO, clazz: Class): Group {
     return getGroupRepository().create({
         groupNumber: groupDto.groupNumber,
         assignment: mapToAssignment(assignmentDto, clazz),
-        members: groupDto.members!.map(studentDto => mapToStudent(studentDto as StudentDTO))
+        members: groupDto.members!.map((studentDto) => mapToStudent(studentDto as StudentDTO)),
     });
 }
 
diff --git a/backend/src/interfaces/question.ts b/backend/src/interfaces/question.ts
index 5419618a..a9347047 100644
--- a/backend/src/interfaces/question.ts
+++ b/backend/src/interfaces/question.ts
@@ -2,7 +2,7 @@ import { Question } from '../entities/questions/question.entity.js';
 import { mapToStudentDTO } from './student.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
-import { mapToGroupDTOId } from "./group";
+import { mapToGroupDTOId } from './group';
 
 function getLearningObjectIdentifier(question: Question): LearningObjectIdentifier {
     return {
diff --git a/backend/src/routes/submissions.ts b/backend/src/routes/submissions.ts
index 930e1a59..492b6439 100644
--- a/backend/src/routes/submissions.ts
+++ b/backend/src/routes/submissions.ts
@@ -1,10 +1,5 @@
 import express from 'express';
-import {
-    createSubmissionHandler,
-    deleteSubmissionHandler,
-    getSubmissionHandler,
-    getSubmissionsHandler
-} from '../controllers/submissions.js';
+import { createSubmissionHandler, deleteSubmissionHandler, getSubmissionHandler, getSubmissionsHandler } from '../controllers/submissions.js';
 const router = express.Router({ mergeParams: true });
 
 // Root endpoint used to search objects
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index 5f5c22b7..aa3e1298 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -1,9 +1,4 @@
-import {
-    getAnswerRepository, getAssignmentRepository,
-    getClassRepository,
-    getGroupRepository,
-    getQuestionRepository
-} from '../data/repositories.js';
+import { getAnswerRepository, getAssignmentRepository, getClassRepository, getGroupRepository, getQuestionRepository } from '../data/repositories.js';
 import { mapToQuestionDTO, mapToQuestionDTOId } from '../interfaces/question.js';
 import { Question } from '../entities/questions/question.entity.js';
 import { Answer } from '../entities/questions/answer.entity.js';
@@ -13,8 +8,8 @@ import { LearningObjectIdentifier } from '../entities/content/learning-object-id
 import { mapToStudent } from '../interfaces/student.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
-import { AssignmentDTO } from "@dwengo-1/common/interfaces/assignment";
-import { mapToAssignment } from "../interfaces/assignment";
+import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
+import { mapToAssignment } from '../interfaces/assignment';
 
 export async function getQuestionsAboutLearningObjectInAssignment(
     loId: LearningObjectIdentifier,
@@ -23,15 +18,14 @@ export async function getQuestionsAboutLearningObjectInAssignment(
     full: boolean,
     studentUsername?: string
 ): Promise<QuestionDTO[] | QuestionId[]> {
-    const assignment = await getAssignmentRepository()
-        .findByClassIdAndAssignmentId(classId, assignmentId);
+    const assignment = await getAssignmentRepository().findByClassIdAndAssignmentId(classId, assignmentId);
 
-    const questions = await getQuestionRepository()
-        .findAllQuestionsAboutLearningObjectInAssignment(loId, assignment!, studentUsername);
+    const questions = await getQuestionRepository().findAllQuestionsAboutLearningObjectInAssignment(loId, assignment!, studentUsername);
 
-    if (full)
-        {return questions.map(q => mapToQuestionDTO(q));}
-    return questions.map(q => mapToQuestionDTOId(q));
+    if (full) {
+        return questions.map((q) => mapToQuestionDTO(q));
+    }
+    return questions.map((q) => mapToQuestionDTOId(q));
 }
 
 export async function getAllQuestions(id: LearningObjectIdentifier, full: boolean): Promise<QuestionDTO[] | QuestionId[]> {
@@ -101,7 +95,7 @@ export async function createQuestion(questionDTO: QuestionDTO): Promise<Question
         version: questionDTO.learningObjectIdentifier.version ?? 1,
     };
 
-    const clazz = await getClassRepository().findById((questionDTO.inGroup.assignment as AssignmentDTO).class)
+    const clazz = await getClassRepository().findById((questionDTO.inGroup.assignment as AssignmentDTO).class);
     const assignment = mapToAssignment(questionDTO.inGroup.assignment as AssignmentDTO, clazz!);
     const inGroup = await getGroupRepository().findByAssignmentAndGroupNumber(assignment, questionDTO.inGroup.groupNumber);
 
diff --git a/backend/src/services/students.ts b/backend/src/services/students.ts
index be2d270b..960edb93 100644
--- a/backend/src/services/students.ts
+++ b/backend/src/services/students.ts
@@ -23,7 +23,7 @@ import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request';
-import {Submission} from "../entities/assignments/submission.entity";
+import { Submission } from '../entities/assignments/submission.entity';
 
 export async function getAllStudents(full: boolean): Promise<StudentDTO[] | string[]> {
     const studentRepository = getStudentRepository();
diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts
index 08a19481..23659d63 100644
--- a/backend/src/services/submissions.ts
+++ b/backend/src/services/submissions.ts
@@ -1,4 +1,4 @@
-import {getAssignmentRepository, getSubmissionRepository} from '../data/repositories.js';
+import { getAssignmentRepository, getSubmissionRepository } from '../data/repositories.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { mapToSubmission, mapToSubmissionDTO } from '../interfaces/submission.js';
 import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
@@ -68,11 +68,9 @@ export async function getSubmissionsForLearningObjectAndAssignment(
     studentUsername?: string
 ): Promise<SubmissionDTO[]> {
     const loId = new LearningObjectIdentifier(learningObjectHruid, language, version);
-    const assignment = await getAssignmentRepository()
-                                                .findByClassIdAndAssignmentId(classId, assignmentId);
+    const assignment = await getAssignmentRepository().findByClassIdAndAssignmentId(classId, assignmentId);
 
-    const submissions = await getSubmissionRepository()
-                    .findAllSubmissionsForLearningObjectAndAssignment(loId, assignment!, studentUsername);
+    const submissions = await getSubmissionRepository().findAllSubmissionsForLearningObjectAndAssignment(loId, assignment!, studentUsername);
 
-    return submissions.map(s => mapToSubmissionDTO(s));
+    return submissions.map((s) => mapToSubmissionDTO(s));
 }
diff --git a/backend/tests/controllers/students.test.ts b/backend/tests/controllers/students.test.ts
index 35f9a9cf..93f35c48 100644
--- a/backend/tests/controllers/students.test.ts
+++ b/backend/tests/controllers/students.test.ts
@@ -147,7 +147,6 @@ describe('Student controllers', () => {
 
         const result = jsonMock.mock.lastCall?.[0];
         expect(result.submissions).to.have.length.greaterThan(0);
-
     });
 
     it('Student questions', async () => {
diff --git a/backend/tests/data/assignments/assignments.test.ts b/backend/tests/data/assignments/assignments.test.ts
index aad084e3..2bad08f2 100644
--- a/backend/tests/data/assignments/assignments.test.ts
+++ b/backend/tests/data/assignments/assignments.test.ts
@@ -32,10 +32,8 @@ describe('AssignmentRepository', () => {
     });
 
     it('should find all by username of the responsible teacher', async () => {
-        const result = await assignmentRepository.findAllByResponsibleTeacher("FooFighters")
-        const resultIds = result
-                                                .map(it => it.id)
-                                                .sort((a, b) => (a ?? 0) - (b ?? 0));
+        const result = await assignmentRepository.findAllByResponsibleTeacher('FooFighters');
+        const resultIds = result.map((it) => it.id).sort((a, b) => (a ?? 0) - (b ?? 0));
 
         expect(resultIds).toEqual([1, 3, 4]);
     });
diff --git a/backend/tests/data/assignments/submissions.test.ts b/backend/tests/data/assignments/submissions.test.ts
index c7920734..acc82384 100644
--- a/backend/tests/data/assignments/submissions.test.ts
+++ b/backend/tests/data/assignments/submissions.test.ts
@@ -1,6 +1,6 @@
-import {beforeAll, describe, expect, it} from 'vitest';
-import {setupTestApp} from '../../setup-tests';
-import {SubmissionRepository} from '../../../src/data/assignments/submission-repository';
+import { beforeAll, describe, expect, it } from 'vitest';
+import { setupTestApp } from '../../setup-tests';
+import { SubmissionRepository } from '../../../src/data/assignments/submission-repository';
 import {
     getAssignmentRepository,
     getClassRepository,
@@ -8,15 +8,15 @@ import {
     getStudentRepository,
     getSubmissionRepository,
 } from '../../../src/data/repositories';
-import {LearningObjectIdentifier} from '../../../src/entities/content/learning-object-identifier';
-import {Language} from '@dwengo-1/common/util/language';
-import {StudentRepository} from '../../../src/data/users/student-repository';
-import {GroupRepository} from '../../../src/data/assignments/group-repository';
-import {AssignmentRepository} from '../../../src/data/assignments/assignment-repository';
-import {ClassRepository} from '../../../src/data/classes/class-repository';
-import {Submission} from "../../../src/entities/assignments/submission.entity";
-import {Class} from "../../../src/entities/classes/class.entity";
-import {Assignment} from "../../../src/entities/assignments/assignment.entity";
+import { LearningObjectIdentifier } from '../../../src/entities/content/learning-object-identifier';
+import { Language } from '@dwengo-1/common/util/language';
+import { StudentRepository } from '../../../src/data/users/student-repository';
+import { GroupRepository } from '../../../src/data/assignments/group-repository';
+import { AssignmentRepository } from '../../../src/data/assignments/assignment-repository';
+import { ClassRepository } from '../../../src/data/classes/class-repository';
+import { Submission } from '../../../src/entities/assignments/submission.entity';
+import { Class } from '../../../src/entities/classes/class.entity';
+import { Assignment } from '../../../src/entities/assignments/assignment.entity';
 
 describe('SubmissionRepository', () => {
     let submissionRepository: SubmissionRepository;
@@ -69,9 +69,9 @@ describe('SubmissionRepository', () => {
         clazz = await classRepository.findById('id01');
         assignment = await assignmentRepository.findByClassAndId(clazz!, 1);
         loId = {
-            hruid: "id02",
+            hruid: 'id02',
             language: Language.English,
-            version: 1
+            version: 1,
         };
         const result = await submissionRepository.findAllSubmissionsForLearningObjectAndAssignment(loId, assignment!);
         sortSubmissions(result);
@@ -92,8 +92,7 @@ describe('SubmissionRepository', () => {
     });
 
     it("should find only the submissions for a certain learning object and assignment made for the user's group", async () => {
-        const result =
-            await submissionRepository.findAllSubmissionsForLearningObjectAndAssignment(loId, assignment!, "Tool");
+        const result = await submissionRepository.findAllSubmissionsForLearningObjectAndAssignment(loId, assignment!, 'Tool');
         // (student Tool is in group #2)
 
         expect(result).toHaveLength(1);
@@ -118,8 +117,12 @@ describe('SubmissionRepository', () => {
 
 function sortSubmissions(submissions: Submission[]): void {
     submissions.sort((a, b) => {
-        if (a.learningObjectHruid < b.learningObjectHruid) {return -1;}
-        if (a.learningObjectHruid > b.learningObjectHruid) {return 1;}
+        if (a.learningObjectHruid < b.learningObjectHruid) {
+            return -1;
+        }
+        if (a.learningObjectHruid > b.learningObjectHruid) {
+            return 1;
+        }
         return a.submissionNumber! - b.submissionNumber!;
     });
 }
diff --git a/backend/tests/data/questions/questions.test.ts b/backend/tests/data/questions/questions.test.ts
index e8069070..f24601bb 100644
--- a/backend/tests/data/questions/questions.test.ts
+++ b/backend/tests/data/questions/questions.test.ts
@@ -2,17 +2,18 @@ import { beforeAll, describe, expect, it } from 'vitest';
 import { setupTestApp } from '../../setup-tests';
 import { QuestionRepository } from '../../../src/data/questions/question-repository';
 import {
-    getAssignmentRepository, getClassRepository,
+    getAssignmentRepository,
+    getClassRepository,
     getGroupRepository,
     getQuestionRepository,
-    getStudentRepository
+    getStudentRepository,
 } from '../../../src/data/repositories';
 import { StudentRepository } from '../../../src/data/users/student-repository';
 import { LearningObjectIdentifier } from '../../../src/entities/content/learning-object-identifier';
 import { Language } from '@dwengo-1/common/util/language';
-import {Question} from "../../../src/entities/questions/question.entity";
-import {Class} from "../../../src/entities/classes/class.entity";
-import {Assignment} from "../../../src/entities/assignments/assignment.entity";
+import { Question } from '../../../src/entities/questions/question.entity';
+import { Class } from '../../../src/entities/classes/class.entity';
+import { Assignment } from '../../../src/entities/assignments/assignment.entity';
 
 describe('QuestionRepository', () => {
     let questionRepository: QuestionRepository;
@@ -36,7 +37,7 @@ describe('QuestionRepository', () => {
         const id = new LearningObjectIdentifier('id03', Language.English, 1);
         const student = await studentRepository.findByUsername('Noordkaap');
 
-        const clazz = await getClassRepository().findById("id01");
+        const clazz = await getClassRepository().findById('id01');
         const assignment = await getAssignmentRepository().findByClassAndId(clazz!, 1);
         const group = await getGroupRepository().findByAssignmentAndGroupNumber(assignment!, 1);
         await questionRepository.createQuestion({
@@ -58,9 +59,9 @@ describe('QuestionRepository', () => {
         clazz = await getClassRepository().findById('id01');
         assignment = await getAssignmentRepository().findByClassAndId(clazz!, 1);
         loId = {
-            hruid: "id05",
+            hruid: 'id05',
             language: Language.English,
-            version: 1
+            version: 1,
         };
         const result = await questionRepository.findAllQuestionsAboutLearningObjectInAssignment(loId, assignment!);
         sortQuestions(result);
@@ -83,8 +84,7 @@ describe('QuestionRepository', () => {
     });
 
     it("should find only the questions for a certain learning object and assignment asked by the user's group", async () => {
-        const result =
-            await questionRepository.findAllQuestionsAboutLearningObjectInAssignment(loId, assignment!, "Tool");
+        const result = await questionRepository.findAllQuestionsAboutLearningObjectInAssignment(loId, assignment!, 'Tool');
         // (student Tool is in group #2)
 
         expect(result).toHaveLength(1);
@@ -110,8 +110,11 @@ describe('QuestionRepository', () => {
 
 function sortQuestions(questions: Question[]): void {
     questions.sort((a, b) => {
-        if (a.learningObjectHruid < b.learningObjectHruid) {return -1}
-        else if (a.learningObjectHruid > b.learningObjectHruid) {return 1}
-        return a.sequenceNumber! - b.sequenceNumber!
+        if (a.learningObjectHruid < b.learningObjectHruid) {
+            return -1;
+        } else if (a.learningObjectHruid > b.learningObjectHruid) {
+            return 1;
+        }
+        return a.sequenceNumber! - b.sequenceNumber!;
     });
 }
diff --git a/backend/tests/services/learning-path/database-learning-path-provider.test.ts b/backend/tests/services/learning-path/database-learning-path-provider.test.ts
index 2c7ceb0b..0a0370a3 100644
--- a/backend/tests/services/learning-path/database-learning-path-provider.test.ts
+++ b/backend/tests/services/learning-path/database-learning-path-provider.test.ts
@@ -25,9 +25,9 @@ import { Student } from '../../../src/entities/users/student.entity.js';
 
 import { LearningObjectNode, LearningPathResponse } from '@dwengo-1/common/interfaces/learning-content';
 
-const STUDENT_A_USERNAME = "student_a";
-const STUDENT_B_USERNAME = "student_b";
-const CLASS_NAME = "test_class"
+const STUDENT_A_USERNAME = 'student_a';
+const STUDENT_B_USERNAME = 'student_b';
+const CLASS_NAME = 'test_class';
 
 async function initExampleData(): Promise<{ learningObject: LearningObject; learningPath: LearningPath }> {
     const learningObjectRepo = getLearningObjectRepository();
@@ -44,7 +44,7 @@ async function initPersonalizationTestData(): Promise<{
     studentA: Student;
     studentB: Student;
 }> {
-    const studentRepo = getStudentRepository()
+    const studentRepo = getStudentRepository();
     const classRepo = getClassRepository();
     const assignmentRepo = getAssignmentRepository();
     const groupRepo = getGroupRepository();
@@ -75,31 +75,31 @@ async function initPersonalizationTestData(): Promise<{
     // Create class for students
     const testClass = classRepo.create({
         classId: CLASS_NAME,
-        displayName: "Test class"
+        displayName: 'Test class',
     });
     await classRepo.save(testClass);
 
     // Create assignment for students and assign them to different groups
     const assignment = assignmentRepo.create({
         id: 0,
-        title: "Test assignment",
-        description: "Test description",
+        title: 'Test assignment',
+        description: 'Test description',
         learningPathHruid: learningContent.learningPath.hruid,
         learningPathLanguage: learningContent.learningPath.language,
-        within: testClass
-    })
+        within: testClass,
+    });
 
     const groupA = groupRepo.create({
         groupNumber: 0,
         members: [studentA],
-        assignment
+        assignment,
     });
     await groupRepo.save(groupA);
 
     const groupB = groupRepo.create({
         groupNumber: 1,
         members: [studentB],
-        assignment
+        assignment,
     });
     await groupRepo.save(groupB);
 
diff --git a/backend/tests/test_assets/questions/questions.testdata.ts b/backend/tests/test_assets/questions/questions.testdata.ts
index 1e4a37ef..10a04571 100644
--- a/backend/tests/test_assets/questions/questions.testdata.ts
+++ b/backend/tests/test_assets/questions/questions.testdata.ts
@@ -2,7 +2,7 @@ import { EntityManager } from '@mikro-orm/core';
 import { Question } from '../../../src/entities/questions/question.entity';
 import { Language } from '@dwengo-1/common/util/language';
 import { Student } from '../../../src/entities/users/student.entity';
-import {Group} from "../../../src/entities/assignments/group.entity";
+import { Group } from '../../../src/entities/assignments/group.entity';
 
 export function makeTestQuestions(em: EntityManager, students: Student[], groups: Group[]): Question[] {
     const question01 = em.create(Question, {
diff --git a/common/src/interfaces/question.ts b/common/src/interfaces/question.ts
index 9b00e1bd..bd689c34 100644
--- a/common/src/interfaces/question.ts
+++ b/common/src/interfaces/question.ts
@@ -1,6 +1,6 @@
 import { LearningObjectIdentifier } from './learning-content';
 import { StudentDTO } from './student';
-import {GroupDTO} from "./group";
+import { GroupDTO } from './group';
 
 export interface QuestionDTO {
     learningObjectIdentifier: LearningObjectIdentifier;

From 2d55ac6248f48554927f5acefa9d2de008503607 Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger
 <165218235+geraldschmittinger@users.noreply.github.com>
Date: Tue, 8 Apr 2025 10:59:25 +0200
Subject: [PATCH 111/177] fix(backend): Foutmelding createQuestionHandler
 aangepast.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 backend/src/controllers/questions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts
index 26efb4f4..4df165ee 100644
--- a/backend/src/controllers/questions.ts
+++ b/backend/src/controllers/questions.ts
@@ -144,7 +144,7 @@ export async function createQuestionHandler(req: Request, res: Response): Promis
     const questionDTO = req.body as QuestionDTO;
 
     if (!questionDTO.learningObjectIdentifier || !questionDTO.author || !questionDTO.inGroup || !questionDTO.content) {
-        res.status(400).json({ error: 'Missing required fields: identifier and content' });
+        res.status(400).json({ error: 'Missing required fields: identifier, author, inGroup, and content' });
         return;
     }
 

From 39cfcab17997704b11dcab9a349ba56eea45258f Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Tue, 8 Apr 2025 16:31:09 +0200
Subject: [PATCH 112/177] feat: student kan nu ook de leerkrachten bij zijn
 klassen zien

---
 frontend/src/views/classes/StudentClasses.vue | 51 +++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/classes/StudentClasses.vue b/frontend/src/views/classes/StudentClasses.vue
index 1ff60cb1..a59481b4 100644
--- a/frontend/src/views/classes/StudentClasses.vue
+++ b/frontend/src/views/classes/StudentClasses.vue
@@ -7,9 +7,12 @@
     import { useCreateJoinRequestMutation, useStudentClassesQuery } from "@/queries/students";
     import type { StudentDTO } from "@dwengo-1/common/interfaces/student";
     import { StudentController } from "@/controllers/students";
+    import { type TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
+    import { TeacherController } from "@/controllers/teachers";
 
     const { t } = useI18n();
     const studentController: StudentController = new StudentController();
+    const teacherController: TeacherController = new TeacherController();
 
     // Username of logged in student
     const username = ref<string | undefined>(undefined);
@@ -40,16 +43,19 @@
     // Students of selected class are shown when logged in student presses on the member count
     const selectedClass = ref<ClassDTO | null>(null);
     const students = ref<StudentDTO[]>([]);
+    const teachers = ref<TeacherDTO[]>([]);
+    const getStudents = ref(false);
 
     // Boolean that handles visibility for dialogs
     // Clicking on membercount will show a dialog with all members
     const dialog = ref(false);
 
     // Function to display all members of a class in a dialog
-    async function openDialog(c: ClassDTO): Promise<void> {
+    async function openStudentDialog(c: ClassDTO): Promise<void> {
         selectedClass.value = c;
 
         // Clear previous value
+        getStudents.value = true;
         students.value = [];
         dialog.value = true;
 
@@ -69,6 +75,30 @@
         students.value = studentDTOs.filter(Boolean) as StudentDTO[];
     }
 
+    async function openTeacherDialog(c: ClassDTO): Promise<void> {
+        selectedClass.value = c;
+
+        // clear previous value
+        getStudents.value = false;
+        teachers.value = [];
+        dialog.value = true;
+
+        // Fetch names of teachers
+        const teacherDTOs: (TeacherDTO | null)[] = await Promise.all(
+            c.teachers.map(async (uid) => {
+                try {
+                    const res = await teacherController.getByUsername(uid);
+                    console.log(res);
+                    return res.teacher;
+                } catch (_) {
+                    return null;
+                }
+            }),
+        );
+
+        teachers.value = teacherDTOs.filter(Boolean) as TeacherDTO[];
+    }
+
     // Hold the code a student gives in to join a class
     const code = ref<string>("");
 
@@ -158,6 +188,7 @@
                             <thead>
                                 <tr>
                                     <th class="header">{{ t("classes") }}</th>
+                                    <th class="header">{{ t("teachers") }}</th>
                                     <th class="header">{{ t("members") }}</th>
                                 </tr>
                             </thead>
@@ -169,7 +200,13 @@
                                     <td>{{ c.displayName }}</td>
                                     <td
                                         class="link"
-                                        @click="openDialog(c)"
+                                        @click="openTeacherDialog(c)"
+                                    >
+                                        {{ c.teachers.length }}
+                                    </td>
+                                    <td
+                                        class="link"
+                                        @click="openStudentDialog(c)"
                                     >
                                         {{ c.students.length }}
                                     </td>
@@ -187,7 +224,7 @@
                 <v-card>
                     <v-card-title> {{ selectedClass?.displayName }} </v-card-title>
                     <v-card-text>
-                        <ul>
+                        <ul v-if="getStudents">
                             <li
                                 v-for="student in students"
                                 :key="student.username"
@@ -195,6 +232,14 @@
                                 {{ student.firstName + " " + student.lastName }}
                             </li>
                         </ul>
+                        <ul v-else>
+                            <li
+                                v-for="teacher in teachers"
+                                :key="teacher.username"
+                            >
+                                {{ teacher.firstName + " " + teacher.lastName }}
+                            </li>
+                        </ul>
                     </v-card-text>
                     <v-card-actions>
                         <v-btn

From 095609d35719c34d77b6b2111efc0ea0095830d8 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Tue, 8 Apr 2025 18:08:35 +0200
Subject: [PATCH 113/177] fix: .js toevoegen aan imports

---
 backend/src/entities/questions/question.entity.ts | 2 +-
 backend/src/interfaces/group.ts                   | 4 ++--
 backend/src/interfaces/question.ts                | 2 +-
 backend/src/services/questions.ts                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/entities/questions/question.entity.ts b/backend/src/entities/questions/question.entity.ts
index 44ff3e32..44ccfbd3 100644
--- a/backend/src/entities/questions/question.entity.ts
+++ b/backend/src/entities/questions/question.entity.ts
@@ -2,7 +2,7 @@ import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core';
 import { Student } from '../users/student.entity.js';
 import { QuestionRepository } from '../../data/questions/question-repository.js';
 import { Language } from '@dwengo-1/common/util/language';
-import { Group } from '../assignments/group.entity';
+import { Group } from '../assignments/group.entity.js';
 
 @Entity({ repository: () => QuestionRepository })
 export class Question {
diff --git a/backend/src/interfaces/group.ts b/backend/src/interfaces/group.ts
index 295c7e0f..abbd97de 100644
--- a/backend/src/interfaces/group.ts
+++ b/backend/src/interfaces/group.ts
@@ -2,9 +2,9 @@ import { Group } from '../entities/assignments/group.entity.js';
 import { mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId } from './assignment.js';
 import { mapToStudent, mapToStudentDTO } from './student.js';
 import { GroupDTO } from '@dwengo-1/common/interfaces/group';
-import { getGroupRepository } from '../data/repositories';
+import { getGroupRepository } from '../data/repositories.js';
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
-import { Class } from '../entities/classes/class.entity';
+import { Class } from '../entities/classes/class.entity.js';
 import { StudentDTO } from '@dwengo-1/common/interfaces/student';
 
 export function mapToGroup(groupDto: GroupDTO, clazz: Class): Group {
diff --git a/backend/src/interfaces/question.ts b/backend/src/interfaces/question.ts
index a9347047..08887aba 100644
--- a/backend/src/interfaces/question.ts
+++ b/backend/src/interfaces/question.ts
@@ -2,7 +2,7 @@ import { Question } from '../entities/questions/question.entity.js';
 import { mapToStudentDTO } from './student.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
-import { mapToGroupDTOId } from './group';
+import { mapToGroupDTOId } from './group.js';
 
 function getLearningObjectIdentifier(question: Question): LearningObjectIdentifier {
     return {
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index aa3e1298..4794a3dc 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -9,7 +9,7 @@ import { mapToStudent } from '../interfaces/student.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
-import { mapToAssignment } from '../interfaces/assignment';
+import { mapToAssignment } from '../interfaces/assignment.js';
 
 export async function getQuestionsAboutLearningObjectInAssignment(
     loId: LearningObjectIdentifier,

From d6760445ef1499943ddbb1dafbc80a9153044aa9 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Tue, 8 Apr 2025 19:34:40 +0200
Subject: [PATCH 114/177] style: linting en formatting

---
 frontend/src/views/classes/SingleClass.vue    | 18 +-----------------
 frontend/src/views/classes/StudentClasses.vue |  5 ++---
 frontend/src/views/classes/TeacherClasses.vue |  8 ++++----
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/frontend/src/views/classes/SingleClass.vue b/frontend/src/views/classes/SingleClass.vue
index 83eb6f37..6a6b2f12 100644
--- a/frontend/src/views/classes/SingleClass.vue
+++ b/frontend/src/views/classes/SingleClass.vue
@@ -3,7 +3,6 @@
     import authState from "@/services/auth/auth-service.ts";
     import { onMounted, ref } from "vue";
     import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
-    import type { TeacherInvitationDTO } from "@dwengo-1/common/interfaces/teacher-invitation";
     import { useRoute } from "vue-router";
     import { ClassController, type ClassResponse } from "@/controllers/classes";
     import type { StudentsResponse } from "@/controllers/students";
@@ -46,21 +45,6 @@
     const dialog = ref(false);
     const selectedStudent = ref<StudentDTO | null>(null);
 
-    // TODO: waiting on frontend controllers
-    const invitations = ref<TeacherInvitationDTO[]>([]);
-
-    // Function to handle a accepted invitation request
-    function acceptRequest(): void {
-        //TODO > waiting on updated frontend controllers
-        console.log("request accepted");
-    }
-
-    // Function to handle a denied invitation request
-    function denyRequest(): void {
-        //TODO > waiting on frontend controllers
-        console.log("request denied");
-    }
-
     function showPopup(s: StudentDTO): void {
         selectedStudent.value = s;
         dialog.value = true;
@@ -68,7 +52,7 @@
 
     // Remove student from class
     function removeStudentFromclass(): void {
-        console.log("student removed");
+        dialog.value = false;
     }
 </script>
 <template>
diff --git a/frontend/src/views/classes/StudentClasses.vue b/frontend/src/views/classes/StudentClasses.vue
index a59481b4..2bfdc1b8 100644
--- a/frontend/src/views/classes/StudentClasses.vue
+++ b/frontend/src/views/classes/StudentClasses.vue
@@ -7,7 +7,7 @@
     import { useCreateJoinRequestMutation, useStudentClassesQuery } from "@/queries/students";
     import type { StudentDTO } from "@dwengo-1/common/interfaces/student";
     import { StudentController } from "@/controllers/students";
-    import { type TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
+    import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
     import { TeacherController } from "@/controllers/teachers";
 
     const { t } = useI18n();
@@ -78,7 +78,7 @@
     async function openTeacherDialog(c: ClassDTO): Promise<void> {
         selectedClass.value = c;
 
-        // clear previous value
+        // Clear previous value
         getStudents.value = false;
         teachers.value = [];
         dialog.value = true;
@@ -88,7 +88,6 @@
             c.teachers.map(async (uid) => {
                 try {
                     const res = await teacherController.getByUsername(uid);
-                    console.log(res);
                     return res.teacher;
                 } catch (_) {
                     return null;
diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
index 57e8ea0a..ae673d99 100644
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -49,14 +49,14 @@
 
     // Function to handle a accepted invitation request
     function acceptRequest(): void {
-        //TODO
-        console.log("request accepted");
+        //TODO: avoid linting issues when merging by filling the function
+        invitations.value = [];
     }
 
     // Function to handle a denied invitation request
     function denyRequest(): void {
-        //TODO
-        console.log("request denied");
+        //TODO: avoid linting issues when merging by filling the function
+        invitations.value = [];
     }
 
     // Teacher should be able to set a displayname when making a class

From fc4e406845453a67e86f6101821ef10663a70f48 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Tue, 8 Apr 2025 17:47:35 +0000
Subject: [PATCH 115/177] style: fix linting issues met Prettier

---
 .../test_assets/classes/classes.testdata.ts   |  2 +-
 .../test_assets/users/students.testdata.ts    |  2 +-
 .../test_assets/users/teachers.testdata.ts    |  2 +-
 backend/tool/seed.ts                          | 34 +++++++++----------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/backend/tests/test_assets/classes/classes.testdata.ts b/backend/tests/test_assets/classes/classes.testdata.ts
index db0a91b0..0f223ec4 100644
--- a/backend/tests/test_assets/classes/classes.testdata.ts
+++ b/backend/tests/test_assets/classes/classes.testdata.ts
@@ -5,7 +5,7 @@ import { Teacher } from '../../../src/entities/users/teacher.entity';
 
 export function makeTestClasses(em: EntityManager, students: Student[], teachers: Teacher[]): Class[] {
     const studentsClass01 = students.slice(0, 8);
-    const teacherClass01: Teacher[] = teachers.slice(4,5);
+    const teacherClass01: Teacher[] = teachers.slice(4, 5);
 
     const class01 = em.create(Class, {
         classId: '8764b861-90a6-42e5-9732-c0d9eb2f55f9',
diff --git a/backend/tests/test_assets/users/students.testdata.ts b/backend/tests/test_assets/users/students.testdata.ts
index b2dc1899..7a1fe191 100644
--- a/backend/tests/test_assets/users/students.testdata.ts
+++ b/backend/tests/test_assets/users/students.testdata.ts
@@ -12,7 +12,7 @@ export const TEST_STUDENTS = [
     // ⚠️ Deze mag niet gebruikt worden in elke test!
     { username: 'Nirvana', firstName: 'Kurt', lastName: 'Cobain' },
     // Makes sure when logged in as leerling1, there exists a corresponding user
-    { username: 'testleerling1', firstName: 'Gerald', lastName: 'Schmittinger'},
+    { username: 'testleerling1', firstName: 'Gerald', lastName: 'Schmittinger' },
 ];
 
 // 🏗️ Functie die ORM entities maakt uit de data array
diff --git a/backend/tests/test_assets/users/teachers.testdata.ts b/backend/tests/test_assets/users/teachers.testdata.ts
index 4ecc3274..db726dcf 100644
--- a/backend/tests/test_assets/users/teachers.testdata.ts
+++ b/backend/tests/test_assets/users/teachers.testdata.ts
@@ -31,7 +31,7 @@ export function makeTestTeachers(em: EntityManager): Teacher[] {
     const teacher05 = em.create(Teacher, {
         username: 'testleerkracht1',
         firstName: 'Bob',
-        lastName: 'Dylan'
+        lastName: 'Dylan',
     });
 
     return [teacher01, teacher02, teacher03, teacher04, teacher05];
diff --git a/backend/tool/seed.ts b/backend/tool/seed.ts
index a51a7c5b..33344234 100644
--- a/backend/tool/seed.ts
+++ b/backend/tool/seed.ts
@@ -1,30 +1,30 @@
-import { forkEntityManager, initORM } from "../src/orm.js";
+import { forkEntityManager, initORM } from '../src/orm.js';
 import dotenv from 'dotenv';
-import { makeTestAssignemnts } from "../tests/test_assets/assignments/assignments.testdata.js";
-import { makeTestGroups } from "../tests/test_assets/assignments/groups.testdata.js";
-import { makeTestSubmissions } from "../tests/test_assets/assignments/submission.testdata.js";
-import { makeTestClassJoinRequests } from "../tests/test_assets/classes/class-join-requests.testdata.js";
-import { makeTestClasses } from "../tests/test_assets/classes/classes.testdata.js";
-import { makeTestTeacherInvitations } from "../tests/test_assets/classes/teacher-invitations.testdata.js";
-import { makeTestAttachments } from "../tests/test_assets/content/attachments.testdata.js";
-import { makeTestLearningObjects } from "../tests/test_assets/content/learning-objects.testdata.js";
-import { makeTestLearningPaths } from "../tests/test_assets/content/learning-paths.testdata.js";
-import { makeTestAnswers } from "../tests/test_assets/questions/answers.testdata.js";
-import { makeTestQuestions } from "../tests/test_assets/questions/questions.testdata.js";
-import { makeTestStudents } from "../tests/test_assets/users/students.testdata.js";
-import { makeTestTeachers } from "../tests/test_assets/users/teachers.testdata.js";
+import { makeTestAssignemnts } from '../tests/test_assets/assignments/assignments.testdata.js';
+import { makeTestGroups } from '../tests/test_assets/assignments/groups.testdata.js';
+import { makeTestSubmissions } from '../tests/test_assets/assignments/submission.testdata.js';
+import { makeTestClassJoinRequests } from '../tests/test_assets/classes/class-join-requests.testdata.js';
+import { makeTestClasses } from '../tests/test_assets/classes/classes.testdata.js';
+import { makeTestTeacherInvitations } from '../tests/test_assets/classes/teacher-invitations.testdata.js';
+import { makeTestAttachments } from '../tests/test_assets/content/attachments.testdata.js';
+import { makeTestLearningObjects } from '../tests/test_assets/content/learning-objects.testdata.js';
+import { makeTestLearningPaths } from '../tests/test_assets/content/learning-paths.testdata.js';
+import { makeTestAnswers } from '../tests/test_assets/questions/answers.testdata.js';
+import { makeTestQuestions } from '../tests/test_assets/questions/questions.testdata.js';
+import { makeTestStudents } from '../tests/test_assets/users/students.testdata.js';
+import { makeTestTeachers } from '../tests/test_assets/users/teachers.testdata.js';
 import { getLogger, Logger } from '../src/logging/initalize.js';
 
 const logger: Logger = getLogger();
 
-export async function seedDatabase() : Promise<void> {
+export async function seedDatabase(): Promise<void> {
     dotenv.config({ path: '.env.development.local' });
     const orm = await initORM();
     await orm.schema.clearDatabase();
 
     const em = forkEntityManager();
 
-    logger.info("seeding database...")
+    logger.info('seeding database...');
 
     const students = makeTestStudents(em);
     const teachers = makeTestTeachers(em);
@@ -69,4 +69,4 @@ export async function seedDatabase() : Promise<void> {
     await orm.close();
 }
 
-seedDatabase().catch(logger.error);
\ No newline at end of file
+seedDatabase().catch(logger.error);

From 62973472069cf9aa88e3abdc4b9c024fff741b6f Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Wed, 9 Apr 2025 10:26:33 +0200
Subject: [PATCH 116/177] fix: .js toevoegen aan imports

---
 backend/src/controllers/answers.ts   |  8 ++++----
 backend/src/controllers/questions.ts |  2 +-
 backend/src/interfaces/answer.ts     |  2 +-
 backend/src/routes/answers.ts        |  2 +-
 backend/src/services/answers.ts      | 12 ++++++------
 backend/src/services/questions.ts    |  6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/backend/src/controllers/answers.ts b/backend/src/controllers/answers.ts
index eaf51749..38cebe84 100644
--- a/backend/src/controllers/answers.ts
+++ b/backend/src/controllers/answers.ts
@@ -1,8 +1,8 @@
 import { Request, Response } from 'express';
-import { requireFields } from './error-helper';
-import { getLearningObjectId, getQuestionId } from './questions';
-import { createAnswer, deleteAnswer, getAnswer, getAnswersByQuestion, updateAnswer } from '../services/answers';
-import { FALLBACK_SEQ_NUM } from '../config';
+import { requireFields } from './error-helper.js';
+import { getLearningObjectId, getQuestionId } from './questions.js';
+import { createAnswer, deleteAnswer, getAnswer, getAnswersByQuestion, updateAnswer } from '../services/answers.js';
+import { FALLBACK_SEQ_NUM } from '../config.js';
 import { AnswerData } from '@dwengo-1/common/interfaces/answer';
 
 export async function getAllAnswersHandler(req: Request, res: Response): Promise<void> {
diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts
index 1158e041..dfb3ef6c 100644
--- a/backend/src/controllers/questions.ts
+++ b/backend/src/controllers/questions.ts
@@ -4,7 +4,7 @@ import { FALLBACK_LANG, FALLBACK_SEQ_NUM, FALLBACK_VERSION_NUM } from '../config
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { QuestionData, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { Language } from '@dwengo-1/common/util/language';
-import { requireFields } from './error-helper';
+import { requireFields } from './error-helper.js';
 
 export function getLearningObjectId(hruid: string, version: string, lang: string): LearningObjectIdentifier {
     return {
diff --git a/backend/src/interfaces/answer.ts b/backend/src/interfaces/answer.ts
index b78c579f..513fc63e 100644
--- a/backend/src/interfaces/answer.ts
+++ b/backend/src/interfaces/answer.ts
@@ -1,7 +1,7 @@
 import { mapToQuestionDTO, mapToQuestionDTOId } from './question.js';
 import { Answer } from '../entities/questions/answer.entity.js';
 import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
-import { mapToTeacherDTO } from './teacher';
+import { mapToTeacherDTO } from './teacher.js';
 
 /**
  * Convert a Question entity to a DTO format.
diff --git a/backend/src/routes/answers.ts b/backend/src/routes/answers.ts
index 5800733a..b74f76a0 100644
--- a/backend/src/routes/answers.ts
+++ b/backend/src/routes/answers.ts
@@ -1,5 +1,5 @@
 import express from 'express';
-import { createAnswerHandler, deleteAnswerHandler, getAnswerHandler, getAllAnswersHandler, updateAnswerHandler } from '../controllers/answers';
+import { createAnswerHandler, deleteAnswerHandler, getAnswerHandler, getAllAnswersHandler, updateAnswerHandler } from '../controllers/answers.js';
 
 const router = express.Router({ mergeParams: true });
 
diff --git a/backend/src/services/answers.ts b/backend/src/services/answers.ts
index f2abad51..ab603883 100644
--- a/backend/src/services/answers.ts
+++ b/backend/src/services/answers.ts
@@ -1,11 +1,11 @@
-import { getAnswerRepository } from '../data/repositories';
-import { Answer } from '../entities/questions/answer.entity';
-import { mapToAnswerDTO, mapToAnswerDTOId } from '../interfaces/answer';
-import { fetchTeacher } from './teachers';
-import { fetchQuestion } from './questions';
+import { getAnswerRepository } from '../data/repositories.js';
+import { Answer } from '../entities/questions/answer.entity.js';
+import { mapToAnswerDTO, mapToAnswerDTOId } from '../interfaces/answer.js';
+import { fetchTeacher } from './teachers.js';
+import { fetchQuestion } from './questions.js';
 import { QuestionId } from '@dwengo-1/common/interfaces/question';
 import { AnswerData, AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
-import { NotFoundException } from '../exceptions/not-found-exception';
+import { NotFoundException } from '../exceptions/not-found-exception.js';
 
 export async function getAnswersByQuestion(questionId: QuestionId, full: boolean): Promise<AnswerDTO[] | AnswerId[]> {
     const answerRepository = getAnswerRepository();
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index d2e6440e..2dd7da1c 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -4,9 +4,9 @@ import { Question } from '../entities/questions/question.entity.js';
 import { QuestionRepository } from '../data/questions/question-repository.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { QuestionData, QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
-import { NotFoundException } from '../exceptions/not-found-exception';
-import { FALLBACK_VERSION_NUM } from '../config';
-import { fetchStudent } from './students';
+import { NotFoundException } from '../exceptions/not-found-exception.js';
+import { FALLBACK_VERSION_NUM } from '../config.js';
+import { fetchStudent } from './students.js';
 
 export async function getAllQuestions(id: LearningObjectIdentifier, full: boolean): Promise<QuestionDTO[] | QuestionId[]> {
     const questionRepository: QuestionRepository = getQuestionRepository();

From b2b9323a69b9ec8f3f59791ab9e2051acd18bc29 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Wed, 9 Apr 2025 10:41:47 +0200
Subject: [PATCH 117/177] fix: juiste duitse vertalingen :)

---
 frontend/src/i18n/locale/de.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/i18n/locale/de.json b/frontend/src/i18n/locale/de.json
index f9412ca6..d7bded04 100644
--- a/frontend/src/i18n/locale/de.json
+++ b/frontend/src/i18n/locale/de.json
@@ -21,7 +21,7 @@
     "JoinClassExplanation": "Geben Sie den Code ein, den Ihnen die Lehrkraft mitgeteilt hat, um der Klasse beizutreten.",
     "invalidFormat": "Ungültiges Format",
     "submitCode": "senden",
-    "members": "mitglieder",
+    "members": "Mitglieder",
     "themes": "Themen",
     "choose-theme": "Wähle ein thema",
     "choose-age": "Alter auswählen",
@@ -58,20 +58,20 @@
     "legendCompleted": "Fertig",
     "legendTeacherExclusive": "Information für Lehrkräfte",
     "code": "code",
-    "class": "klasse",
-    "invitations": "einladungen",
+    "class": "Klasse",
+    "invitations": "Einladungen",
     "createClass": "Klasse erstellen",
     "createClassInstructions": "Geben Sie einen Namen für Ihre Klasse ein und klicken Sie auf „Erstellen“. Es erscheint ein Fenster mit einem Code, den Sie kopieren können. Geben Sie diesen Code an Ihre Schüler weiter und sie können Ihrer Klasse beitreten.",
     "classname": "Klassenname",
     "EnterNameOfClass": "einen Klassennamen eingeben.",
     "create": "erstellen",
     "sender": "Absender",
-    "nameIsMandatory": "classname ist obligatorisch",
+    "nameIsMandatory": "Der Klassenname ist ein Pflichtfeld",
     "onlyUse": "nur Buchstaben, Zahlen, Bindestriche (-) und Unterstriche (_) verwenden",
     "close": "schließen",
     "copied": "kopiert!",
     "accept": "akzeptieren",
-    "deny": "verweigern",
+    "deny": "ablehnen",
     "sent": "sent",
     "failed": "gescheitert",
     "wrong": "etwas ist schief gelaufen",

From 7155d7d8939184f50eb64c60a7085586cce8cd48 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Wed, 9 Apr 2025 10:42:57 +0200
Subject: [PATCH 118/177] fix: .js toevoegen aan imports

---
 backend/src/controllers/assignments.ts | 5 ++---
 backend/src/controllers/classes.ts     | 2 +-
 backend/src/services/classes.ts        | 9 ++++-----
 backend/src/services/students.ts       | 3 +--
 backend/src/services/teachers.ts       | 5 ++---
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts
index c262057c..296de160 100644
--- a/backend/src/controllers/assignments.ts
+++ b/backend/src/controllers/assignments.ts
@@ -8,9 +8,8 @@ import {
     putAssignment,
 } from '../services/assignments.js';
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
-import { requireFields } from './error-helper';
-import { BadRequestException } from '../exceptions/bad-request-exception';
-import { getLogger } from '../logging/initalize.js';
+import { requireFields } from './error-helper.js';
+import { BadRequestException } from '../exceptions/bad-request-exception.js';
 import { Assignment } from '../entities/assignments/assignment.entity.js';
 import { EntityDTO } from '@mikro-orm/core';
 
diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts
index 6252c714..6f253547 100644
--- a/backend/src/controllers/classes.ts
+++ b/backend/src/controllers/classes.ts
@@ -14,7 +14,7 @@ import {
     putClass,
 } from '../services/classes.js';
 import { ClassDTO } from '@dwengo-1/common/interfaces/class';
-import { requireFields } from './error-helper';
+import { requireFields } from './error-helper.js';
 import { EntityDTO } from '@mikro-orm/core';
 import { Class } from '../entities/classes/class.entity.js';
 
diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts
index 4abe18af..1f197b2a 100644
--- a/backend/src/services/classes.ts
+++ b/backend/src/services/classes.ts
@@ -1,17 +1,16 @@
-import { getClassRepository, getStudentRepository, getTeacherInvitationRepository, getTeacherRepository } from '../data/repositories.js';
+import { getClassRepository, getTeacherInvitationRepository } from '../data/repositories.js';
 import { mapToClassDTO } from '../interfaces/class.js';
 import { mapToStudentDTO } from '../interfaces/student.js';
 import { mapToTeacherInvitationDTO, mapToTeacherInvitationDTOIds } from '../interfaces/teacher-invitation.js';
-import { getLogger } from '../logging/initalize.js';
 import { NotFoundException } from '../exceptions/not-found-exception.js';
 import { Class } from '../entities/classes/class.entity.js';
 import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
 import { StudentDTO } from '@dwengo-1/common/interfaces/student';
-import { fetchTeacher } from './teachers';
-import { fetchStudent, getStudent } from './students';
+import { fetchTeacher } from './teachers.js';
+import { fetchStudent } from './students.js';
 import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher';
-import { mapToTeacherDTO } from '../interfaces/teacher';
+import { mapToTeacherDTO } from '../interfaces/teacher.js';
 import { EntityDTO } from '@mikro-orm/core';
 import { putObject } from './service-helper.js';
 
diff --git a/backend/src/services/students.ts b/backend/src/services/students.ts
index 5fc3427f..6cfbbd5b 100644
--- a/backend/src/services/students.ts
+++ b/backend/src/services/students.ts
@@ -23,8 +23,7 @@ import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request';
-import { BadRequestException } from '../exceptions/bad-request-exception';
-import { ConflictException } from '../exceptions/conflict-exception';
+import { ConflictException } from '../exceptions/conflict-exception.js';
 
 export async function getAllStudents(full: boolean): Promise<StudentDTO[] | string[]> {
     const studentRepository = getStudentRepository();
diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts
index 4973ce81..e6596f9e 100644
--- a/backend/src/services/teachers.ts
+++ b/backend/src/services/teachers.ts
@@ -22,15 +22,14 @@ import { Question } from '../entities/questions/question.entity.js';
 import { ClassJoinRequestRepository } from '../data/classes/class-join-request-repository.js';
 import { Student } from '../entities/users/student.entity.js';
 import { NotFoundException } from '../exceptions/not-found-exception.js';
-import { addClassStudent, fetchClass, getClassStudents, getClassStudentsDTO } from './classes.js';
+import { addClassStudent, fetchClass, getClassStudentsDTO } from './classes.js';
 import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher';
 import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 import { StudentDTO } from '@dwengo-1/common/interfaces/student';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request';
 import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request';
-import { BadRequestException } from '../exceptions/bad-request-exception';
-import { ConflictException } from '../exceptions/conflict-exception';
+import { ConflictException } from '../exceptions/conflict-exception.js';
 
 export async function getAllTeachers(full: boolean): Promise<TeacherDTO[] | string[]> {
     const teacherRepository: TeacherRepository = getTeacherRepository();

From 4928c08f62d081755974fe9dc2261564c37f10c8 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Wed, 9 Apr 2025 10:49:14 +0200
Subject: [PATCH 119/177] refactor(backend): Linting

---
 backend/src/controllers/assignments.ts |  4 ++--
 backend/src/controllers/groups.ts      |  3 +--
 backend/src/controllers/submissions.ts |  1 -
 backend/src/interfaces/assignment.ts   |  1 -
 backend/src/services/assignments.ts    |  8 +++-----
 backend/src/services/groups.ts         | 21 ++++++---------------
 backend/src/services/submissions.ts    |  3 +--
 7 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts
index 296de160..2ecb35cb 100644
--- a/backend/src/controllers/assignments.ts
+++ b/backend/src/controllers/assignments.ts
@@ -66,7 +66,7 @@ export async function putAssignmentHandler(req: Request, res: Response): Promise
     res.json({ assignment });
 }
 
-export async function deleteAssignmentHandler(req: Request, res: Response): Promise<void> {
+export async function deleteAssignmentHandler(req: Request, _res: Response): Promise<void> {
     const id = Number(req.params.id);
     const classid = req.params.classid;
     requireFields({ id, classid });
@@ -75,7 +75,7 @@ export async function deleteAssignmentHandler(req: Request, res: Response): Prom
         throw new BadRequestException('Assignment id should be a number');
     }
 
-    const assignment = await deleteAssignment(classid, id);
+    await deleteAssignment(classid, id);
 }
 
 export async function getAssignmentsSubmissionsHandler(req: Request, res: Response): Promise<void> {
diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts
index 85b0809c..ec177dcc 100644
--- a/backend/src/controllers/groups.ts
+++ b/backend/src/controllers/groups.ts
@@ -3,11 +3,10 @@ import { createGroup, deleteGroup, getAllGroups, getGroup, getGroupSubmissions,
 import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 import { requireFields } from './error-helper.js';
 import { BadRequestException } from '../exceptions/bad-request-exception.js';
-import { getLogger } from '../logging/initalize.js';
 import { EntityDTO } from '@mikro-orm/core';
 import { Group } from '../entities/assignments/group.entity.js';
 
-function checkGroupFields(classId: any, assignmentId: any, groupId: any) {
+function checkGroupFields(classId: string, assignmentId: number, groupId: number): void {
     requireFields({ classId, assignmentId, groupId });
 
     if (isNaN(assignmentId)) {
diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts
index a742685f..fb681656 100644
--- a/backend/src/controllers/submissions.ts
+++ b/backend/src/controllers/submissions.ts
@@ -1,7 +1,6 @@
 import { Request, Response } from 'express';
 import { createSubmission, deleteSubmission, getAllSubmissions, getSubmission } from '../services/submissions.js';
 import { BadRequestException } from '../exceptions/bad-request-exception.js';
-import { NotFoundException } from '../exceptions/not-found-exception.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { Language, languageMap } from '@dwengo-1/common/util/language';
 import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
diff --git a/backend/src/interfaces/assignment.ts b/backend/src/interfaces/assignment.ts
index 2e591797..7abb3d3c 100644
--- a/backend/src/interfaces/assignment.ts
+++ b/backend/src/interfaces/assignment.ts
@@ -4,7 +4,6 @@ import { Assignment } from '../entities/assignments/assignment.entity.js';
 import { Class } from '../entities/classes/class.entity.js';
 import { getLogger } from '../logging/initalize.js';
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
-import { mapToGroupDTO } from './group.js';
 
 export function mapToAssignmentDTOId(assignment: Assignment): AssignmentDTO {
     return {
diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts
index 55f4947c..1b8fc9f1 100644
--- a/backend/src/services/assignments.ts
+++ b/backend/src/services/assignments.ts
@@ -14,9 +14,7 @@ import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submissi
 import { fetchClass } from './classes.js';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
-import { getLogger } from '../logging/initalize.js';
-import { EntityData, EntityDTO, FromEntityType } from '@mikro-orm/core';
-import { DwengoEntityRepository } from '../data/dwengo-entity-repository.js';
+import { EntityDTO } from '@mikro-orm/core';
 import { putObject } from './service-helper.js';
 
 export async function fetchAssignment(classid: string, assignmentNumber: number): Promise<Assignment> {
@@ -24,7 +22,7 @@ export async function fetchAssignment(classid: string, assignmentNumber: number)
     const cls = await classRepository.findById(classid);
 
     if (!cls) {
-        throw new NotFoundException("Could not find assignment's class");
+        throw new NotFoundException('Could not find assignment\'s class');
     }
 
     const assignmentRepository = getAssignmentRepository();
@@ -88,7 +86,7 @@ export async function deleteAssignment(classid: string, id: number): Promise<Ass
 export async function getAssignmentsSubmissions(
     classid: string,
     assignmentNumber: number,
-    full: boolean
+    full: boolean,
 ): Promise<SubmissionDTO[] | SubmissionDTOId[]> {
     const assignment = await fetchAssignment(classid, assignmentNumber);
 
diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts
index 9b9903ed..f52fff29 100644
--- a/backend/src/services/groups.ts
+++ b/backend/src/services/groups.ts
@@ -1,21 +1,12 @@
-import { assign, EntityDTO } from '@mikro-orm/core';
-import {
-    getAssignmentRepository,
-    getClassRepository,
-    getGroupRepository,
-    getQuestionRepository,
-    getStudentRepository,
-    getSubmissionRepository,
-} from '../data/repositories.js';
+import { EntityDTO } from '@mikro-orm/core';
+import { getGroupRepository, getStudentRepository, getSubmissionRepository } from '../data/repositories.js';
 import { Group } from '../entities/assignments/group.entity.js';
 import { mapToGroupDTO, mapToGroupDTOId } from '../interfaces/group.js';
 import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submission.js';
 import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
-import { getLogger } from '../logging/initalize.js';
 import { fetchAssignment } from './assignments.js';
 import { NotFoundException } from '../exceptions/not-found-exception.js';
-import { fetchClass } from './classes.js';
 import { putObject } from './service-helper.js';
 
 export async function fetchGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise<Group> {
@@ -40,7 +31,7 @@ export async function putGroup(
     classId: string,
     assignmentNumber: number,
     groupNumber: number,
-    groupData: Partial<EntityDTO<Group>>
+    groupData: Partial<EntityDTO<Group>>,
 ): Promise<GroupDTO> {
     const group = await fetchGroup(classId, assignmentNumber, groupNumber);
 
@@ -59,7 +50,7 @@ export async function deleteGroup(classId: string, assignmentNumber: number, gro
     return mapToGroupDTO(group);
 }
 
-export async function getExistingGroupFromGroupDTO(groupData: GroupDTO) {
+export async function getExistingGroupFromGroupDTO(groupData: GroupDTO): Promise<Group> {
     const classId = typeof groupData.class === 'string' ? groupData.class : groupData.class.id;
     const assignmentNumber = typeof groupData.assignment === 'number' ? groupData.assignment : groupData.assignment.id;
     const groupNumber = groupData.groupNumber;
@@ -72,7 +63,7 @@ export async function createGroup(groupData: GroupDTO, classid: string, assignme
 
     const memberUsernames = (groupData.members as string[]) || [];
     const members = (await Promise.all([...memberUsernames].map(async (id) => studentRepository.findByUsername(id)))).filter(
-        (student) => student !== null
+        (student) => student !== null,
     );
 
     const assignment = await fetchAssignment(classid, assignmentNumber);
@@ -104,7 +95,7 @@ export async function getGroupSubmissions(
     classId: string,
     assignmentNumber: number,
     groupNumber: number,
-    full: boolean
+    full: boolean,
 ): Promise<SubmissionDTO[] | SubmissionDTOId[]> {
     const group = await fetchGroup(classId, assignmentNumber, groupNumber);
 
diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts
index 25f6e7f0..c7daff74 100644
--- a/backend/src/services/submissions.ts
+++ b/backend/src/services/submissions.ts
@@ -3,9 +3,8 @@ import { LearningObjectIdentifier } from '../entities/content/learning-object-id
 import { NotFoundException } from '../exceptions/not-found-exception.js';
 import { mapToSubmission, mapToSubmissionDTO } from '../interfaces/submission.js';
 import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
-import { Language } from '@dwengo-1/common/util/language';
 import { fetchStudent } from './students.js';
-import { fetchGroup, getExistingGroupFromGroupDTO } from './groups.js';
+import { getExistingGroupFromGroupDTO } from './groups.js';
 import { Submission } from '../entities/assignments/submission.entity.js';
 
 export async function fetchSubmission(loId: LearningObjectIdentifier, submissionNumber: number): Promise<Submission> {

From 6a86539cc9728777f9ae49ba421b2925fa67474f Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Wed, 9 Apr 2025 08:50:43 +0000
Subject: [PATCH 120/177] style: fix linting issues met Prettier

---
 backend/src/services/assignments.ts | 4 ++--
 backend/src/services/groups.ts      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts
index 1b8fc9f1..5fd8f67f 100644
--- a/backend/src/services/assignments.ts
+++ b/backend/src/services/assignments.ts
@@ -22,7 +22,7 @@ export async function fetchAssignment(classid: string, assignmentNumber: number)
     const cls = await classRepository.findById(classid);
 
     if (!cls) {
-        throw new NotFoundException('Could not find assignment\'s class');
+        throw new NotFoundException("Could not find assignment's class");
     }
 
     const assignmentRepository = getAssignmentRepository();
@@ -86,7 +86,7 @@ export async function deleteAssignment(classid: string, id: number): Promise<Ass
 export async function getAssignmentsSubmissions(
     classid: string,
     assignmentNumber: number,
-    full: boolean,
+    full: boolean
 ): Promise<SubmissionDTO[] | SubmissionDTOId[]> {
     const assignment = await fetchAssignment(classid, assignmentNumber);
 
diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts
index f52fff29..95b1b7d4 100644
--- a/backend/src/services/groups.ts
+++ b/backend/src/services/groups.ts
@@ -31,7 +31,7 @@ export async function putGroup(
     classId: string,
     assignmentNumber: number,
     groupNumber: number,
-    groupData: Partial<EntityDTO<Group>>,
+    groupData: Partial<EntityDTO<Group>>
 ): Promise<GroupDTO> {
     const group = await fetchGroup(classId, assignmentNumber, groupNumber);
 
@@ -63,7 +63,7 @@ export async function createGroup(groupData: GroupDTO, classid: string, assignme
 
     const memberUsernames = (groupData.members as string[]) || [];
     const members = (await Promise.all([...memberUsernames].map(async (id) => studentRepository.findByUsername(id)))).filter(
-        (student) => student !== null,
+        (student) => student !== null
     );
 
     const assignment = await fetchAssignment(classid, assignmentNumber);
@@ -95,7 +95,7 @@ export async function getGroupSubmissions(
     classId: string,
     assignmentNumber: number,
     groupNumber: number,
-    full: boolean,
+    full: boolean
 ): Promise<SubmissionDTO[] | SubmissionDTOId[]> {
     const group = await fetchGroup(classId, assignmentNumber, groupNumber);
 

From 41b36f430e6d27a0b96e58aaaa17abb6a2b701f5 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Wed, 9 Apr 2025 11:56:02 +0200
Subject: [PATCH 121/177] chore: Maak linting warnings -> errors

Closes #180
---
 eslint.config.ts | 70 ++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/eslint.config.ts b/eslint.config.ts
index fb19e5c4..30e8fe2f 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -44,16 +44,16 @@ export default [
             // All @typescript-eslint configuration options are listed.
             // If the rules are commented, they are configured by the inherited configurations.
 
-            '@typescript-eslint/adjacent-overload-signatures': 'warn',
-            '@typescript-eslint/array-type': 'warn',
+            '@typescript-eslint/adjacent-overload-signatures': 'error',
+            '@typescript-eslint/array-type': 'error',
             '@typescript-eslint/await-thenable': 'error',
             '@typescript-eslint/ban-ts-comment': ['error', { minimumDescriptionLength: 10 }],
             '@typescript-eslint/ban-tslint-comment': 'error',
             camelcase: 'off',
-            '@typescript-eslint/class-literal-property-style': 'warn',
+            '@typescript-eslint/class-literal-property-style': 'error',
             'class-methods-use-this': 'off',
             '@typescript-eslint/class-methods-use-this': ['error', { ignoreOverrideMethods: true }],
-            '@typescript-eslint/consistent-generic-constructors': 'warn',
+            '@typescript-eslint/consistent-generic-constructors': 'error',
             '@typescript-eslint/consistent-indexed-object-style': 'error',
             'consistent-return': 'off',
             '@typescript-eslint/consistent-return': 'off',
@@ -64,18 +64,18 @@ export default [
             'default-param-last': 'off',
             '@typescript-eslint/default-param-last': 'error',
             'dot-notation': 'off',
-            '@typescript-eslint/dot-notation': 'warn',
-            '@typescript-eslint/explicit-function-return-type': 'warn',
+            '@typescript-eslint/dot-notation': 'error',
+            '@typescript-eslint/explicit-function-return-type': 'error',
             '@typescript-eslint/explicit-member-accessibility': 'off',
-            '@typescript-eslint/explicit-module-boundary-types': 'warn',
+            '@typescript-eslint/explicit-module-boundary-types': 'error',
             'init-declarations': 'off',
             '@typescript-eslint/init-declarations': 'off',
             'max-params': 'off',
             '@typescript-eslint/max-params': ['error', { max: 6 }],
-            '@typescript-eslint/member-ordering': 'warn',
+            '@typescript-eslint/member-ordering': 'error',
             '@typescript-eslint/method-signature-style': 'off', // Don't care about TypeScript strict mode.
             '@typescript-eslint/naming-convention': [
-                'warn',
+                'error',
                 {
                     // Enforce that all variables, functions and properties are camelCase
                     selector: 'variableLike',
@@ -113,7 +113,7 @@ export default [
             '@typescript-eslint/no-empty-function': 'error',
             '@typescript-eslint/no-empty-interface': 'off',
             '@typescript-eslint/no-empty-object-type': 'error',
-            '@typescript-eslint/no-explicit-any': 'warn', // Once in production, this should be an error.
+            '@typescript-eslint/no-explicit-any': 'error', // Once in production, this should be an error.
             '@typescript-eslint/no-extra-non-null-assertion': 'error',
             '@typescript-eslint/no-extraneous-class': 'error',
             '@typescript-eslint/no-floating-promises': 'error',
@@ -121,7 +121,7 @@ export default [
             'no-implied-eval': 'off',
             '@typescript-eslint/no-implied-eval': 'error',
             '@typescript-eslint/no-import-type-side-effects': 'error',
-            '@typescript-eslint/no-inferrable-types': 'warn',
+            '@typescript-eslint/no-inferrable-types': 'error',
             'no-invalid-this': 'off',
             '@typescript-eslint/no-invalid-this': 'off',
             '@typescript-eslint/no-invalid-void-type': 'error',
@@ -146,10 +146,10 @@ export default [
             '@typescript-eslint/no-unsafe-function-type': 'error',
 
             'no-unused-expressions': 'off',
-            '@typescript-eslint/no-unused-expressions': 'warn',
+            '@typescript-eslint/no-unused-expressions': 'error',
             'no-unused-vars': 'off',
             '@typescript-eslint/no-unused-vars': [
-                'warn',
+                'error',
                 {
                     args: 'all',
                     argsIgnorePattern: '^_',
@@ -164,53 +164,53 @@ export default [
 
             '@typescript-eslint/parameter-properties': 'off',
 
-            '@typescript-eslint/prefer-find': 'warn',
+            '@typescript-eslint/prefer-find': 'error',
 
             '@typescript-eslint/prefer-function-type': 'error',
 
             '@typescript-eslint/prefer-readonly-parameter-types': 'off',
             '@typescript-eslint/prefer-reduce-type-parameter': 'error',
 
-            '@typescript-eslint/promise-function-async': 'warn',
+            '@typescript-eslint/promise-function-async': 'error',
 
-            '@typescript-eslint/require-array-sort-compare': 'warn',
+            '@typescript-eslint/require-array-sort-compare': 'error',
 
-            'no-await-in-loop': 'warn',
+            'no-await-in-loop': 'error',
             'no-constructor-return': 'error',
             'no-inner-declarations': 'error',
             'no-self-compare': 'error',
             'no-template-curly-in-string': 'error',
-            'no-unmodified-loop-condition': 'warn',
-            'no-unreachable-loop': 'warn',
+            'no-unmodified-loop-condition': 'error',
+            'no-unreachable-loop': 'error',
             'no-useless-assignment': 'error',
 
-            'arrow-body-style': ['warn', 'as-needed'],
-            'block-scoped-var': 'warn',
-            'capitalized-comments': 'warn',
+            'arrow-body-style': ['error', 'as-needed'],
+            'block-scoped-var': 'error',
+            'capitalized-comments': 'error',
             'consistent-this': 'error',
             curly: 'error',
             'default-case': 'error',
             'default-case-last': 'error',
             eqeqeq: 'error',
-            'func-names': 'warn',
-            'func-style': ['warn', 'declaration'],
-            'grouped-accessor-pairs': ['warn', 'getBeforeSet'],
-            'guard-for-in': 'warn',
-            'logical-assignment-operators': 'warn',
-            'max-classes-per-file': 'warn',
+            'func-names': 'error',
+            'func-style': ['error', 'declaration'],
+            'grouped-accessor-pairs': ['error', 'getBeforeSet'],
+            'guard-for-in': 'error',
+            'logical-assignment-operators': 'error',
+            'max-classes-per-file': 'error',
             'no-alert': 'error',
-            'no-bitwise': 'warn',
-            'no-console': 'warn',
-            'no-continue': 'warn',
-            'no-else-return': 'warn',
+            'no-bitwise': 'error',
+            'no-console': 'error',
+            'no-continue': 'error',
+            'no-else-return': 'error',
             'no-eq-null': 'error',
             'no-eval': 'error',
             'no-extend-native': 'error',
             'no-extra-label': 'error',
-            'no-implicit-coercion': 'warn',
+            'no-implicit-coercion': 'error',
             'no-iterator': 'error',
-            'no-label-var': 'warn',
-            'no-labels': 'warn',
+            'no-label-var': 'error',
+            'no-labels': 'error',
             'no-multi-assign': 'error',
             'no-nested-ternary': 'error',
             'no-object-constructor': 'error',

From 6ab9f8d8a1e002ba72df829b3fa5d4617812b533 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Wed, 9 Apr 2025 12:00:44 +0200
Subject: [PATCH 122/177] chore(docs): Staging server toevoegen

---
 docs/api/generate.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/api/generate.ts b/docs/api/generate.ts
index 24d3a6cb..2221cb53 100644
--- a/docs/api/generate.ts
+++ b/docs/api/generate.ts
@@ -15,6 +15,10 @@ const doc = {
             url: 'http://localhost:3000/',
             description: 'Development server',
         },
+        {
+            url: 'http://localhost/',
+            description: 'Staging server',
+        },
         {
             url: 'https://sel2-1.ugent.be/',
             description: 'Production server',

From 4e834c9ed1dad5eb25c78fca8e39144d4d2093c5 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Wed, 9 Apr 2025 12:03:12 +0200
Subject: [PATCH 123/177] fix(docs): Top level await

---
 docs/api/generate.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/generate.ts b/docs/api/generate.ts
index 2221cb53..796369d1 100644
--- a/docs/api/generate.ts
+++ b/docs/api/generate.ts
@@ -59,4 +59,4 @@ const doc = {
 const outputFile = './swagger.json';
 const routes = ['../../backend/src/app.ts'];
 
-await swaggerAutogen({ openapi: '3.1.0' })(outputFile, routes, doc);
+void swaggerAutogen({ openapi: '3.1.0' })(outputFile, routes, doc);

From fbc77b9ad3722181f10997d20866ad19b993d022 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Wed, 9 Apr 2025 12:19:41 +0200
Subject: [PATCH 124/177] fix: tests

---
 backend/tests/controllers/students.test.ts | 2 +-
 backend/tests/controllers/teachers.test.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/tests/controllers/students.test.ts b/backend/tests/controllers/students.test.ts
index b0611ee8..aca29de1 100644
--- a/backend/tests/controllers/students.test.ts
+++ b/backend/tests/controllers/students.test.ts
@@ -222,7 +222,7 @@ describe('Student controllers', () => {
     it('Create join request student already in class error', async () => {
         req = {
             params: { username: 'Noordkaap' },
-            body: { classId: 'id02' },
+            body: { classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89' },
         };
 
         await expect(async () => createStudentRequestHandler(req as Request, res as Response)).rejects.toThrow(ConflictException);
diff --git a/backend/tests/controllers/teachers.test.ts b/backend/tests/controllers/teachers.test.ts
index f687d797..a73a79a5 100644
--- a/backend/tests/controllers/teachers.test.ts
+++ b/backend/tests/controllers/teachers.test.ts
@@ -183,7 +183,7 @@ describe('Teacher controllers', () => {
 
     it('Update join request status', async () => {
         req = {
-            params: { classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89' },
+            params: { classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89', studentUsername: 'PinkFloyd' },
             body: { accepted: 'true' },
         };
 

From 6574a7eee56bb484e5331b429a1ce66591c6ddde Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Wed, 9 Apr 2025 12:29:39 +0200
Subject: [PATCH 125/177] fix(frontend): uuid dependency

Closes #182
---
 frontend/package.json | 1 +
 package-lock.json     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/package.json b/frontend/package.json
index e6ce1426..b6bd5deb 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -20,6 +20,7 @@
         "@tanstack/vue-query": "^5.69.0",
         "axios": "^1.8.2",
         "oidc-client-ts": "^3.1.0",
+        "uuid": "^11.1.0",
         "vue": "^3.5.13",
         "vue-i18n": "^11.1.2",
         "vue-router": "^4.5.0",
diff --git a/package-lock.json b/package-lock.json
index 27d261cb..45c5a310 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -104,6 +104,7 @@
                 "@tanstack/vue-query": "^5.69.0",
                 "axios": "^1.8.2",
                 "oidc-client-ts": "^3.1.0",
+                "uuid": "^11.1.0",
                 "vue": "^3.5.13",
                 "vue-i18n": "^11.1.2",
                 "vue-router": "^4.5.0",

From 1c99b03554c02869a5ec69c7645de744fce619ce Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Wed, 9 Apr 2025 19:26:38 +0200
Subject: [PATCH 126/177] feat: class queries useClass en useClasses

---
 frontend/src/queries/classes.ts | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 frontend/src/queries/classes.ts

diff --git a/frontend/src/queries/classes.ts b/frontend/src/queries/classes.ts
new file mode 100644
index 00000000..68e07cc0
--- /dev/null
+++ b/frontend/src/queries/classes.ts
@@ -0,0 +1,30 @@
+import { ClassController, type ClassesResponse, type ClassResponse } from "@/controllers/classes";
+import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
+import { computed, toValue, type MaybeRefOrGetter } from "vue";
+
+const classController = new ClassController();
+
+function classesQueryKey() {
+    return ["students"];
+}
+function classQueryKey(classid: string) {
+    return ["student", classid];
+}
+
+
+export function useClassesQuery(full: MaybeRefOrGetter<boolean> = true): UseQueryReturnType<ClassesResponse, Error> {
+    return useQuery({
+        queryKey: computed(() => (classesQueryKey())),
+        queryFn: async () => classController.getAll(toValue(full)),
+    });
+}
+
+export function useClassQuery(
+    id: MaybeRefOrGetter<string | undefined>,
+): UseQueryReturnType<ClassResponse, Error> {
+    return useQuery({
+        queryKey: computed(() => classQueryKey(toValue(id)!)),
+        queryFn: async () => classController.getById(toValue(id)!),
+        enabled: () => Boolean(toValue(id)),
+    });
+}
\ No newline at end of file

From c05ad9a702c61e3fe60011c37095676eec0891a0 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Wed, 9 Apr 2025 19:42:02 +0200
Subject: [PATCH 127/177] feat: class queries students, teachers, teacher
 invitations GET

---
 frontend/src/queries/classes.ts | 48 ++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/frontend/src/queries/classes.ts b/frontend/src/queries/classes.ts
index 68e07cc0..897d7e9e 100644
--- a/frontend/src/queries/classes.ts
+++ b/frontend/src/queries/classes.ts
@@ -1,16 +1,25 @@
 import { ClassController, type ClassesResponse, type ClassResponse } from "@/controllers/classes";
+import type { StudentsResponse } from "@/controllers/students";
 import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
 const classController = new ClassController();
 
 function classesQueryKey() {
-    return ["students"];
+    return ["classes"];
 }
 function classQueryKey(classid: string) {
-    return ["student", classid];
+    return ["class", classid];
+}
+function classStudentsKey(classid: string) {
+    return ["class-students", classid];
+}
+function classTeachersKey(classid: string) {
+    return ["class-teachers", classid];
+}
+function classTeacherInvitationsKey(classid: string) {
+    return ["class-teacher-invitations", classid];
 }
-
 
 export function useClassesQuery(full: MaybeRefOrGetter<boolean> = true): UseQueryReturnType<ClassesResponse, Error> {
     return useQuery({
@@ -27,4 +36,37 @@ export function useClassQuery(
         queryFn: async () => classController.getById(toValue(id)!),
         enabled: () => Boolean(toValue(id)),
     });
+}
+
+export function useClassStudentsQuery(
+    id: MaybeRefOrGetter<string | undefined>,
+    full: MaybeRefOrGetter<boolean> = true
+): UseQueryReturnType<StudentsResponse, Error> {
+    return useQuery({
+        queryKey: computed(() => classStudentsKey(toValue(id)!)),
+        queryFn: async () => classController.getStudents(toValue(id)!, toValue(full)!),
+        enabled: () => Boolean(toValue(id)),
+    })
+}
+
+export function useClassTeachersQuery(
+    id: MaybeRefOrGetter<string | undefined>,
+    full: MaybeRefOrGetter<boolean> = true
+): UseQueryReturnType<StudentsResponse, Error> {
+    return useQuery({
+        queryKey: computed(() => classTeachersKey(toValue(id)!)),
+        queryFn: async () => classController.getTeachers(toValue(id)!, toValue(full)!),
+        enabled: () => Boolean(toValue(id)),
+    });
+}
+
+export function useClassTeacherInvitationsQuery(
+    id: MaybeRefOrGetter<string | undefined>,
+    full: MaybeRefOrGetter<boolean> = true
+): UseQueryReturnType<StudentsResponse, Error> {
+    return useQuery({
+        queryKey: computed(() => classTeacherInvitationsKey(toValue(id)!)),
+        queryFn: async () => classController.getTeacherInvitations(toValue(id)!, toValue(full)!),
+        enabled: () => Boolean(toValue(id)),
+    });
 }
\ No newline at end of file

From a2ae4319577e28e8c9f8c2fad47dafca49c8e346 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Wed, 9 Apr 2025 19:46:05 +0200
Subject: [PATCH 128/177] feat: class queries assignments GET

---
 frontend/src/queries/classes.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/frontend/src/queries/classes.ts b/frontend/src/queries/classes.ts
index 897d7e9e..00eb3bf9 100644
--- a/frontend/src/queries/classes.ts
+++ b/frontend/src/queries/classes.ts
@@ -20,6 +20,9 @@ function classTeachersKey(classid: string) {
 function classTeacherInvitationsKey(classid: string) {
     return ["class-teacher-invitations", classid];
 }
+function classAssignmentsKey(classid: string) {
+    return ["class-assignments", classid];
+}
 
 export function useClassesQuery(full: MaybeRefOrGetter<boolean> = true): UseQueryReturnType<ClassesResponse, Error> {
     return useQuery({
@@ -69,4 +72,15 @@ export function useClassTeacherInvitationsQuery(
         queryFn: async () => classController.getTeacherInvitations(toValue(id)!, toValue(full)!),
         enabled: () => Boolean(toValue(id)),
     });
+}
+
+export function useClassAssignmentsQuery(
+    id: MaybeRefOrGetter<string | undefined>,
+    full: MaybeRefOrGetter<boolean> = true
+): UseQueryReturnType<StudentsResponse, Error> {
+    return useQuery({
+        queryKey: computed(() => classAssignmentsKey(toValue(id)!)),
+        queryFn: async () => classController.getAssignments(toValue(id)!, toValue(full)!),
+        enabled: () => Boolean(toValue(id)),
+    });
 }
\ No newline at end of file

From 45a36a94a58f5df8548a17111e80156f26532f5b Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Wed, 9 Apr 2025 21:16:28 +0200
Subject: [PATCH 129/177] feat: class query get, delete, put geimplementeerd

---
 frontend/src/queries/classes.ts | 45 ++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/frontend/src/queries/classes.ts b/frontend/src/queries/classes.ts
index 00eb3bf9..6aca5e7f 100644
--- a/frontend/src/queries/classes.ts
+++ b/frontend/src/queries/classes.ts
@@ -1,6 +1,7 @@
 import { ClassController, type ClassesResponse, type ClassResponse } from "@/controllers/classes";
 import type { StudentsResponse } from "@/controllers/students";
-import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
+import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
+import { QueryClient, useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
 const classController = new ClassController();
@@ -24,6 +25,15 @@ function classAssignmentsKey(classid: string) {
     return ["class-assignments", classid];
 }
 
+async function invalidateAll(classid: string, queryClient: QueryClient): Promise<void> {
+    await queryClient.invalidateQueries({ queryKey: ["classes"] });
+    await queryClient.invalidateQueries({ queryKey: classQueryKey(classid) });
+    await queryClient.invalidateQueries({ queryKey: classStudentsKey(classid) });
+    await queryClient.invalidateQueries({ queryKey: classTeachersKey(classid) });
+    await queryClient.invalidateQueries({ queryKey: classAssignmentsKey(classid) });
+    await queryClient.invalidateQueries({ queryKey: classTeacherInvitationsKey(classid) });
+}
+
 export function useClassesQuery(full: MaybeRefOrGetter<boolean> = true): UseQueryReturnType<ClassesResponse, Error> {
     return useQuery({
         queryKey: computed(() => (classesQueryKey())),
@@ -41,6 +51,39 @@ export function useClassQuery(
     });
 }
 
+export function useCreateClassMutation(): UseMutationReturnType<ClassResponse, Error, ClassDTO, unknown> {
+    const queryClient = useQueryClient();
+
+    return useMutation({
+        mutationFn: async (data) => classController.createClass(data),
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: ["classes"] });
+        },
+    });
+}
+
+export function useDeleteClassMutation(): UseMutationReturnType<ClassResponse, Error, string, unknown> {
+    const queryClient = useQueryClient();
+
+    return useMutation({
+        mutationFn: async (id) => classController.deleteClass(id),
+        onSuccess: async (data) => {
+            await invalidateAll(data.class.id, queryClient);
+        },
+    });
+}
+
+export function useUpdateClassMutation(): UseMutationReturnType<ClassResponse, Error, ClassDTO, unknown> {
+    const queryClient = useQueryClient();
+
+    return useMutation({
+        mutationFn: async (data) => classController.updateClass(data.id, data),
+        onSuccess: async (data) => {
+            await invalidateAll(data.class.id, queryClient);
+        },
+    });
+}
+
 export function useClassStudentsQuery(
     id: MaybeRefOrGetter<string | undefined>,
     full: MaybeRefOrGetter<boolean> = true

From 02076212fee06958bbf2dd650277414ed8789694 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Wed, 9 Apr 2025 21:23:17 +0200
Subject: [PATCH 130/177] feat: class query student en teacher POST

---
 frontend/src/queries/classes.ts | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/frontend/src/queries/classes.ts b/frontend/src/queries/classes.ts
index 6aca5e7f..30ca7bee 100644
--- a/frontend/src/queries/classes.ts
+++ b/frontend/src/queries/classes.ts
@@ -6,6 +6,7 @@ import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
 const classController = new ClassController();
 
+/* Query cache keys */
 function classesQueryKey() {
     return ["classes"];
 }
@@ -25,6 +26,7 @@ function classAssignmentsKey(classid: string) {
     return ["class-assignments", classid];
 }
 
+/* Function to invalidate all caches with certain class id */
 async function invalidateAll(classid: string, queryClient: QueryClient): Promise<void> {
     await queryClient.invalidateQueries({ queryKey: ["classes"] });
     await queryClient.invalidateQueries({ queryKey: classQueryKey(classid) });
@@ -34,6 +36,7 @@ async function invalidateAll(classid: string, queryClient: QueryClient): Promise
     await queryClient.invalidateQueries({ queryKey: classTeacherInvitationsKey(classid) });
 }
 
+/* Queries */
 export function useClassesQuery(full: MaybeRefOrGetter<boolean> = true): UseQueryReturnType<ClassesResponse, Error> {
     return useQuery({
         queryKey: computed(() => (classesQueryKey())),
@@ -95,6 +98,18 @@ export function useClassStudentsQuery(
     })
 }
 
+export function useCreateClassStudentMutation(): UseMutationReturnType<ClassResponse, Error, {id: string, username: string}, unknown> {
+    const queryClient = useQueryClient();
+
+    return useMutation({
+        mutationFn: async ({ id, username }) => classController.addStudent(id, username),
+        onSuccess: async (data) => {
+            await queryClient.invalidateQueries({ queryKey: classQueryKey(data.class.id) });
+            await queryClient.invalidateQueries({ queryKey: classStudentsKey(data.class.id) });
+        },
+    });
+}
+
 export function useClassTeachersQuery(
     id: MaybeRefOrGetter<string | undefined>,
     full: MaybeRefOrGetter<boolean> = true
@@ -106,6 +121,18 @@ export function useClassTeachersQuery(
     });
 }
 
+export function useCreateClassTeacherMutation(): UseMutationReturnType<ClassResponse, Error, {id: string, username: string}, unknown> {
+    const queryClient = useQueryClient();
+
+    return useMutation({
+        mutationFn: async ({ id, username }) => classController.addTeacher(id, username),
+        onSuccess: async (data) => {
+            await queryClient.invalidateQueries({ queryKey: classQueryKey(data.class.id) });
+            await queryClient.invalidateQueries({ queryKey: classTeachersKey(data.class.id) });
+        },
+    });
+}
+
 export function useClassTeacherInvitationsQuery(
     id: MaybeRefOrGetter<string | undefined>,
     full: MaybeRefOrGetter<boolean> = true

From 77ca390bd2ea1bc5cbeabf2f23df2a3c00164bc2 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Wed, 9 Apr 2025 21:28:04 +0200
Subject: [PATCH 131/177] feat: class queries student & teacher DELETE

---
 frontend/src/queries/classes.ts | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/frontend/src/queries/classes.ts b/frontend/src/queries/classes.ts
index 30ca7bee..1ecc0bce 100644
--- a/frontend/src/queries/classes.ts
+++ b/frontend/src/queries/classes.ts
@@ -98,7 +98,7 @@ export function useClassStudentsQuery(
     })
 }
 
-export function useCreateClassStudentMutation(): UseMutationReturnType<ClassResponse, Error, {id: string, username: string}, unknown> {
+export function useClassAddStudentMutation(): UseMutationReturnType<ClassResponse, Error, {id: string, username: string}, unknown> {
     const queryClient = useQueryClient();
 
     return useMutation({
@@ -110,6 +110,18 @@ export function useCreateClassStudentMutation(): UseMutationReturnType<ClassResp
     });
 }
 
+export function useClassDeleteStudentMutation(): UseMutationReturnType<ClassResponse, Error, {id: string, username: string}, unknown> {
+    const queryClient = useQueryClient();
+
+    return useMutation({
+        mutationFn: async ({ id, username }) => classController.deleteStudent(id, username),
+        onSuccess: async (data) => {
+            await queryClient.invalidateQueries({ queryKey: classQueryKey(data.class.id) });
+            await queryClient.invalidateQueries({ queryKey: classStudentsKey(data.class.id) });
+        },
+    });
+}
+
 export function useClassTeachersQuery(
     id: MaybeRefOrGetter<string | undefined>,
     full: MaybeRefOrGetter<boolean> = true
@@ -121,7 +133,7 @@ export function useClassTeachersQuery(
     });
 }
 
-export function useCreateClassTeacherMutation(): UseMutationReturnType<ClassResponse, Error, {id: string, username: string}, unknown> {
+export function useClassAddTeacherMutation(): UseMutationReturnType<ClassResponse, Error, {id: string, username: string}, unknown> {
     const queryClient = useQueryClient();
 
     return useMutation({
@@ -133,6 +145,18 @@ export function useCreateClassTeacherMutation(): UseMutationReturnType<ClassResp
     });
 }
 
+export function useClassDeleteTeacherMutation(): UseMutationReturnType<ClassResponse, Error, {id: string, username: string}, unknown> {
+    const queryClient = useQueryClient();
+
+    return useMutation({
+        mutationFn: async ({ id, username }) => classController.deleteTeacher(id, username),
+        onSuccess: async (data) => {
+            await queryClient.invalidateQueries({ queryKey: classQueryKey(data.class.id) });
+            await queryClient.invalidateQueries({ queryKey: classTeachersKey(data.class.id) });
+        },
+    });
+}
+
 export function useClassTeacherInvitationsQuery(
     id: MaybeRefOrGetter<string | undefined>,
     full: MaybeRefOrGetter<boolean> = true

From 5c9314aa5968a37ecfda9ba868899c65ef87c8c4 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Wed, 9 Apr 2025 21:53:41 +0200
Subject: [PATCH 132/177] feat: group queries voor alle GETs

---
 frontend/src/controllers/groups.ts |  6 ++-
 frontend/src/queries/groups.ts     | 74 ++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/queries/groups.ts

diff --git a/frontend/src/controllers/groups.ts b/frontend/src/controllers/groups.ts
index de6592b5..361dd9d3 100644
--- a/frontend/src/controllers/groups.ts
+++ b/frontend/src/controllers/groups.ts
@@ -16,11 +16,15 @@ export class GroupController extends BaseController {
         super(`class/${classid}/assignments/${assignmentNumber}/groups`);
     }
 
+    update(classid: string, assignmentNumber: number) {
+        this.basePath = `class/${classid}/assignments/${assignmentNumber}/groups`;
+    }
+
     async getAll(full = true): Promise<GroupsResponse> {
         return this.get<GroupsResponse>(`/`, { full });
     }
 
-    async getByNumber(num: number): Promise<GroupResponse> {
+    async getByNumber(num: number | string): Promise<GroupResponse> {
         return this.get<GroupResponse>(`/${num}`);
     }
 
diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
new file mode 100644
index 00000000..6465ce87
--- /dev/null
+++ b/frontend/src/queries/groups.ts
@@ -0,0 +1,74 @@
+import type { ClassesResponse } from "@/controllers/classes";
+import { GroupController, type GroupResponse, type GroupsResponse } from "@/controllers/groups";
+import type { QuestionsResponse } from "@/controllers/questions";
+import type { SubmissionsResponse } from "@/controllers/submissions";
+import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
+import { computed, toValue, type MaybeRefOrGetter } from "vue";
+
+const groupController = new GroupController('', 0);
+
+function groupsQueryKey(classid: string, assignmentNumber: number) {
+    return [ "groups", classid, assignmentNumber ];
+}
+function groupQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
+    return [ "group", classid, assignmentNumber, groupNumber ];
+}
+function groupSubmissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
+    return [ "group-submissions", classid, assignmentNumber, groupNumber ];
+}
+
+export function useGroupsQuery(
+    classid: string, 
+    assignmentNumber: number, 
+): UseQueryReturnType<GroupsResponse, Error> {
+    groupController.update(classid, assignmentNumber);
+
+    return useQuery({
+        queryKey: computed(() => (groupsQueryKey(classid, assignmentNumber))),
+        queryFn: async () => groupController.getAll(),
+    });
+}
+
+export function useGroupQuery(
+    classid: string, 
+    assignmentNumber: number, 
+    groupNumber: MaybeRefOrGetter<number | undefined>,
+): UseQueryReturnType<GroupResponse, Error> {
+    groupController.update(classid, assignmentNumber);
+
+    return useQuery({
+        queryKey: computed(() => groupQueryKey(classid, assignmentNumber, toValue(groupNumber)!)),
+        queryFn: async () => groupController.getByNumber(toValue(groupNumber)!),
+        enabled: () => !isNaN(Number(toValue(groupNumber))),
+    });
+}
+
+export function useGroupSubmissionsQuery(
+    classid: string, 
+    assignmentNumber: number, 
+    groupNumber: MaybeRefOrGetter<number | undefined>,
+    full: MaybeRefOrGetter<boolean> = true,
+): UseQueryReturnType<SubmissionsResponse, Error> {
+    groupController.update(classid, assignmentNumber);
+
+    return useQuery({
+        queryKey: computed(() => groupSubmissionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!)),
+        queryFn: async () => groupController.getSubmissions(toValue(groupNumber)!, toValue(full)!),
+        enabled: () => !isNaN(Number(toValue(groupNumber))),
+    });
+}
+
+export function useGroupQuestionsQuery(
+    classid: string, 
+    assignmentNumber: number, 
+    groupNumber: MaybeRefOrGetter<number | undefined>,
+    full: MaybeRefOrGetter<boolean> = true,
+): UseQueryReturnType<QuestionsResponse, Error> {
+    groupController.update(classid, assignmentNumber);
+
+    return useQuery({
+        queryKey: computed(() => groupSubmissionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!)),
+        queryFn: async () => groupController.getSubmissions(toValue(groupNumber)!, toValue(full)!),
+        enabled: () => !isNaN(Number(toValue(groupNumber))),
+    });
+}

From f8ac37397d63a7d177b8deee897c41b12f5dc7fb Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Wed, 9 Apr 2025 21:56:39 +0200
Subject: [PATCH 133/177] fix: foute key in group query questions gefixt

---
 frontend/src/queries/groups.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index 6465ce87..a0acd37a 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -16,6 +16,9 @@ function groupQueryKey(classid: string, assignmentNumber: number, groupNumber: n
 function groupSubmissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
     return [ "group-submissions", classid, assignmentNumber, groupNumber ];
 }
+function groupQuestionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
+    return [ "group-questions", classid, assignmentNumber, groupNumber ];
+}
 
 export function useGroupsQuery(
     classid: string, 
@@ -67,7 +70,7 @@ export function useGroupQuestionsQuery(
     groupController.update(classid, assignmentNumber);
 
     return useQuery({
-        queryKey: computed(() => groupSubmissionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!)),
+        queryKey: computed(() => groupQuestionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!)),
         queryFn: async () => groupController.getSubmissions(toValue(groupNumber)!, toValue(full)!),
         enabled: () => !isNaN(Number(toValue(groupNumber))),
     });

From d0044fa2195faa5f6ed06e60795950066eb4fc12 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Wed, 9 Apr 2025 22:06:52 +0200
Subject: [PATCH 134/177] fix: group query toValue used in wrong places

---
 frontend/src/queries/groups.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index a0acd37a..dec35013 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -13,11 +13,11 @@ function groupsQueryKey(classid: string, assignmentNumber: number) {
 function groupQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
     return [ "group", classid, assignmentNumber, groupNumber ];
 }
-function groupSubmissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
-    return [ "group-submissions", classid, assignmentNumber, groupNumber ];
+function groupSubmissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
+    return [ "group-submissions", classid, assignmentNumber, groupNumber, full ];
 }
-function groupQuestionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
-    return [ "group-questions", classid, assignmentNumber, groupNumber ];
+function groupQuestionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
+    return [ "group-questions", classid, assignmentNumber, groupNumber, full ];
 }
 
 export function useGroupsQuery(
@@ -55,7 +55,7 @@ export function useGroupSubmissionsQuery(
     groupController.update(classid, assignmentNumber);
 
     return useQuery({
-        queryKey: computed(() => groupSubmissionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!)),
+        queryKey: computed(() => groupSubmissionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!, toValue(full)!)),
         queryFn: async () => groupController.getSubmissions(toValue(groupNumber)!, toValue(full)!),
         enabled: () => !isNaN(Number(toValue(groupNumber))),
     });
@@ -67,10 +67,10 @@ export function useGroupQuestionsQuery(
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<QuestionsResponse, Error> {
-    groupController.update(classid, assignmentNumber);
+    groupController.update(toValue(classid)!, toValue(assignmentNumber));
 
     return useQuery({
-        queryKey: computed(() => groupQuestionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!)),
+        queryKey: computed(() => groupQuestionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!, toValue(full)!)),
         queryFn: async () => groupController.getSubmissions(toValue(groupNumber)!, toValue(full)!),
         enabled: () => !isNaN(Number(toValue(groupNumber))),
     });

From 73e3871af0724aa11265bebabea3bfff533e219d Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Wed, 9 Apr 2025 22:29:08 +0200
Subject: [PATCH 135/177] fix: groups queries types gefixt

---
 frontend/src/controllers/groups.ts | 36 ++++++++++---------
 frontend/src/queries/groups.ts     | 56 +++++++++++++++++++-----------
 2 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/frontend/src/controllers/groups.ts b/frontend/src/controllers/groups.ts
index 361dd9d3..2ba54cb7 100644
--- a/frontend/src/controllers/groups.ts
+++ b/frontend/src/controllers/groups.ts
@@ -12,39 +12,43 @@ export interface GroupResponse {
 }
 
 export class GroupController extends BaseController {
-    constructor(classid: string, assignmentNumber: number) {
-        super(`class/${classid}/assignments/${assignmentNumber}/groups`);
+    constructor() {
+        super('');
     }
 
     update(classid: string, assignmentNumber: number) {
         this.basePath = `class/${classid}/assignments/${assignmentNumber}/groups`;
     }
 
-    async getAll(full = true): Promise<GroupsResponse> {
-        return this.get<GroupsResponse>(`/`, { full });
+    protected getBasePath(classid: string, assignmentNumber: number) {
+        return `class/${classid}/assignments/${assignmentNumber}/groups`;
     }
 
-    async getByNumber(num: number | string): Promise<GroupResponse> {
-        return this.get<GroupResponse>(`/${num}`);
+    async getAll(classid: string, assignmentNumber: number, full = true): Promise<GroupsResponse> {
+        return this.get<GroupsResponse>(`${this.getBasePath(classid, assignmentNumber)}/`, { full });
     }
 
-    async createGroup(data: GroupDTO): Promise<GroupResponse> {
-        return this.post<GroupResponse>(`/`, data);
+    async getByNumber(classid: string, assignmentNumber: number, num: number | string): Promise<GroupResponse> {
+        return this.get<GroupResponse>(`${this.getBasePath(classid, assignmentNumber)}/${num}`);
     }
 
-    async deleteGroup(num: number): Promise<GroupResponse> {
-        return this.delete<GroupResponse>(`/${num}`);
+    async createGroup(classid: string, assignmentNumber: number, data: GroupDTO): Promise<GroupResponse> {
+        return this.post<GroupResponse>(`${this.getBasePath(classid, assignmentNumber)}/`, data);
     }
 
-    async updateGroup(num: number, data: Partial<GroupDTO>): Promise<GroupResponse> {
-        return this.put<GroupResponse>(`/${num}`, data);
+    async deleteGroup(classid: string, assignmentNumber: number, num: number): Promise<GroupResponse> {
+        return this.delete<GroupResponse>(`${this.getBasePath(classid, assignmentNumber)}/${num}`);
     }
 
-    async getSubmissions(groupNumber: number, full = true): Promise<SubmissionsResponse> {
-        return this.get<SubmissionsResponse>(`/${groupNumber}/submissions`, { full });
+    async updateGroup(classid: string, assignmentNumber: number, num: number, data: Partial<GroupDTO>): Promise<GroupResponse> {
+        return this.put<GroupResponse>(`${this.getBasePath(classid, assignmentNumber)}/${num}`, data);
     }
 
-    async getQuestions(groupNumber: number, full = true): Promise<QuestionsResponse> {
-        return this.get<QuestionsResponse>(`/${groupNumber}/questions`, { full });
+    async getSubmissions(classid: string, assignmentNumber: number, groupNumber: number, full = true): Promise<SubmissionsResponse> {
+        return this.get<SubmissionsResponse>(`${this.getBasePath(classid, assignmentNumber)}/${groupNumber}/submissions`, { full });
+    }
+
+    async getQuestions(classid: string, assignmentNumber: number, groupNumber: number, full = true): Promise<QuestionsResponse> {
+        return this.get<QuestionsResponse>(`${this.getBasePath(classid, assignmentNumber)}/${groupNumber}/questions`, { full });
     }
 }
diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index dec35013..def17524 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -5,7 +5,7 @@ import type { SubmissionsResponse } from "@/controllers/submissions";
 import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
-const groupController = new GroupController('', 0);
+const groupController = new GroupController();
 
 function groupsQueryKey(classid: string, assignmentNumber: number) {
     return [ "groups", classid, assignmentNumber ];
@@ -20,15 +20,31 @@ function groupQuestionsQueryKey(classid: string, assignmentNumber: number, group
     return [ "group-questions", classid, assignmentNumber, groupNumber, full ];
 }
 
+function checkEnabled(
+    classid: string | undefined, 
+    assignmentNumber: number | undefined, 
+    groupNumber: number | undefined,
+): boolean {
+    return  Boolean(classid) && !isNaN(Number(groupNumber)) && !isNaN(Number(assignmentNumber));
+}
+function toValues(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    groupNumber: MaybeRefOrGetter<number | undefined>,
+) {
+    return { cid: toValue(classid), an: toValue(assignmentNumber), gn: toValue(groupNumber) };
+}
+
 export function useGroupsQuery(
-    classid: string, 
-    assignmentNumber: number, 
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
 ): UseQueryReturnType<GroupsResponse, Error> {
-    groupController.update(classid, assignmentNumber);
+    const { cid, an, gn } = toValues(classid, assignmentNumber, 1);
 
     return useQuery({
-        queryKey: computed(() => (groupsQueryKey(classid, assignmentNumber))),
-        queryFn: async () => groupController.getAll(),
+        queryKey: computed(() => (groupsQueryKey(cid!, an!))),
+        queryFn: async () => groupController.getAll(cid!, an!),
+        enabled: () => checkEnabled(cid, an, 1),
     });
 }
 
@@ -37,12 +53,12 @@ export function useGroupQuery(
     assignmentNumber: number, 
     groupNumber: MaybeRefOrGetter<number | undefined>,
 ): UseQueryReturnType<GroupResponse, Error> {
-    groupController.update(classid, assignmentNumber);
+    const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber);
 
     return useQuery({
-        queryKey: computed(() => groupQueryKey(classid, assignmentNumber, toValue(groupNumber)!)),
-        queryFn: async () => groupController.getByNumber(toValue(groupNumber)!),
-        enabled: () => !isNaN(Number(toValue(groupNumber))),
+        queryKey: computed(() => groupQueryKey(cid!, an!, gn!)),
+        queryFn: async () => groupController.getByNumber(cid!, an!, gn!),
+        enabled: () => checkEnabled(cid, an, gn),
     });
 }
 
@@ -52,26 +68,26 @@ export function useGroupSubmissionsQuery(
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<SubmissionsResponse, Error> {
-    groupController.update(classid, assignmentNumber);
+    const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber);
 
     return useQuery({
-        queryKey: computed(() => groupSubmissionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!, toValue(full)!)),
-        queryFn: async () => groupController.getSubmissions(toValue(groupNumber)!, toValue(full)!),
-        enabled: () => !isNaN(Number(toValue(groupNumber))),
+        queryKey: computed(() => groupSubmissionsQueryKey(cid!, an!, gn!, toValue(full))),
+        queryFn: async () => groupController.getSubmissions(cid!, an!, gn!, toValue(full)),
+        enabled: () => checkEnabled(cid, an, gn),
     });
 }
 
 export function useGroupQuestionsQuery(
-    classid: string, 
-    assignmentNumber: number, 
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<QuestionsResponse, Error> {
-    groupController.update(toValue(classid)!, toValue(assignmentNumber));
+    const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber);
 
     return useQuery({
-        queryKey: computed(() => groupQuestionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!, toValue(full)!)),
-        queryFn: async () => groupController.getSubmissions(toValue(groupNumber)!, toValue(full)!),
-        enabled: () => !isNaN(Number(toValue(groupNumber))),
+        queryKey: computed(() => groupQuestionsQueryKey(cid!, an!, gn!, toValue(full))),
+        queryFn: async () => groupController.getSubmissions(cid!, an!, gn!, toValue(full)),
+        enabled: () => checkEnabled(cid, an, gn),
     });
 }

From 620a988c6b36ce78581a11ad3cc82b71ca6baa80 Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Wed, 9 Apr 2025 23:59:27 +0200
Subject: [PATCH 136/177] fix(backend): Merge-conflicten opgelost & testen
 gerepareerd.

---
 backend/src/controllers/submissions.ts             | 10 ++++++++--
 backend/src/data/questions/question-repository.ts  |  4 +++-
 backend/src/interfaces/submission.ts               |  2 +-
 backend/src/services/submissions.ts                |  2 +-
 backend/tests/data/assignments/assignments.test.ts |  2 +-
 backend/tests/data/assignments/submissions.test.ts |  2 +-
 backend/tests/data/questions/questions.test.ts     |  4 ++--
 common/src/interfaces/question.ts                  |  6 ++++++
 8 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts
index 4714c1c4..51faa79b 100644
--- a/backend/src/controllers/submissions.ts
+++ b/backend/src/controllers/submissions.ts
@@ -15,9 +15,15 @@ import { LearningObjectIdentifier } from '../entities/content/learning-object-id
 export async function getSubmissionsHandler(req: Request, res: Response): Promise<void> {
     const loHruid = req.params.hruid;
     const lang = languageMap[req.query.language as string] || Language.Dutch;
-    const version = req.query.version || 1;
+    const version = parseInt(req.query.version as string) ?? 1;
 
-    const submissions = await getSubmissionsForLearningObjectAndAssignment(loHruid, lang, version, req.query.classId, req.query.assignmentId);
+    const submissions = await getSubmissionsForLearningObjectAndAssignment(
+        loHruid,
+        lang,
+        version,
+        req.query.classId as string,
+        parseInt(req.query.assignmentId as string)
+    );
 
     res.json(submissions);
 }
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index faaf3528..e14c4f14 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -62,7 +62,9 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
 
     public async findAllByAssignment(assignment: Assignment): Promise<Question[]> {
         return this.find({
-            author: assignment.groups.flatMap((group) => group.members),
+            inGroup: {
+                $contained: assignment.groups
+            },
             learningObjectHruid: assignment.learningPathHruid,
             learningObjectLanguage: assignment.learningPathLanguage,
         });
diff --git a/backend/src/interfaces/submission.ts b/backend/src/interfaces/submission.ts
index 085c795d..2aebb0f1 100644
--- a/backend/src/interfaces/submission.ts
+++ b/backend/src/interfaces/submission.ts
@@ -32,7 +32,7 @@ export function mapToSubmissionDTOId(submission: Submission): SubmissionDTOId {
     };
 }
 
-export function mapToSubmission(submissionDTO: SubmissionDTO, submitter: Student, onBehalfOf: Group | undefined): Submission {
+export function mapToSubmission(submissionDTO: SubmissionDTO, submitter: Student, onBehalfOf: Group): Submission {
     return getSubmissionRepository().create({
         learningObjectHruid: submissionDTO.learningObjectIdentifier.hruid,
         learningObjectLanguage: submissionDTO.learningObjectIdentifier.language,
diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts
index 76141c4c..0f225845 100644
--- a/backend/src/services/submissions.ts
+++ b/backend/src/services/submissions.ts
@@ -33,7 +33,7 @@ export async function getAllSubmissions(loId: LearningObjectIdentifier): Promise
 
 export async function createSubmission(submissionDTO: SubmissionDTO): Promise<SubmissionDTO> {
     const submitter = await fetchStudent(submissionDTO.submitter.username);
-    const group = submissionDTO.group ? await getExistingGroupFromGroupDTO(submissionDTO.group) : undefined;
+    const group = await getExistingGroupFromGroupDTO(submissionDTO.group!);
 
     const submissionRepository = getSubmissionRepository();
     const submission = mapToSubmission(submissionDTO, submitter, group);
diff --git a/backend/tests/data/assignments/assignments.test.ts b/backend/tests/data/assignments/assignments.test.ts
index 206ab4fd..1fe52523 100644
--- a/backend/tests/data/assignments/assignments.test.ts
+++ b/backend/tests/data/assignments/assignments.test.ts
@@ -32,7 +32,7 @@ describe('AssignmentRepository', () => {
     });
 
     it('should find all by username of the responsible teacher', async () => {
-        const result = await assignmentRepository.findAllByResponsibleTeacher('FooFighters');
+        const result = await assignmentRepository.findAllByResponsibleTeacher('testleerkracht1');
         const resultIds = result.map((it) => it.id).sort((a, b) => (a ?? 0) - (b ?? 0));
 
         expect(resultIds).toEqual([1, 3, 4]);
diff --git a/backend/tests/data/assignments/submissions.test.ts b/backend/tests/data/assignments/submissions.test.ts
index 47e1c414..31aafc1d 100644
--- a/backend/tests/data/assignments/submissions.test.ts
+++ b/backend/tests/data/assignments/submissions.test.ts
@@ -66,7 +66,7 @@ describe('SubmissionRepository', () => {
     let assignment: Assignment | null;
     let loId: LearningObjectIdentifier;
     it('should find all submissions for a certain learning object and assignment', async () => {
-        clazz = await classRepository.findById('id01');
+        clazz = await classRepository.findById('8764b861-90a6-42e5-9732-c0d9eb2f55f9');
         assignment = await assignmentRepository.findByClassAndId(clazz!, 1);
         loId = {
             hruid: 'id02',
diff --git a/backend/tests/data/questions/questions.test.ts b/backend/tests/data/questions/questions.test.ts
index f24601bb..9565e71d 100644
--- a/backend/tests/data/questions/questions.test.ts
+++ b/backend/tests/data/questions/questions.test.ts
@@ -37,7 +37,7 @@ describe('QuestionRepository', () => {
         const id = new LearningObjectIdentifier('id03', Language.English, 1);
         const student = await studentRepository.findByUsername('Noordkaap');
 
-        const clazz = await getClassRepository().findById('id01');
+        const clazz = await getClassRepository().findById('8764b861-90a6-42e5-9732-c0d9eb2f55f9');
         const assignment = await getAssignmentRepository().findByClassAndId(clazz!, 1);
         const group = await getGroupRepository().findByAssignmentAndGroupNumber(assignment!, 1);
         await questionRepository.createQuestion({
@@ -56,7 +56,7 @@ describe('QuestionRepository', () => {
     let assignment: Assignment | null;
     let loId: LearningObjectIdentifier;
     it('should find all questions for a certain learning object and assignment', async () => {
-        clazz = await getClassRepository().findById('id01');
+        clazz = await getClassRepository().findById('8764b861-90a6-42e5-9732-c0d9eb2f55f9');
         assignment = await getAssignmentRepository().findByClassAndId(clazz!, 1);
         loId = {
             hruid: 'id05',
diff --git a/common/src/interfaces/question.ts b/common/src/interfaces/question.ts
index f5eceffd..172d14b7 100644
--- a/common/src/interfaces/question.ts
+++ b/common/src/interfaces/question.ts
@@ -11,6 +11,12 @@ export interface QuestionDTO {
     content: string;
 }
 
+export interface QuestionData {
+    author?: string;
+    content: string;
+    inGroup: GroupDTO;
+}
+
 export interface QuestionId {
     learningObjectIdentifier: LearningObjectIdentifierDTO;
     sequenceNumber: number;

From 8e00fa53f044dd797f0a1f5de5487c6e7a285b7e Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Thu, 10 Apr 2025 00:00:56 +0200
Subject: [PATCH 137/177] style(backend): Linting

---
 backend/src/services/submissions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts
index 0f225845..ec19b280 100644
--- a/backend/src/services/submissions.ts
+++ b/backend/src/services/submissions.ts
@@ -33,7 +33,7 @@ export async function getAllSubmissions(loId: LearningObjectIdentifier): Promise
 
 export async function createSubmission(submissionDTO: SubmissionDTO): Promise<SubmissionDTO> {
     const submitter = await fetchStudent(submissionDTO.submitter.username);
-    const group = await getExistingGroupFromGroupDTO(submissionDTO.group!);
+    const group = await getExistingGroupFromGroupDTO(submissionDTO.group);
 
     const submissionRepository = getSubmissionRepository();
     const submission = mapToSubmission(submissionDTO, submitter, group);

From 61424e1ea247e28850dd4bf2d5468a1d5c1e4f89 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Wed, 9 Apr 2025 22:01:34 +0000
Subject: [PATCH 138/177] style: fix linting issues met Prettier

---
 backend/src/controllers/questions.ts              | 4 ++--
 backend/src/controllers/submissions.ts            | 3 +--
 backend/src/data/questions/question-repository.ts | 2 +-
 backend/src/interfaces/group.ts                   | 2 +-
 backend/src/interfaces/submission.ts              | 6 +++---
 backend/src/services/questions.ts                 | 8 ++++----
 backend/src/services/submissions.ts               | 2 +-
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts
index 3fdfdacd..3240aa71 100644
--- a/backend/src/controllers/questions.ts
+++ b/backend/src/controllers/questions.ts
@@ -5,11 +5,11 @@ import {
     getAllQuestions,
     getQuestion,
     getQuestionsAboutLearningObjectInAssignment,
-    updateQuestion
+    updateQuestion,
 } from '../services/questions.js';
 import { FALLBACK_LANG, FALLBACK_SEQ_NUM, FALLBACK_VERSION_NUM } from '../config.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
-import {QuestionData, QuestionDTO, QuestionId} from '@dwengo-1/common/interfaces/question';
+import { QuestionData, QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { Language } from '@dwengo-1/common/util/language';
 import { requireFields } from './error-helper.js';
 
diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts
index 51faa79b..92cf84c1 100644
--- a/backend/src/controllers/submissions.ts
+++ b/backend/src/controllers/submissions.ts
@@ -4,7 +4,7 @@ import {
     deleteSubmission,
     getAllSubmissions,
     getSubmission,
-    getSubmissionsForLearningObjectAndAssignment
+    getSubmissionsForLearningObjectAndAssignment,
 } from '../services/submissions.js';
 import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
 import { Language, languageMap } from '@dwengo-1/common/util/language';
@@ -28,7 +28,6 @@ export async function getSubmissionsHandler(req: Request, res: Response): Promis
     res.json(submissions);
 }
 
-
 export async function getSubmissionHandler(req: Request, res: Response): Promise<void> {
     const lohruid = req.params.hruid;
     const lang = languageMap[req.query.language as string] || Language.Dutch;
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index e14c4f14..362ec4c9 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -63,7 +63,7 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
     public async findAllByAssignment(assignment: Assignment): Promise<Question[]> {
         return this.find({
             inGroup: {
-                $contained: assignment.groups
+                $contained: assignment.groups,
             },
             learningObjectHruid: assignment.learningPathHruid,
             learningObjectLanguage: assignment.learningPathLanguage,
diff --git a/backend/src/interfaces/group.ts b/backend/src/interfaces/group.ts
index 924a4586..2a8287a3 100644
--- a/backend/src/interfaces/group.ts
+++ b/backend/src/interfaces/group.ts
@@ -8,7 +8,7 @@ import { getGroupRepository } from '../data/repositories.js';
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
 import { Class } from '../entities/classes/class.entity.js';
 import { StudentDTO } from '@dwengo-1/common/interfaces/student';
-import {mapToClassDTO} from "./class";
+import { mapToClassDTO } from './class';
 
 export function mapToGroup(groupDto: GroupDTO, clazz: Class): Group {
     const assignmentDto = groupDto.assignment as AssignmentDTO;
diff --git a/backend/src/interfaces/submission.ts b/backend/src/interfaces/submission.ts
index 2aebb0f1..aa88f4a1 100644
--- a/backend/src/interfaces/submission.ts
+++ b/backend/src/interfaces/submission.ts
@@ -2,9 +2,9 @@ import { Submission } from '../entities/assignments/submission.entity.js';
 import { mapToGroupDTO } from './group.js';
 import { mapToStudentDTO } from './student.js';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
-import {getSubmissionRepository} from "../data/repositories";
-import {Student} from "../entities/users/student.entity";
-import {Group} from "../entities/assignments/group.entity";
+import { getSubmissionRepository } from '../data/repositories';
+import { Student } from '../entities/users/student.entity';
+import { Group } from '../entities/assignments/group.entity';
 
 export function mapToSubmissionDTO(submission: Submission): SubmissionDTO {
     return {
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index 889c6da6..49bf9e92 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -1,16 +1,16 @@
 import { getAnswerRepository, getAssignmentRepository, getClassRepository, getGroupRepository, getQuestionRepository } from '../data/repositories.js';
-import {mapToLearningObjectID, mapToQuestionDTO, mapToQuestionDTOId} from '../interfaces/question.js';
+import { mapToLearningObjectID, mapToQuestionDTO, mapToQuestionDTOId } from '../interfaces/question.js';
 import { Question } from '../entities/questions/question.entity.js';
 import { Answer } from '../entities/questions/answer.entity.js';
 import { mapToAnswerDTO, mapToAnswerDTOId } from '../interfaces/answer.js';
 import { QuestionRepository } from '../data/questions/question-repository.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
-import {QuestionData, QuestionDTO, QuestionId} from '@dwengo-1/common/interfaces/question';
+import { QuestionData, QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
 import { mapToAssignment } from '../interfaces/assignment.js';
-import {AssignmentDTO} from "@dwengo-1/common/interfaces/assignment";
+import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
 import { fetchStudent } from './students.js';
-import {NotFoundException} from "../exceptions/not-found-exception";
+import { NotFoundException } from '../exceptions/not-found-exception';
 import { FALLBACK_VERSION_NUM } from '../config.js';
 
 export async function getQuestionsAboutLearningObjectInAssignment(
diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts
index ec19b280..64028a5f 100644
--- a/backend/src/services/submissions.ts
+++ b/backend/src/services/submissions.ts
@@ -6,7 +6,7 @@ import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
 import { fetchStudent } from './students.js';
 import { getExistingGroupFromGroupDTO } from './groups.js';
 import { Submission } from '../entities/assignments/submission.entity.js';
-import {Language} from "@dwengo-1/common/util/language";
+import { Language } from '@dwengo-1/common/util/language';
 
 export async function fetchSubmission(loId: LearningObjectIdentifier, submissionNumber: number): Promise<Submission> {
     const submissionRepository = getSubmissionRepository();

From 439edc58930200298d9a17ee99098f08c418dfb8 Mon Sep 17 00:00:00 2001
From: laurejablonski <laure.jablonski@ugent.be>
Date: Fri, 11 Apr 2025 09:56:08 +0200
Subject: [PATCH 139/177] fix: vergeten parameter en verkeerde types fix

---
 backend/tool/seed.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/tool/seed.ts b/backend/tool/seed.ts
index 33344234..3ded9379 100644
--- a/backend/tool/seed.ts
+++ b/backend/tool/seed.ts
@@ -14,6 +14,8 @@ import { makeTestQuestions } from '../tests/test_assets/questions/questions.test
 import { makeTestStudents } from '../tests/test_assets/users/students.testdata.js';
 import { makeTestTeachers } from '../tests/test_assets/users/teachers.testdata.js';
 import { getLogger, Logger } from '../src/logging/initalize.js';
+import { Collection } from '@mikro-orm/core';
+import { Group } from '../dist/entities/assignments/group.entity.js';
 
 const logger: Logger = getLogger();
 
@@ -34,8 +36,8 @@ export async function seedDatabase(): Promise<void> {
     const assignments = makeTestAssignemnts(em, classes);
     const groups = makeTestGroups(em, students, assignments);
 
-    assignments[0].groups = groups.slice(0, 3);
-    assignments[1].groups = groups.slice(3, 4);
+    assignments[0].groups = new Collection<Group>(groups.slice(0, 3));
+    assignments[1].groups = new Collection<Group>(groups.slice(3, 4));
 
     const teacherInvitations = makeTestTeacherInvitations(em, teachers, classes);
     const classJoinRequests = makeTestClassJoinRequests(em, students, classes);
@@ -43,7 +45,7 @@ export async function seedDatabase(): Promise<void> {
 
     learningObjects[1].attachments = attachments;
 
-    const questions = makeTestQuestions(em, students);
+    const questions = makeTestQuestions(em, students, groups);
     const answers = makeTestAnswers(em, teachers, questions);
     const submissions = makeTestSubmissions(em, students, groups);
 

From d1f94588b86598f00be616a7464e5e5fd8fdf3ac Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Sat, 12 Apr 2025 11:46:12 +0200
Subject: [PATCH 140/177] chore(docs): Bouw docs automatisch in staging

---
 backend/.env-old   | 21 +++++++++++++++++++++
 backend/Dockerfile | 20 +++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 backend/.env-old

diff --git a/backend/.env-old b/backend/.env-old
new file mode 100644
index 00000000..bedfb0b7
--- /dev/null
+++ b/backend/.env-old
@@ -0,0 +1,21 @@
+PORT=3000
+DWENGO_DB_HOST=db
+DWENGO_DB_PORT=5432
+DWENGO_DB_USERNAME=postgres
+DWENGO_DB_PASSWORD=postgres
+DWENGO_DB_UPDATE=false
+
+DWENGO_AUTH_STUDENT_URL=http://localhost/idp/realms/student
+DWENGO_AUTH_STUDENT_CLIENT_ID=dwengo
+DWENGO_AUTH_STUDENT_JWKS_ENDPOINT=http://idp:7080/idp/realms/student/protocol/openid-connect/certs
+DWENGO_AUTH_TEACHER_URL=http://localhost/idp/realms/teacher
+DWENGO_AUTH_TEACHER_CLIENT_ID=dwengo
+DWENGO_AUTH_TEACHER_JWKS_ENDPOINT=http://idp:7080/idp/realms/teacher/protocol/openid-connect/certs
+
+# Allow Vite dev-server to access the backend (for testing purposes). Don't forget to remove this in production!
+#DWENGO_CORS_ALLOWED_ORIGINS=http://localhost/,127.0.0.1:80,http://127.0.0.1,http://localhost:80,http://127.0.0.1:80,localhost
+DWENGO_CORS_ALLOWED_ORIGINS=http://localhost/*,http://idp:7080,https://idp:7080
+
+# Logging and monitoring
+
+LOKI_HOST=http://logging:3102
diff --git a/backend/Dockerfile b/backend/Dockerfile
index bb3464c3..5f37aba9 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -22,6 +22,24 @@ COPY docs ./docs
 
 RUN npm run build
 
+FROM node:22 AS docs-stage
+
+WORKDIR /app/dwengo
+
+# Install dependencies
+
+COPY package*.json ./
+COPY docs/package.json ./docs/
+
+RUN npm install --silent
+
+# Build the docs
+
+COPY docs ./docs
+COPY backend ./backend
+
+RUN npm run swagger -w docs
+
 FROM node:22 AS production-stage
 
 WORKDIR /app/dwengo
@@ -34,6 +52,7 @@ COPY ./backend/i18n ./i18n
 
 COPY --from=build-stage /app/dwengo/common/dist ./common/dist
 COPY --from=build-stage /app/dwengo/backend/dist ./backend/dist
+COPY --from=docs-stage /app/dwengo/docs/api/swagger.json ./docs/api/swagger.json
 
 COPY package*.json ./
 COPY backend/package.json ./backend/
@@ -42,7 +61,6 @@ COPY common/package.json ./common/
 
 RUN npm install --silent --only=production
 
-COPY ./docs ./docs
 COPY ./backend/i18n ./backend/i18n
 
 EXPOSE 3000

From e12967dc92a630e041c4a32a4f303da9550a41a0 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Sat, 12 Apr 2025 11:47:40 +0200
Subject: [PATCH 141/177] chore(docs): swagger.json automatisch genereren

Niet meer inchecken in git
---
 docs/.gitignore       |    1 +
 docs/api/swagger.json | 1964 -----------------------------------------
 package.json          |    2 +-
 3 files changed, 2 insertions(+), 1965 deletions(-)
 create mode 100644 docs/.gitignore
 delete mode 100644 docs/api/swagger.json

diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 00000000..ca73ebc9
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1 @@
+api/swagger.json
diff --git a/docs/api/swagger.json b/docs/api/swagger.json
deleted file mode 100644
index 911839d0..00000000
--- a/docs/api/swagger.json
+++ /dev/null
@@ -1,1964 +0,0 @@
-{
-    "openapi": "3.1.0",
-    "info": {
-        "version": "0.1.0",
-        "title": "Dwengo-1 Backend API",
-        "description": "Dwengo-1 Backend API using Express, based on VZW Dwengo",
-        "license": {
-            "name": "MIT",
-            "url": "https://github.com/SELab-2/Dwengo-1/blob/336496ab6352ee3f8bf47490c90b5cf81526cef6/LICENSE"
-        }
-    },
-    "servers": [
-        {
-            "url": "http://localhost:3000/",
-            "description": "Development server"
-        },
-        {
-            "url": "https://sel2-1.ugent.be/",
-            "description": "Production server"
-        }
-    ],
-    "paths": {
-        "/api/": {
-            "get": {
-                "description": "",
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/student/": {
-            "get": {
-                "tags": ["Student"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "201": {
-                        "description": "Created"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            },
-            "post": {
-                "tags": ["Student"],
-                "description": "",
-                "responses": {
-                    "201": {
-                        "description": "Created"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    }
-                },
-                "requestBody": {
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "type": "object",
-                                "properties": {
-                                    "username": {
-                                        "example": "any"
-                                    },
-                                    "firstName": {
-                                        "example": "any"
-                                    },
-                                    "lastName": {
-                                        "example": "any"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "delete": {
-                "tags": ["Student"],
-                "description": "",
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/api/student/{username}": {
-            "delete": {
-                "tags": ["Student"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "username",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            },
-            "get": {
-                "tags": ["Student"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "username",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "201": {
-                        "description": "Created"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/api/student/{id}/classes": {
-            "get": {
-                "tags": ["Student"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "500": {
-                        "description": "Internal Server Error"
-                    }
-                }
-            }
-        },
-        "/api/student/{id}/submissions": {
-            "get": {
-                "tags": ["Student"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/student/{id}/assignments": {
-            "get": {
-                "tags": ["Student"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/student/{id}/groups": {
-            "get": {
-                "tags": ["Student"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/student/{id}/questions": {
-            "get": {
-                "tags": ["Student"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/group/": {
-            "get": {
-                "tags": ["Group"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    }
-                }
-            },
-            "post": {
-                "tags": ["Group"],
-                "description": "",
-                "responses": {
-                    "201": {
-                        "description": "Created"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    },
-                    "500": {
-                        "description": "Internal Server Error"
-                    }
-                }
-            }
-        },
-        "/api/group/{groupid}": {
-            "get": {
-                "tags": ["Group"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "groupid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    }
-                }
-            }
-        },
-        "/api/group/{id}/questions": {
-            "get": {
-                "tags": ["Group"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/assignment/": {
-            "get": {
-                "tags": ["Assignment"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            },
-            "post": {
-                "tags": ["Assignment"],
-                "description": "",
-                "responses": {
-                    "201": {
-                        "description": "Created"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    },
-                    "500": {
-                        "description": "Internal Server Error"
-                    }
-                },
-                "requestBody": {
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "type": "object",
-                                "properties": {
-                                    "description": {
-                                        "example": "any"
-                                    },
-                                    "language": {
-                                        "example": "any"
-                                    },
-                                    "learningPath": {
-                                        "example": "any"
-                                    },
-                                    "title": {
-                                        "example": "any"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/api/assignment/{id}": {
-            "get": {
-                "tags": ["Assignment"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/api/assignment/{id}/submissions": {
-            "get": {
-                "tags": ["Assignment"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    }
-                }
-            }
-        },
-        "/api/assignment/{id}/questions": {
-            "get": {
-                "tags": ["Assignment"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/assignment/{assignmentid}/groups/": {
-            "get": {
-                "tags": ["Assignment"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "assignmentid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    }
-                }
-            },
-            "post": {
-                "tags": ["Assignment"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "assignmentid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "201": {
-                        "description": "Created"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    },
-                    "500": {
-                        "description": "Internal Server Error"
-                    }
-                }
-            }
-        },
-        "/api/assignment/{assignmentid}/groups/{groupid}": {
-            "get": {
-                "tags": ["Assignment"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "assignmentid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "groupid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    }
-                }
-            }
-        },
-        "/api/assignment/{assignmentid}/groups/{id}/questions": {
-            "get": {
-                "tags": ["Assignment"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "assignmentid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/submission/": {
-            "get": {
-                "tags": ["Submission"],
-                "description": "",
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/submission/{id}": {
-            "post": {
-                "tags": ["Submission"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            },
-            "get": {
-                "tags": ["Submission"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "language",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "version",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            },
-            "delete": {
-                "tags": ["Submission"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "language",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "version",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/api/class/": {
-            "get": {
-                "tags": ["Class"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            },
-            "post": {
-                "tags": ["Class"],
-                "description": "",
-                "responses": {
-                    "201": {
-                        "description": "Created"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    },
-                    "500": {
-                        "description": "Internal Server Error"
-                    }
-                },
-                "requestBody": {
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "type": "object",
-                                "properties": {
-                                    "displayName": {
-                                        "example": "any"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/api/class/{id}": {
-            "get": {
-                "tags": ["Class"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    },
-                    "500": {
-                        "description": "Internal Server Error"
-                    }
-                }
-            }
-        },
-        "/api/class/{id}/teacher-invitations": {
-            "get": {
-                "tags": ["Class"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/class/{id}/students": {
-            "get": {
-                "tags": ["Class"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/class/{classid}/assignments/": {
-            "get": {
-                "tags": ["Class"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "classid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            },
-            "post": {
-                "tags": ["Class"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "classid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "201": {
-                        "description": "Created"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    },
-                    "500": {
-                        "description": "Internal Server Error"
-                    }
-                },
-                "requestBody": {
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "type": "object",
-                                "properties": {
-                                    "description": {
-                                        "example": "any"
-                                    },
-                                    "language": {
-                                        "example": "any"
-                                    },
-                                    "learningPath": {
-                                        "example": "any"
-                                    },
-                                    "title": {
-                                        "example": "any"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/api/class/{classid}/assignments/{id}": {
-            "get": {
-                "tags": ["Class"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "classid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/api/class/{classid}/assignments/{id}/submissions": {
-            "get": {
-                "tags": ["Class"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "classid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    }
-                }
-            }
-        },
-        "/api/class/{classid}/assignments/{id}/questions": {
-            "get": {
-                "tags": ["Class"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "classid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/class/{classid}/assignments/{assignmentid}/groups/": {
-            "get": {
-                "tags": ["Class"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "classid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "assignmentid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    }
-                }
-            },
-            "post": {
-                "tags": ["Class"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "classid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "assignmentid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "201": {
-                        "description": "Created"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    },
-                    "500": {
-                        "description": "Internal Server Error"
-                    }
-                }
-            }
-        },
-        "/api/class/{classid}/assignments/{assignmentid}/groups/{groupid}": {
-            "get": {
-                "tags": ["Class"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "classid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "assignmentid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "groupid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    }
-                }
-            }
-        },
-        "/api/class/{classid}/assignments/{assignmentid}/groups/{id}/questions": {
-            "get": {
-                "tags": ["Class"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "classid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "assignmentid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/question/": {
-            "get": {
-                "tags": ["Question"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            },
-            "post": {
-                "tags": ["Question"],
-                "description": "",
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    }
-                },
-                "requestBody": {
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "type": "object",
-                                "properties": {
-                                    "learningObjectIdentifier": {
-                                        "example": "any"
-                                    },
-                                    "author": {
-                                        "example": "any"
-                                    },
-                                    "content": {
-                                        "example": "any"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/api/question/{seq}": {
-            "delete": {
-                "tags": ["Question"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "seq",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    }
-                }
-            },
-            "get": {
-                "tags": ["Question"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "seq",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/api/question/answers/{seq}": {
-            "get": {
-                "tags": ["Question"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "seq",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/api/auth/config": {
-            "get": {
-                "tags": ["Auth"],
-                "description": "",
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/auth/testAuthenticatedOnly": {
-            "get": {
-                "tags": ["Auth"],
-                "description": "",
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "security": [
-                    {
-                        "student": []
-                    },
-                    {
-                        "teacher": []
-                    }
-                ]
-            }
-        },
-        "/api/auth/testStudentsOnly": {
-            "get": {
-                "tags": ["Auth"],
-                "description": "",
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "security": [
-                    {
-                        "student": []
-                    }
-                ]
-            }
-        },
-        "/api/auth/testTeachersOnly": {
-            "get": {
-                "tags": ["Auth"],
-                "description": "",
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "security": [
-                    {
-                        "teacher": []
-                    }
-                ]
-            }
-        },
-        "/api/theme/": {
-            "get": {
-                "tags": ["Theme"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "language",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/theme/{theme}": {
-            "get": {
-                "tags": ["Theme"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "theme",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/api/learningPath/": {
-            "get": {
-                "tags": ["Learning Path"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "hruid",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "theme",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "search",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "language",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "forStudent",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "forGroup",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "assignmentNo",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "classId",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/learningObject/": {
-            "get": {
-                "tags": ["Learning Object"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/learningObject/{hruid}": {
-            "get": {
-                "tags": ["Learning Object"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "hruid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/learningObject/{hruid}/html": {
-            "get": {
-                "tags": ["Learning Object"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "hruid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/learningObject/{hruid}/html/{attachmentName}": {
-            "get": {
-                "tags": ["Learning Object"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "hruid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "attachmentName",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "default": {
-                        "description": ""
-                    }
-                }
-            }
-        },
-        "/api/learningObject/{hruid}/submissions/": {
-            "get": {
-                "tags": ["Learning Object"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "hruid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                }
-            }
-        },
-        "/api/learningObject/{hruid}/submissions/{id}": {
-            "post": {
-                "tags": ["Learning Object"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "hruid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            },
-            "get": {
-                "tags": ["Learning Object"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "hruid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "language",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "version",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            },
-            "delete": {
-                "tags": ["Learning Object"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "hruid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "language",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "version",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/api/learningObject/{hruid}/{version}/questions/": {
-            "get": {
-                "tags": ["Learning Object"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "hruid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "version",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            },
-            "post": {
-                "tags": ["Learning Object"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "hruid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "version",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    }
-                },
-                "requestBody": {
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "type": "object",
-                                "properties": {
-                                    "learningObjectIdentifier": {
-                                        "example": "any"
-                                    },
-                                    "author": {
-                                        "example": "any"
-                                    },
-                                    "content": {
-                                        "example": "any"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/api/learningObject/{hruid}/{version}/questions/{seq}": {
-            "delete": {
-                "tags": ["Learning Object"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "hruid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "version",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "seq",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "400": {
-                        "description": "Bad Request"
-                    }
-                }
-            },
-            "get": {
-                "tags": ["Learning Object"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "hruid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "version",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "seq",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        },
-        "/api/learningObject/{hruid}/{version}/questions/answers/{seq}": {
-            "get": {
-                "tags": ["Learning Object"],
-                "description": "",
-                "parameters": [
-                    {
-                        "name": "hruid",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "version",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "seq",
-                        "in": "path",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "full",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    },
-                    "404": {
-                        "description": "Not Found"
-                    }
-                }
-            }
-        }
-    },
-    "components": {
-        "securitySchemes": {
-            "student": {
-                "type": "oauth2",
-                "flows": {
-                    "implicit": {
-                        "authorizationUrl": "https://sel2-1.ugent.be/idp/realms/student/protocol/openid-connect/auth",
-                        "scopes": {
-                            "openid": "openid",
-                            "profile": "profile",
-                            "email": "email"
-                        }
-                    }
-                }
-            },
-            "teacher": {
-                "type": "oauth2",
-                "flows": {
-                    "implicit": {
-                        "authorizationUrl": "https://sel2-1.ugent.be/idp/realms/teacher/protocol/openid-connect/auth",
-                        "scopes": {
-                            "openid": "openid",
-                            "profile": "profile",
-                            "email": "email"
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/package.json b/package.json
index 64cfd665..3d9be4d0 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "private": true,
     "type": "module",
     "scripts": {
-        "prebuild": "npm run clean",
+        "prebuild": "npm run clean && npm run swagger --workspace=docs",
         "build": "tsc --build tsconfig.build.json",
         "clean": "tsc --build tsconfig.build.json --clean",
         "watch": "tsc --build tsconfig.build.json --watch",

From f3c14a175076ad926bdcaedee87122be607f54b8 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Sat, 12 Apr 2025 11:55:29 +0200
Subject: [PATCH 142/177] fix(backend): Volgorde docs bouwen

---
 backend/Dockerfile | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 5f37aba9..1d82a484 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -6,8 +6,9 @@ WORKDIR /app/dwengo
 
 COPY package*.json ./
 COPY backend/package.json ./backend/
-# Backend depends on common
+# Backend depends on common and docs
 COPY common/package.json ./common/
+COPY docs/package.json ./docs/
 
 RUN npm install --silent
 
@@ -22,24 +23,6 @@ COPY docs ./docs
 
 RUN npm run build
 
-FROM node:22 AS docs-stage
-
-WORKDIR /app/dwengo
-
-# Install dependencies
-
-COPY package*.json ./
-COPY docs/package.json ./docs/
-
-RUN npm install --silent
-
-# Build the docs
-
-COPY docs ./docs
-COPY backend ./backend
-
-RUN npm run swagger -w docs
-
 FROM node:22 AS production-stage
 
 WORKDIR /app/dwengo
@@ -52,7 +35,7 @@ COPY ./backend/i18n ./i18n
 
 COPY --from=build-stage /app/dwengo/common/dist ./common/dist
 COPY --from=build-stage /app/dwengo/backend/dist ./backend/dist
-COPY --from=docs-stage /app/dwengo/docs/api/swagger.json ./docs/api/swagger.json
+COPY --from=build-stage /app/dwengo/docs/api/swagger.json ./docs/api/swagger.json
 
 COPY package*.json ./
 COPY backend/package.json ./backend/

From 311e76149c1f27513bef421f3304e703c51a5092 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Sat, 12 Apr 2025 17:55:39 +0200
Subject: [PATCH 143/177] feat: teacher invitation backend

---
 .../src/controllers/teacher-invitations.ts    | 38 ++++++++++
 .../classes/teacher-invitation-repository.ts  |  7 ++
 backend/src/interfaces/teacher-invitation.ts  |  9 +++
 backend/src/routes/teacher-invitations.ts     | 17 +++++
 backend/src/routes/teachers.ts                |  8 +--
 backend/src/services/teacher-invitations.ts   | 71 +++++++++++++++++++
 common/src/interfaces/teacher-invitation.ts   |  6 ++
 7 files changed, 151 insertions(+), 5 deletions(-)
 create mode 100644 backend/src/controllers/teacher-invitations.ts
 create mode 100644 backend/src/routes/teacher-invitations.ts
 create mode 100644 backend/src/services/teacher-invitations.ts

diff --git a/backend/src/controllers/teacher-invitations.ts b/backend/src/controllers/teacher-invitations.ts
new file mode 100644
index 00000000..3292b7bf
--- /dev/null
+++ b/backend/src/controllers/teacher-invitations.ts
@@ -0,0 +1,38 @@
+import { Request, Response } from 'express';
+import {requireFields} from "./error-helper";
+import {createInvitation, deleteInvitationFor, getAllInvitations} from "../services/teacher-invitations";
+import {TeacherInvitationData} from "@dwengo-1/common/interfaces/teacher-invitation";
+
+export async function getAllInvitationsHandler(req: Request, res: Response): Promise<void> {
+    const username = req.params.username;
+    const by = req.query.by === 'true';
+    requireFields({ username });
+
+    const invitations = getAllInvitations(username, by);
+
+    res.json({ invitations });
+}
+
+export async function createInvitationHandler(req: Request, res: Response): Promise<void> {
+    const sender = req.body.sender;
+    const receiver = req.body.receiver;
+    const classId = req.body.class;
+    requireFields({ sender, receiver, classId });
+
+    const data = req.body as TeacherInvitationData;
+    const invitation = await createInvitation(data);
+
+    res.json({ invitation });
+}
+
+export async function deleteInvitationForHandler(req: Request, res: Response): Promise<void> {
+    const sender = req.params.sender;
+    const receiver = req.params.receiver;
+    const classId = req.params.class;
+    const accepted = req.body.accepted !== 'false';
+    requireFields({ sender, receiver, classId });
+
+    const invitation = deleteInvitationFor(sender, receiver, classId, accepted);
+
+    res.json({ invitation });
+}
diff --git a/backend/src/data/classes/teacher-invitation-repository.ts b/backend/src/data/classes/teacher-invitation-repository.ts
index ce059ca8..5461d29b 100644
--- a/backend/src/data/classes/teacher-invitation-repository.ts
+++ b/backend/src/data/classes/teacher-invitation-repository.ts
@@ -20,4 +20,11 @@ export class TeacherInvitationRepository extends DwengoEntityRepository<TeacherI
             class: clazz,
         });
     }
+    public async findBy(clazz: Class, sender: Teacher, receiver: Teacher): Promise<TeacherInvitation | null> {
+        return this.findOne({
+            sender: sender,
+            receiver: receiver,
+            class: clazz,
+        })
+    }
 }
diff --git a/backend/src/interfaces/teacher-invitation.ts b/backend/src/interfaces/teacher-invitation.ts
index d9cb9915..98189938 100644
--- a/backend/src/interfaces/teacher-invitation.ts
+++ b/backend/src/interfaces/teacher-invitation.ts
@@ -2,6 +2,9 @@ import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity
 import { mapToClassDTO } from './class.js';
 import { mapToUserDTO } from './user.js';
 import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
+import {getTeacherInvitationRepository} from "../data/repositories";
+import {Teacher} from "../entities/users/teacher.entity";
+import {Class} from "../entities/classes/class.entity";
 
 export function mapToTeacherInvitationDTO(invitation: TeacherInvitation): TeacherInvitationDTO {
     return {
@@ -18,3 +21,9 @@ export function mapToTeacherInvitationDTOIds(invitation: TeacherInvitation): Tea
         class: invitation.class.classId!,
     };
 }
+
+export function mapToInvitation(sender: Teacher, receiver: Teacher, cls: Class): TeacherInvitation {
+    return getTeacherInvitationRepository().create({
+        sender, receiver, class: cls
+    });
+}
diff --git a/backend/src/routes/teacher-invitations.ts b/backend/src/routes/teacher-invitations.ts
new file mode 100644
index 00000000..01a18195
--- /dev/null
+++ b/backend/src/routes/teacher-invitations.ts
@@ -0,0 +1,17 @@
+import express from "express";
+import {
+    createInvitationHandler,
+    deleteInvitationForHandler,
+    getAllInvitationsHandler
+} from "../controllers/teacher-invitations";
+
+const router = express.Router({ mergeParams: true });
+
+router.get('/:username', getAllInvitationsHandler);
+
+router.post('/', createInvitationHandler);
+
+router.delete('/:sender/:receiver/:classId', deleteInvitationForHandler);
+
+
+export default router;
diff --git a/backend/src/routes/teachers.ts b/backend/src/routes/teachers.ts
index a6106a80..801eaee8 100644
--- a/backend/src/routes/teachers.ts
+++ b/backend/src/routes/teachers.ts
@@ -10,6 +10,8 @@ import {
     getTeacherStudentHandler,
     updateStudentJoinRequestHandler,
 } from '../controllers/teachers.js';
+import invitationRouter from './teacher-invitations.js';
+
 const router = express.Router();
 
 // Root endpoint used to search objects
@@ -32,10 +34,6 @@ router.get('/:username/joinRequests/:classId', getStudentJoinRequestHandler);
 router.put('/:username/joinRequests/:classId/:studentUsername', updateStudentJoinRequestHandler);
 
 // Invitations to other classes a teacher received
-router.get('/:id/invitations', (_req, res) => {
-    res.json({
-        invitations: ['0'],
-    });
-});
+router.get('/invitations', invitationRouter);
 
 export default router;
diff --git a/backend/src/services/teacher-invitations.ts b/backend/src/services/teacher-invitations.ts
new file mode 100644
index 00000000..1b9ef179
--- /dev/null
+++ b/backend/src/services/teacher-invitations.ts
@@ -0,0 +1,71 @@
+import {fetchTeacher} from "./teachers";
+import {getTeacherInvitationRepository} from "../data/repositories";
+import {mapToInvitation, mapToTeacherInvitationDTO} from "../interfaces/teacher-invitation";
+import {addClassTeacher, fetchClass} from "./classes";
+import {TeacherInvitationData, TeacherInvitationDTO} from "@dwengo-1/common/interfaces/teacher-invitation";
+import {ConflictException} from "../exceptions/conflict-exception";
+import {Teacher} from "../entities/users/teacher.entity";
+import {Class} from "../entities/classes/class.entity";
+import {NotFoundException} from "../exceptions/not-found-exception";
+import {TeacherInvitation} from "../entities/classes/teacher-invitation.entity";
+
+export async function getAllInvitations(username: string, by: boolean): Promise<TeacherInvitationDTO[]> {
+    const teacher = await fetchTeacher(username);
+    const teacherInvitationRepository = getTeacherInvitationRepository();
+
+    let invitations;
+    if (by) {
+        invitations = await teacherInvitationRepository.findAllInvitationsBy(teacher);
+    } else {
+        invitations = await teacherInvitationRepository.findAllInvitationsFor(teacher);
+    }
+    return invitations.map(mapToTeacherInvitationDTO);
+}
+
+export async function createInvitation(data: TeacherInvitationData): Promise<TeacherInvitationDTO> {
+    const teacherInvitationRepository = getTeacherInvitationRepository();
+    const sender = await fetchTeacher(data.sender);
+    const receiver = await fetchTeacher(data.receiver);
+
+    const cls = await fetchClass(data.class);
+
+    if (!cls.teachers.contains(sender)){
+        throw new ConflictException("The teacher sending the invite is not part of the class");
+    }
+
+    const newInvitation = mapToInvitation(sender, receiver, cls);
+    await teacherInvitationRepository.save(newInvitation, {preventOverwrite: true});
+
+    return mapToTeacherInvitationDTO(newInvitation);
+}
+
+async function fetchInvitation(sender: Teacher, receiver: Teacher, cls: Class): Promise<TeacherInvitation> {
+    const teacherInvitationRepository = getTeacherInvitationRepository();
+    const invite = await teacherInvitationRepository.findBy(cls, sender, receiver);
+
+    if (!invite){
+        throw new NotFoundException("Teacher invite not found");
+    }
+
+    return invite;
+}
+
+export async function deleteInvitationFor(usernameSender: string, usernameReceiver: string, classId: string, accepted: boolean) {
+    const teacherInvitationRepository = getTeacherInvitationRepository();
+    const sender = await fetchTeacher(usernameSender);
+    const receiver = await fetchTeacher(usernameReceiver);
+
+    const cls = await fetchClass(classId);
+
+    const invitation = await fetchInvitation(sender, receiver, cls);
+    await teacherInvitationRepository.deleteBy(cls, sender, receiver);
+
+    if (accepted){
+        await addClassTeacher(classId, usernameReceiver);
+    }
+
+    return mapToTeacherInvitationDTO(invitation);
+}
+
+
+
diff --git a/common/src/interfaces/teacher-invitation.ts b/common/src/interfaces/teacher-invitation.ts
index 13709322..c61f9a6a 100644
--- a/common/src/interfaces/teacher-invitation.ts
+++ b/common/src/interfaces/teacher-invitation.ts
@@ -6,3 +6,9 @@ export interface TeacherInvitationDTO {
     receiver: string | UserDTO;
     class: string | ClassDTO;
 }
+
+export interface TeacherInvitationData {
+    sender: string;
+    receiver: string;
+    class: string;
+}

From 363eba57451e9da30001c0f9e76548890db4be3b Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sat, 12 Apr 2025 18:21:43 +0200
Subject: [PATCH 144/177] feat: class query full parameter toegevoegd aan keys

---
 frontend/src/queries/classes.ts | 53 +++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/frontend/src/queries/classes.ts b/frontend/src/queries/classes.ts
index 1ecc0bce..4faf5b19 100644
--- a/frontend/src/queries/classes.ts
+++ b/frontend/src/queries/classes.ts
@@ -7,22 +7,22 @@ import { computed, toValue, type MaybeRefOrGetter } from "vue";
 const classController = new ClassController();
 
 /* Query cache keys */
-function classesQueryKey() {
-    return ["classes"];
+function classesQueryKey(full: boolean) {
+    return ["classes", full];
 }
 function classQueryKey(classid: string) {
     return ["class", classid];
 }
-function classStudentsKey(classid: string) {
-    return ["class-students", classid];
+function classStudentsKey(classid: string, full: boolean) {
+    return ["class-students", classid, full];
 }
-function classTeachersKey(classid: string) {
-    return ["class-teachers", classid];
+function classTeachersKey(classid: string, full: boolean) {
+    return ["class-teachers", classid, full];
 }
-function classTeacherInvitationsKey(classid: string) {
-    return ["class-teacher-invitations", classid];
+function classTeacherInvitationsKey(classid: string, full: boolean) {
+    return ["class-teacher-invitations", classid, full];
 }
-function classAssignmentsKey(classid: string) {
+function classAssignmentsKey(classid: string, full: boolean) {
     return ["class-assignments", classid];
 }
 
@@ -30,16 +30,18 @@ function classAssignmentsKey(classid: string) {
 async function invalidateAll(classid: string, queryClient: QueryClient): Promise<void> {
     await queryClient.invalidateQueries({ queryKey: ["classes"] });
     await queryClient.invalidateQueries({ queryKey: classQueryKey(classid) });
-    await queryClient.invalidateQueries({ queryKey: classStudentsKey(classid) });
-    await queryClient.invalidateQueries({ queryKey: classTeachersKey(classid) });
-    await queryClient.invalidateQueries({ queryKey: classAssignmentsKey(classid) });
-    await queryClient.invalidateQueries({ queryKey: classTeacherInvitationsKey(classid) });
+    for (let v of [true, false]) {
+        await queryClient.invalidateQueries({ queryKey: classStudentsKey(classid, v) });
+        await queryClient.invalidateQueries({ queryKey: classTeachersKey(classid, v) });
+        await queryClient.invalidateQueries({ queryKey: classAssignmentsKey(classid, v) });
+        await queryClient.invalidateQueries({ queryKey: classTeacherInvitationsKey(classid, v) });
+    }
 }
 
 /* Queries */
 export function useClassesQuery(full: MaybeRefOrGetter<boolean> = true): UseQueryReturnType<ClassesResponse, Error> {
     return useQuery({
-        queryKey: computed(() => (classesQueryKey())),
+        queryKey: computed(() => (classesQueryKey(toValue(full)))),
         queryFn: async () => classController.getAll(toValue(full)),
     });
 }
@@ -60,7 +62,8 @@ export function useCreateClassMutation(): UseMutationReturnType<ClassResponse, E
     return useMutation({
         mutationFn: async (data) => classController.createClass(data),
         onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: ["classes"] });
+            await queryClient.invalidateQueries({ queryKey: classesQueryKey(true) });
+            await queryClient.invalidateQueries({ queryKey: classesQueryKey(false) });
         },
     });
 }
@@ -92,7 +95,7 @@ export function useClassStudentsQuery(
     full: MaybeRefOrGetter<boolean> = true
 ): UseQueryReturnType<StudentsResponse, Error> {
     return useQuery({
-        queryKey: computed(() => classStudentsKey(toValue(id)!)),
+        queryKey: computed(() => classStudentsKey(toValue(id)!, toValue(full))),
         queryFn: async () => classController.getStudents(toValue(id)!, toValue(full)!),
         enabled: () => Boolean(toValue(id)),
     })
@@ -105,7 +108,8 @@ export function useClassAddStudentMutation(): UseMutationReturnType<ClassRespons
         mutationFn: async ({ id, username }) => classController.addStudent(id, username),
         onSuccess: async (data) => {
             await queryClient.invalidateQueries({ queryKey: classQueryKey(data.class.id) });
-            await queryClient.invalidateQueries({ queryKey: classStudentsKey(data.class.id) });
+            await queryClient.invalidateQueries({ queryKey: classStudentsKey(data.class.id, true) });
+            await queryClient.invalidateQueries({ queryKey: classStudentsKey(data.class.id, false) });
         },
     });
 }
@@ -117,7 +121,8 @@ export function useClassDeleteStudentMutation(): UseMutationReturnType<ClassResp
         mutationFn: async ({ id, username }) => classController.deleteStudent(id, username),
         onSuccess: async (data) => {
             await queryClient.invalidateQueries({ queryKey: classQueryKey(data.class.id) });
-            await queryClient.invalidateQueries({ queryKey: classStudentsKey(data.class.id) });
+            await queryClient.invalidateQueries({ queryKey: classStudentsKey(data.class.id, true) });
+            await queryClient.invalidateQueries({ queryKey: classStudentsKey(data.class.id, false) });
         },
     });
 }
@@ -127,7 +132,7 @@ export function useClassTeachersQuery(
     full: MaybeRefOrGetter<boolean> = true
 ): UseQueryReturnType<StudentsResponse, Error> {
     return useQuery({
-        queryKey: computed(() => classTeachersKey(toValue(id)!)),
+        queryKey: computed(() => classTeachersKey(toValue(id)!, toValue(full))),
         queryFn: async () => classController.getTeachers(toValue(id)!, toValue(full)!),
         enabled: () => Boolean(toValue(id)),
     });
@@ -140,7 +145,8 @@ export function useClassAddTeacherMutation(): UseMutationReturnType<ClassRespons
         mutationFn: async ({ id, username }) => classController.addTeacher(id, username),
         onSuccess: async (data) => {
             await queryClient.invalidateQueries({ queryKey: classQueryKey(data.class.id) });
-            await queryClient.invalidateQueries({ queryKey: classTeachersKey(data.class.id) });
+            await queryClient.invalidateQueries({ queryKey: classTeachersKey(data.class.id, true) });
+            await queryClient.invalidateQueries({ queryKey: classTeachersKey(data.class.id, false) });
         },
     });
 }
@@ -152,7 +158,8 @@ export function useClassDeleteTeacherMutation(): UseMutationReturnType<ClassResp
         mutationFn: async ({ id, username }) => classController.deleteTeacher(id, username),
         onSuccess: async (data) => {
             await queryClient.invalidateQueries({ queryKey: classQueryKey(data.class.id) });
-            await queryClient.invalidateQueries({ queryKey: classTeachersKey(data.class.id) });
+            await queryClient.invalidateQueries({ queryKey: classTeachersKey(data.class.id, true) });
+            await queryClient.invalidateQueries({ queryKey: classTeachersKey(data.class.id, false) });
         },
     });
 }
@@ -162,7 +169,7 @@ export function useClassTeacherInvitationsQuery(
     full: MaybeRefOrGetter<boolean> = true
 ): UseQueryReturnType<StudentsResponse, Error> {
     return useQuery({
-        queryKey: computed(() => classTeacherInvitationsKey(toValue(id)!)),
+        queryKey: computed(() => classTeacherInvitationsKey(toValue(id)!, toValue(full))),
         queryFn: async () => classController.getTeacherInvitations(toValue(id)!, toValue(full)!),
         enabled: () => Boolean(toValue(id)),
     });
@@ -173,7 +180,7 @@ export function useClassAssignmentsQuery(
     full: MaybeRefOrGetter<boolean> = true
 ): UseQueryReturnType<StudentsResponse, Error> {
     return useQuery({
-        queryKey: computed(() => classAssignmentsKey(toValue(id)!)),
+        queryKey: computed(() => classAssignmentsKey(toValue(id)!, toValue(full))),
         queryFn: async () => classController.getAssignments(toValue(id)!, toValue(full)!),
         enabled: () => Boolean(toValue(id)),
     });

From 9bda33123fc311612fc04c5c9402b53855659964 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sat, 12 Apr 2025 18:26:32 +0200
Subject: [PATCH 145/177] feat: group query full parameter toegevoegd aan keys

---
 frontend/src/queries/groups.ts | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index def17524..5ac9b40b 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -7,8 +7,8 @@ import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
 const groupController = new GroupController();
 
-function groupsQueryKey(classid: string, assignmentNumber: number) {
-    return [ "groups", classid, assignmentNumber ];
+function groupsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
+    return [ "groups", classid, assignmentNumber, full ];
 }
 function groupQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
     return [ "group", classid, assignmentNumber, groupNumber ];
@@ -31,18 +31,19 @@ function toValues(
     classid: MaybeRefOrGetter<string | undefined>, 
     assignmentNumber: MaybeRefOrGetter<number | undefined>, 
     groupNumber: MaybeRefOrGetter<number | undefined>,
+    full: MaybeRefOrGetter<boolean>,
 ) {
-    return { cid: toValue(classid), an: toValue(assignmentNumber), gn: toValue(groupNumber) };
+    return { cid: toValue(classid), an: toValue(assignmentNumber), gn: toValue(groupNumber), f: toValue(full) };
 }
 
 export function useGroupsQuery(
     classid: MaybeRefOrGetter<string | undefined>, 
     assignmentNumber: MaybeRefOrGetter<number | undefined>, 
 ): UseQueryReturnType<GroupsResponse, Error> {
-    const { cid, an, gn } = toValues(classid, assignmentNumber, 1);
+    const { cid, an, f } = toValues(classid, assignmentNumber, 1, true);
 
     return useQuery({
-        queryKey: computed(() => (groupsQueryKey(cid!, an!))),
+        queryKey: computed(() => (groupsQueryKey(cid!, an!, f))),
         queryFn: async () => groupController.getAll(cid!, an!),
         enabled: () => checkEnabled(cid, an, 1),
     });
@@ -53,7 +54,7 @@ export function useGroupQuery(
     assignmentNumber: number, 
     groupNumber: MaybeRefOrGetter<number | undefined>,
 ): UseQueryReturnType<GroupResponse, Error> {
-    const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber);
+    const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber, true);
 
     return useQuery({
         queryKey: computed(() => groupQueryKey(cid!, an!, gn!)),
@@ -68,11 +69,11 @@ export function useGroupSubmissionsQuery(
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<SubmissionsResponse, Error> {
-    const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber);
+    const { cid, an, gn, f } = toValues(classid, assignmentNumber, groupNumber, full);
 
     return useQuery({
-        queryKey: computed(() => groupSubmissionsQueryKey(cid!, an!, gn!, toValue(full))),
-        queryFn: async () => groupController.getSubmissions(cid!, an!, gn!, toValue(full)),
+        queryKey: computed(() => groupSubmissionsQueryKey(cid!, an!, gn!, f)),
+        queryFn: async () => groupController.getSubmissions(cid!, an!, gn!, f),
         enabled: () => checkEnabled(cid, an, gn),
     });
 }
@@ -83,11 +84,11 @@ export function useGroupQuestionsQuery(
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<QuestionsResponse, Error> {
-    const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber);
+    const { cid, an, gn, f } = toValues(classid, assignmentNumber, groupNumber, full);
 
     return useQuery({
-        queryKey: computed(() => groupQuestionsQueryKey(cid!, an!, gn!, toValue(full))),
-        queryFn: async () => groupController.getSubmissions(cid!, an!, gn!, toValue(full)),
+        queryKey: computed(() => groupQuestionsQueryKey(cid!, an!, gn!, f)),
+        queryFn: async () => groupController.getSubmissions(cid!, an!, gn!, f),
         enabled: () => checkEnabled(cid, an, gn),
     });
 }

From 955be87da31c37dddb61ab081dfa20975c79a3b8 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sat, 12 Apr 2025 19:27:56 +0200
Subject: [PATCH 146/177] feat: group query POST, PUT, DELETE mutations

---
 frontend/src/queries/groups.ts | 71 +++++++++++++++++++++++++++++++---
 1 file changed, 66 insertions(+), 5 deletions(-)

diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index 5ac9b40b..afb1fecb 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -2,7 +2,8 @@ import type { ClassesResponse } from "@/controllers/classes";
 import { GroupController, type GroupResponse, type GroupsResponse } from "@/controllers/groups";
 import type { QuestionsResponse } from "@/controllers/questions";
 import type { SubmissionsResponse } from "@/controllers/submissions";
-import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
+import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
+import { useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
 const groupController = new GroupController();
@@ -50,8 +51,8 @@ export function useGroupsQuery(
 }
 
 export function useGroupQuery(
-    classid: string, 
-    assignmentNumber: number, 
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
     groupNumber: MaybeRefOrGetter<number | undefined>,
 ): UseQueryReturnType<GroupResponse, Error> {
     const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber, true);
@@ -63,9 +64,69 @@ export function useGroupQuery(
     });
 }
 
+// TODO: find way to check if cid and an are not undefined.
+// depends on how this function is used.
+export function useCreateClassMutation(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+): UseMutationReturnType<GroupResponse, Error, GroupDTO, unknown> {
+    const queryClient = useQueryClient();
+    const { cid, an } = toValues(classid, assignmentNumber, 1, true);
+
+    return useMutation({
+        mutationFn: async (data) => groupController.createGroup(cid!, an!, data),
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, true) });
+            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, false) });
+        },
+    });
+}
+
+export function useDeleteClassMutation(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+): UseMutationReturnType<GroupResponse, Error, number, unknown> {
+    const queryClient = useQueryClient();
+    const { cid, an, gn } = toValues(classid, assignmentNumber, 1, true);
+
+    return useMutation({
+        mutationFn: async (id) => groupController.deleteGroup(cid!, an!, id),
+        onSuccess: async (_) => {
+            await queryClient.invalidateQueries({ queryKey: groupQueryKey(cid!, an!, gn!) });
+
+            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, true) });
+            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, false) });
+
+            await queryClient.invalidateQueries({ queryKey: groupSubmissionsQueryKey(cid!, an!, gn!, true) });
+            await queryClient.invalidateQueries({ queryKey: groupSubmissionsQueryKey(cid!, an!, gn!, false) });
+
+            await queryClient.invalidateQueries({ queryKey: groupQuestionsQueryKey(cid!, an!, gn!, true) });
+            await queryClient.invalidateQueries({ queryKey: groupQuestionsQueryKey(cid!, an!, gn!, false) });
+        },
+    });
+}
+
+export function useUpdateClassMutation(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+): UseMutationReturnType<GroupResponse, Error, GroupDTO, unknown> {
+    const queryClient = useQueryClient();
+    const { cid, an, gn } = toValues(classid, assignmentNumber, 1, true);
+
+    return useMutation({
+        mutationFn: async (data) => groupController.updateGroup(cid!, an!, gn!, data),
+        onSuccess: async (data) => {
+            await queryClient.invalidateQueries({ queryKey: groupQueryKey(cid!, an!, gn!) });
+
+            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, true) });
+            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, false) });
+        },
+    });
+}
+
 export function useGroupSubmissionsQuery(
-    classid: string, 
-    assignmentNumber: number, 
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<SubmissionsResponse, Error> {

From 2cda69ef5ef4f79e0d4aeb9b6eed9b10e8bc3c29 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sat, 12 Apr 2025 19:56:04 +0200
Subject: [PATCH 147/177] feat: submission query get all en get

---
 frontend/src/controllers/submissions.ts |  8 ++-
 frontend/src/queries/submissions.ts     | 66 +++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 frontend/src/queries/submissions.ts

diff --git a/frontend/src/controllers/submissions.ts b/frontend/src/controllers/submissions.ts
index 837d356c..1f281e62 100644
--- a/frontend/src/controllers/submissions.ts
+++ b/frontend/src/controllers/submissions.ts
@@ -11,7 +11,11 @@ export interface SubmissionResponse {
 
 export class SubmissionController extends BaseController {
     constructor(classid: string, assignmentNumber: number, groupNumber: number) {
-        super(`class/${classid}/assignments/${assignmentNumber}/groups/${groupNumber}`);
+        super(`class/${classid}/assignments/${assignmentNumber}/groups/${groupNumber}/submissions`);
+    }
+
+    protected getBasePath(classid: string, assignmentNumber: number, groupNumber: number) {
+        return `class/${classid}/assignments/${assignmentNumber}/groups/${groupNumber}/submissions`;
     }
 
     async getAll(full = true): Promise<SubmissionsResponse> {
@@ -22,7 +26,7 @@ export class SubmissionController extends BaseController {
         return this.get<SubmissionResponse>(`/${submissionNumber}`);
     }
 
-    async createSubmission(data: unknown): Promise<SubmissionResponse> {
+    async createSubmission(data: SubmissionDTO): Promise<SubmissionResponse> {
         return this.post<SubmissionResponse>(`/`, data);
     }
 
diff --git a/frontend/src/queries/submissions.ts b/frontend/src/queries/submissions.ts
new file mode 100644
index 00000000..defa6c38
--- /dev/null
+++ b/frontend/src/queries/submissions.ts
@@ -0,0 +1,66 @@
+import { SubmissionController, type SubmissionResponse, type SubmissionsResponse } from "@/controllers/submissions";
+import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
+import { computed, toValue, type MaybeRefOrGetter } from "vue";
+
+function submissionsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
+    return [ "submissions", classid, assignmentNumber, full ];
+}
+function submissionQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
+    return [ "submission", classid, assignmentNumber, groupNumber ];
+}
+
+function checkEnabled(
+    classid: string | undefined, 
+    assignmentNumber: number | undefined, 
+    groupNumber: number | undefined,
+    submissionNumber: number | undefined
+): boolean {
+    return  Boolean(classid) 
+        && !isNaN(Number(groupNumber)) 
+        && !isNaN(Number(assignmentNumber))
+        && !isNaN(Number(submissionNumber));
+}
+function toValues(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    groupNumber: MaybeRefOrGetter<number | undefined>,
+    submissionNumber: MaybeRefOrGetter<number | undefined>,
+    full: MaybeRefOrGetter<boolean>,
+) {
+    return { 
+        cid: toValue(classid), 
+        an: toValue(assignmentNumber), 
+        gn: toValue(groupNumber), 
+        sn: toValue(submissionNumber), 
+        f: toValue(full) 
+    };
+}
+
+export function useSubmissionsQuery(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    groupNumber: MaybeRefOrGetter<number | undefined>, 
+    full: MaybeRefOrGetter<boolean> = true,
+): UseQueryReturnType<SubmissionsResponse, Error> {
+    const { cid, an, gn, sn, f } = toValues(classid, assignmentNumber, groupNumber, 1, full);
+
+    return useQuery({
+        queryKey: computed(() => (submissionsQueryKey(cid!, an!, f))),
+        queryFn: async () => new SubmissionController(cid!, an!, gn!).getAll(f),
+        enabled: () => checkEnabled(cid, an, gn, sn),
+    });
+}
+
+export function useSubmissionQuery(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    groupNumber: MaybeRefOrGetter<number | undefined>,
+): UseQueryReturnType<SubmissionResponse, Error> {
+    const { cid, an, gn, sn, f } = toValues(classid, assignmentNumber, groupNumber, 1, true);
+
+    return useQuery({
+        queryKey: computed(() => submissionQueryKey(cid!, an!, gn!)),
+        queryFn: async () => new SubmissionController(cid!, an!, gn!).getByNumber(sn!),
+        enabled: () => checkEnabled(cid, an, gn, sn),
+    });
+}
\ No newline at end of file

From 0784db3680d31eda1b52dbe74bd0e810e5ee82c2 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sat, 12 Apr 2025 20:01:53 +0200
Subject: [PATCH 148/177] feat: submission query POST en DELETE

---
 frontend/src/queries/groups.ts      |  8 +++----
 frontend/src/queries/submissions.ts | 37 ++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index afb1fecb..8d235d8f 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -66,7 +66,7 @@ export function useGroupQuery(
 
 // TODO: find way to check if cid and an are not undefined.
 // depends on how this function is used.
-export function useCreateClassMutation(
+export function useCreateGroupMutation(
     classid: MaybeRefOrGetter<string | undefined>, 
     assignmentNumber: MaybeRefOrGetter<number | undefined>, 
 ): UseMutationReturnType<GroupResponse, Error, GroupDTO, unknown> {
@@ -82,7 +82,7 @@ export function useCreateClassMutation(
     });
 }
 
-export function useDeleteClassMutation(
+export function useDeleteGroupMutation(
     classid: MaybeRefOrGetter<string | undefined>, 
     assignmentNumber: MaybeRefOrGetter<number | undefined>, 
 ): UseMutationReturnType<GroupResponse, Error, number, unknown> {
@@ -91,7 +91,7 @@ export function useDeleteClassMutation(
 
     return useMutation({
         mutationFn: async (id) => groupController.deleteGroup(cid!, an!, id),
-        onSuccess: async (_) => {
+        onSuccess: async () => {
             await queryClient.invalidateQueries({ queryKey: groupQueryKey(cid!, an!, gn!) });
 
             await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, true) });
@@ -106,7 +106,7 @@ export function useDeleteClassMutation(
     });
 }
 
-export function useUpdateClassMutation(
+export function useUpdateGroupMutation(
     classid: MaybeRefOrGetter<string | undefined>, 
     assignmentNumber: MaybeRefOrGetter<number | undefined>, 
 ): UseMutationReturnType<GroupResponse, Error, GroupDTO, unknown> {
diff --git a/frontend/src/queries/submissions.ts b/frontend/src/queries/submissions.ts
index defa6c38..5c0d74c3 100644
--- a/frontend/src/queries/submissions.ts
+++ b/frontend/src/queries/submissions.ts
@@ -1,5 +1,6 @@
 import { SubmissionController, type SubmissionResponse, type SubmissionsResponse } from "@/controllers/submissions";
-import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
+import type { SubmissionDTO } from "@dwengo-1/common/interfaces/submission";
+import { useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
 function submissionsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
@@ -63,4 +64,38 @@ export function useSubmissionQuery(
         queryFn: async () => new SubmissionController(cid!, an!, gn!).getByNumber(sn!),
         enabled: () => checkEnabled(cid, an, gn, sn),
     });
+}
+
+export function useCreateSubmissionMutation(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    groupNumber: MaybeRefOrGetter<number | undefined>, 
+): UseMutationReturnType<SubmissionResponse, Error, SubmissionDTO, unknown> {
+    const queryClient = useQueryClient();
+    const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber, 1, true);
+
+    return useMutation({
+        mutationFn: async (data) => new SubmissionController(cid!, an!, gn!).createSubmission(data),
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, true) });
+            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, false) });
+        },
+    });
+}
+
+export function useDeleteGroupMutation(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    groupNumber: MaybeRefOrGetter<number | undefined>, 
+): UseMutationReturnType<SubmissionResponse, Error, number, unknown> {
+    const queryClient = useQueryClient();
+    const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber, 1, true);
+
+    return useMutation({
+        mutationFn: async (id) => new SubmissionController(cid!, an!, gn!).deleteSubmission(id),
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, true) });
+            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, false) });
+        },
+    });
 }
\ No newline at end of file

From 9c586143829a1c99dc344906d52ab3d29722be0c Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sat, 12 Apr 2025 20:13:14 +0200
Subject: [PATCH 149/177] refactor: group query gerefactord

---
 frontend/src/controllers/groups.ts | 40 ++++++++++++------------------
 frontend/src/queries/groups.ts     | 21 ++++++++--------
 2 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/frontend/src/controllers/groups.ts b/frontend/src/controllers/groups.ts
index 2ba54cb7..4c38290f 100644
--- a/frontend/src/controllers/groups.ts
+++ b/frontend/src/controllers/groups.ts
@@ -12,43 +12,35 @@ export interface GroupResponse {
 }
 
 export class GroupController extends BaseController {
-    constructor() {
-        super('');
+    constructor(classid: string, assignmentNumber: number) {
+        super(`class/${classid}/assignments/${assignmentNumber}/groups`);
     }
 
-    update(classid: string, assignmentNumber: number) {
-        this.basePath = `class/${classid}/assignments/${assignmentNumber}/groups`;
+    async getAll(full = true): Promise<GroupsResponse> {
+        return this.get<GroupsResponse>(`/`, { full });
     }
 
-    protected getBasePath(classid: string, assignmentNumber: number) {
-        return `class/${classid}/assignments/${assignmentNumber}/groups`;
+    async getByNumber(num: number): Promise<GroupResponse> {
+        return this.get<GroupResponse>(`/${num}`);
     }
 
-    async getAll(classid: string, assignmentNumber: number, full = true): Promise<GroupsResponse> {
-        return this.get<GroupsResponse>(`${this.getBasePath(classid, assignmentNumber)}/`, { full });
+    async createGroup(data: GroupDTO): Promise<GroupResponse> {
+        return this.post<GroupResponse>(`/`, data);
     }
 
-    async getByNumber(classid: string, assignmentNumber: number, num: number | string): Promise<GroupResponse> {
-        return this.get<GroupResponse>(`${this.getBasePath(classid, assignmentNumber)}/${num}`);
+    async deleteGroup(num: number): Promise<GroupResponse> {
+        return this.delete<GroupResponse>(`/${num}`);
     }
 
-    async createGroup(classid: string, assignmentNumber: number, data: GroupDTO): Promise<GroupResponse> {
-        return this.post<GroupResponse>(`${this.getBasePath(classid, assignmentNumber)}/`, data);
+    async updateGroup(num: number, data: Partial<GroupDTO>): Promise<GroupResponse> {
+        return this.put<GroupResponse>(`/${num}`, data);
     }
 
-    async deleteGroup(classid: string, assignmentNumber: number, num: number): Promise<GroupResponse> {
-        return this.delete<GroupResponse>(`${this.getBasePath(classid, assignmentNumber)}/${num}`);
+    async getSubmissions(num: number, full = true): Promise<SubmissionsResponse> {
+        return this.get<SubmissionsResponse>(`/${num}/submissions`, { full });
     }
 
-    async updateGroup(classid: string, assignmentNumber: number, num: number, data: Partial<GroupDTO>): Promise<GroupResponse> {
-        return this.put<GroupResponse>(`${this.getBasePath(classid, assignmentNumber)}/${num}`, data);
-    }
-
-    async getSubmissions(classid: string, assignmentNumber: number, groupNumber: number, full = true): Promise<SubmissionsResponse> {
-        return this.get<SubmissionsResponse>(`${this.getBasePath(classid, assignmentNumber)}/${groupNumber}/submissions`, { full });
-    }
-
-    async getQuestions(classid: string, assignmentNumber: number, groupNumber: number, full = true): Promise<QuestionsResponse> {
-        return this.get<QuestionsResponse>(`${this.getBasePath(classid, assignmentNumber)}/${groupNumber}/questions`, { full });
+    async getQuestions(num: number, full = true): Promise<QuestionsResponse> {
+        return this.get<QuestionsResponse>(`/${num}/questions`, { full });
     }
 }
diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index 8d235d8f..7223ebc6 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -6,8 +6,6 @@ import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
 import { useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
-const groupController = new GroupController();
-
 function groupsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
     return [ "groups", classid, assignmentNumber, full ];
 }
@@ -40,12 +38,13 @@ function toValues(
 export function useGroupsQuery(
     classid: MaybeRefOrGetter<string | undefined>, 
     assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<GroupsResponse, Error> {
-    const { cid, an, f } = toValues(classid, assignmentNumber, 1, true);
+    const { cid, an, f } = toValues(classid, assignmentNumber, 1, full);
 
     return useQuery({
         queryKey: computed(() => (groupsQueryKey(cid!, an!, f))),
-        queryFn: async () => groupController.getAll(cid!, an!),
+        queryFn: async () => new GroupController(cid!, an!).getAll(f),
         enabled: () => checkEnabled(cid, an, 1),
     });
 }
@@ -59,7 +58,7 @@ export function useGroupQuery(
 
     return useQuery({
         queryKey: computed(() => groupQueryKey(cid!, an!, gn!)),
-        queryFn: async () => groupController.getByNumber(cid!, an!, gn!),
+        queryFn: async () => new GroupController(cid!, an!).getByNumber(gn!),
         enabled: () => checkEnabled(cid, an, gn),
     });
 }
@@ -74,7 +73,7 @@ export function useCreateGroupMutation(
     const { cid, an } = toValues(classid, assignmentNumber, 1, true);
 
     return useMutation({
-        mutationFn: async (data) => groupController.createGroup(cid!, an!, data),
+        mutationFn: async (data) => new GroupController(cid!, an!).createGroup(data),
         onSuccess: async () => {
             await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, true) });
             await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, false) });
@@ -90,7 +89,7 @@ export function useDeleteGroupMutation(
     const { cid, an, gn } = toValues(classid, assignmentNumber, 1, true);
 
     return useMutation({
-        mutationFn: async (id) => groupController.deleteGroup(cid!, an!, id),
+        mutationFn: async (id) => new GroupController(cid!, an!).deleteGroup(id),
         onSuccess: async () => {
             await queryClient.invalidateQueries({ queryKey: groupQueryKey(cid!, an!, gn!) });
 
@@ -114,8 +113,8 @@ export function useUpdateGroupMutation(
     const { cid, an, gn } = toValues(classid, assignmentNumber, 1, true);
 
     return useMutation({
-        mutationFn: async (data) => groupController.updateGroup(cid!, an!, gn!, data),
-        onSuccess: async (data) => {
+        mutationFn: async (data) => new GroupController(cid!, an!).updateGroup(gn!, data),
+        onSuccess: async () => {
             await queryClient.invalidateQueries({ queryKey: groupQueryKey(cid!, an!, gn!) });
 
             await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, true) });
@@ -134,7 +133,7 @@ export function useGroupSubmissionsQuery(
 
     return useQuery({
         queryKey: computed(() => groupSubmissionsQueryKey(cid!, an!, gn!, f)),
-        queryFn: async () => groupController.getSubmissions(cid!, an!, gn!, f),
+        queryFn: async () => new GroupController(cid!, an!).getSubmissions(gn!, f),
         enabled: () => checkEnabled(cid, an, gn),
     });
 }
@@ -149,7 +148,7 @@ export function useGroupQuestionsQuery(
 
     return useQuery({
         queryKey: computed(() => groupQuestionsQueryKey(cid!, an!, gn!, f)),
-        queryFn: async () => groupController.getSubmissions(cid!, an!, gn!, f),
+        queryFn: async () => new GroupController(cid!, an!).getSubmissions(gn!, f),
         enabled: () => checkEnabled(cid, an, gn),
     });
 }

From 802cbfb6e8d5674e86a8b56ccf5c684abbf3bfa7 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sat, 12 Apr 2025 20:14:24 +0200
Subject: [PATCH 150/177] fix: submission query todo toegevoegd

---
 frontend/src/queries/submissions.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/queries/submissions.ts b/frontend/src/queries/submissions.ts
index 5c0d74c3..374d83d6 100644
--- a/frontend/src/queries/submissions.ts
+++ b/frontend/src/queries/submissions.ts
@@ -66,6 +66,8 @@ export function useSubmissionQuery(
     });
 }
 
+// TODO: find way to check if cid and an are not undefined.
+// depends on how this function is used.
 export function useCreateSubmissionMutation(
     classid: MaybeRefOrGetter<string | undefined>, 
     assignmentNumber: MaybeRefOrGetter<number | undefined>, 

From 3ee66d2f6799290e006c6e92a492791b34e80af0 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sat, 12 Apr 2025 21:26:42 +0200
Subject: [PATCH 151/177] feat: assignment query GET all en GET

---
 frontend/src/queries/assignments.ts | 54 +++++++++++++++++++++++++++++
 frontend/src/queries/submissions.ts | 20 +++++------
 2 files changed, 64 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/queries/assignments.ts

diff --git a/frontend/src/queries/assignments.ts b/frontend/src/queries/assignments.ts
new file mode 100644
index 00000000..a7a8caaf
--- /dev/null
+++ b/frontend/src/queries/assignments.ts
@@ -0,0 +1,54 @@
+import { AssignmentController, type AssignmentsResponse } from "@/controllers/assignments";
+import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
+import { computed, toValue, type MaybeRefOrGetter } from "vue";
+
+function assignmentsQueryKey(classid: string, full: boolean) {
+    return [ "assignments", classid, full ];
+}
+function assignmentQueryKey(classid: string, assignmentNumber: number) {
+    return [ "assignment", classid, assignmentNumber ];
+}
+
+function checkEnabled(
+    classid: string | undefined, 
+    assignmentNumber: number | undefined, 
+    groupNumber: number | undefined,
+): boolean {
+    return  Boolean(classid) && !isNaN(Number(groupNumber)) && !isNaN(Number(assignmentNumber));
+}
+function toValues(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    groupNumber: MaybeRefOrGetter<number | undefined>,
+    full: MaybeRefOrGetter<boolean>,
+) {
+    return { cid: toValue(classid), an: toValue(assignmentNumber), gn: toValue(groupNumber), f: toValue(full) };
+}
+
+export function useAssignmentsQuery(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    full: MaybeRefOrGetter<boolean> = true,
+): UseQueryReturnType<AssignmentsResponse, Error> {
+    const { cid, an, f } = toValues(classid, assignmentNumber, 1, full);
+
+    return useQuery({
+        queryKey: computed(() => (assignmentsQueryKey(cid!, f))),
+        queryFn: async () => new AssignmentController(cid!).getAll(f),
+        enabled: () => checkEnabled(cid, an, 1),
+    });
+}
+
+export function useAssignmentQuery(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    groupNumber: MaybeRefOrGetter<number | undefined>,
+): UseQueryReturnType<AssignmentsResponse, Error> {
+    const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber, true);
+
+    return useQuery({
+        queryKey: computed(() => assignmentQueryKey(cid!, an!)),
+        queryFn: async () => new AssignmentController(cid!).getByNumber(gn!),
+        enabled: () => checkEnabled(cid, an, gn),
+    });
+}
\ No newline at end of file
diff --git a/frontend/src/queries/submissions.ts b/frontend/src/queries/submissions.ts
index 374d83d6..3a15f16e 100644
--- a/frontend/src/queries/submissions.ts
+++ b/frontend/src/queries/submissions.ts
@@ -3,11 +3,11 @@ import type { SubmissionDTO } from "@dwengo-1/common/interfaces/submission";
 import { useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
-function submissionsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
-    return [ "submissions", classid, assignmentNumber, full ];
+function submissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
+    return [ "submissions", classid, assignmentNumber, groupNumber, full ];
 }
-function submissionQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
-    return [ "submission", classid, assignmentNumber, groupNumber ];
+function submissionQueryKey(classid: string, assignmentNumber: number, groupNumber: number, submissionNumber: number) {
+    return [ "submission", classid, assignmentNumber, groupNumber, submissionNumber ];
 }
 
 function checkEnabled(
@@ -46,7 +46,7 @@ export function useSubmissionsQuery(
     const { cid, an, gn, sn, f } = toValues(classid, assignmentNumber, groupNumber, 1, full);
 
     return useQuery({
-        queryKey: computed(() => (submissionsQueryKey(cid!, an!, f))),
+        queryKey: computed(() => (submissionsQueryKey(cid!, an!, gn!, f))),
         queryFn: async () => new SubmissionController(cid!, an!, gn!).getAll(f),
         enabled: () => checkEnabled(cid, an, gn, sn),
     });
@@ -60,7 +60,7 @@ export function useSubmissionQuery(
     const { cid, an, gn, sn, f } = toValues(classid, assignmentNumber, groupNumber, 1, true);
 
     return useQuery({
-        queryKey: computed(() => submissionQueryKey(cid!, an!, gn!)),
+        queryKey: computed(() => submissionQueryKey(cid!, an!, gn!, sn!)),
         queryFn: async () => new SubmissionController(cid!, an!, gn!).getByNumber(sn!),
         enabled: () => checkEnabled(cid, an, gn, sn),
     });
@@ -79,8 +79,8 @@ export function useCreateSubmissionMutation(
     return useMutation({
         mutationFn: async (data) => new SubmissionController(cid!, an!, gn!).createSubmission(data),
         onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, true) });
-            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, false) });
+            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, gn!, true) });
+            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, gn!, false) });
         },
     });
 }
@@ -96,8 +96,8 @@ export function useDeleteGroupMutation(
     return useMutation({
         mutationFn: async (id) => new SubmissionController(cid!, an!, gn!).deleteSubmission(id),
         onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, true) });
-            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, false) });
+            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, gn!, true) });
+            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, gn!, false) });
         },
     });
 }
\ No newline at end of file

From 5624f3bbfe9b93e05ba08ca0af9d465cab5da501 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Sun, 13 Apr 2025 09:48:34 +0200
Subject: [PATCH 152/177] feat: tests

---
 .../src/controllers/teacher-invitations.ts    |  6 +-
 .../controllers/teacher-invitations.test.ts   | 97 +++++++++++++++++++
 2 files changed, 100 insertions(+), 3 deletions(-)
 create mode 100644 backend/tests/controllers/teacher-invitations.test.ts

diff --git a/backend/src/controllers/teacher-invitations.ts b/backend/src/controllers/teacher-invitations.ts
index 3292b7bf..15bfc936 100644
--- a/backend/src/controllers/teacher-invitations.ts
+++ b/backend/src/controllers/teacher-invitations.ts
@@ -8,7 +8,7 @@ export async function getAllInvitationsHandler(req: Request, res: Response): Pro
     const by = req.query.by === 'true';
     requireFields({ username });
 
-    const invitations = getAllInvitations(username, by);
+    const invitations = await getAllInvitations(username, by);
 
     res.json({ invitations });
 }
@@ -28,11 +28,11 @@ export async function createInvitationHandler(req: Request, res: Response): Prom
 export async function deleteInvitationForHandler(req: Request, res: Response): Promise<void> {
     const sender = req.params.sender;
     const receiver = req.params.receiver;
-    const classId = req.params.class;
+    const classId = req.params.classId;
     const accepted = req.body.accepted !== 'false';
     requireFields({ sender, receiver, classId });
 
-    const invitation = deleteInvitationFor(sender, receiver, classId, accepted);
+    const invitation = await deleteInvitationFor(sender, receiver, classId, accepted);
 
     res.json({ invitation });
 }
diff --git a/backend/tests/controllers/teacher-invitations.test.ts b/backend/tests/controllers/teacher-invitations.test.ts
new file mode 100644
index 00000000..8135281a
--- /dev/null
+++ b/backend/tests/controllers/teacher-invitations.test.ts
@@ -0,0 +1,97 @@
+import { beforeAll, beforeEach, describe, expect, it, Mock, vi } from 'vitest';
+import { Request, Response } from 'express';
+import { setupTestApp } from '../setup-tests.js';
+import {
+    createInvitationHandler,
+    deleteInvitationForHandler,
+    getAllInvitationsHandler
+} from "../../src/controllers/teacher-invitations";
+import {TeacherInvitationData} from "@dwengo-1/common/interfaces/teacher-invitation";
+import {getClassHandler} from "../../src/controllers/classes";
+
+describe('Teacher controllers', () => {
+    let req: Partial<Request>;
+    let res: Partial<Response>;
+
+    let jsonMock: Mock;
+
+    beforeAll(async () => {
+        await setupTestApp();
+    });
+
+    beforeEach(() => {
+        jsonMock = vi.fn();
+        res = {
+            json: jsonMock,
+        };
+    });
+
+    it('Get teacher invitations by', async () => {
+        req = {params: {username: 'LimpBizkit'}, query: {by: 'true' }};
+
+        await getAllInvitationsHandler(req as Request, res as Response);
+
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({invitations: expect.anything()}));
+
+        const result = jsonMock.mock.lastCall?.[0];
+        expect(result.invitations).to.have.length.greaterThan(0);
+    });
+
+    it('Get teacher invitations for', async () => {
+        req = {params: {username: 'FooFighters'}, query: {by: 'false' }};
+
+        await getAllInvitationsHandler(req as Request, res as Response);
+
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({invitations: expect.anything()}));
+
+        const result = jsonMock.mock.lastCall?.[0];
+        expect(result.invitations).to.have.length.greaterThan(0);
+    });
+
+    it('Create and delete invitation', async () => {
+        const body = {
+            sender: 'LimpBizkit', receiver: 'testleerkracht1',
+            class: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89'
+        } as TeacherInvitationData;
+        req = { body };
+
+        await createInvitationHandler(req as Request, res as Response);
+
+        req = {
+            params: {
+            sender: 'LimpBizkit', receiver: 'testleerkracht1',
+                classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89'
+            }, body: { accepted: 'false' }
+        };
+
+        await deleteInvitationForHandler(req as Request, res as Response);
+    });
+
+    it('Create and accept invitation', async () => {
+        const body = {
+            sender: 'LimpBizkit', receiver: 'testleerkracht1',
+            class: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89'
+        } as TeacherInvitationData;
+        req = { body };
+
+        await createInvitationHandler(req as Request, res as Response);
+
+        req = {
+            params: {
+                sender: 'LimpBizkit', receiver: 'testleerkracht1',
+                classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89'
+            }, body: { accepted: 'true' }
+        };
+
+        await deleteInvitationForHandler(req as Request, res as Response);
+
+        req = {params: {
+            id: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89'
+        }};
+
+        await getClassHandler(req as Request, res as Response);
+
+        const result = jsonMock.mock.lastCall?.[0];
+        expect(result.class.teachers).toContain('testleerkracht1');
+    });
+});

From 10ec9cbb589d8d0901b9b2355b3fdd8822e39c12 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 13 Apr 2025 11:41:34 +0200
Subject: [PATCH 153/177] feat: assignment query submissions, questions en
 groups geimplementeerd

---
 frontend/src/queries/assignments.ts | 55 +++++++++++++++++++++++++++++
 frontend/src/queries/groups.ts      |  2 +-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/frontend/src/queries/assignments.ts b/frontend/src/queries/assignments.ts
index a7a8caaf..bec4e52a 100644
--- a/frontend/src/queries/assignments.ts
+++ b/frontend/src/queries/assignments.ts
@@ -1,6 +1,10 @@
 import { AssignmentController, type AssignmentsResponse } from "@/controllers/assignments";
+import type { QuestionsResponse } from "@/controllers/questions";
+import type { SubmissionsResponse } from "@/controllers/submissions";
 import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
+import { groupsQueryKey } from "./groups";
+import type { GroupsResponse } from "@/controllers/groups";
 
 function assignmentsQueryKey(classid: string, full: boolean) {
     return [ "assignments", classid, full ];
@@ -8,6 +12,12 @@ function assignmentsQueryKey(classid: string, full: boolean) {
 function assignmentQueryKey(classid: string, assignmentNumber: number) {
     return [ "assignment", classid, assignmentNumber ];
 }
+function assignmentSubmissionsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
+    return [ "assignment-submissions", classid, assignmentNumber, full ];
+}
+function assignmentQuestionsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
+    return [ "assignment-questions", classid, assignmentNumber, full ];
+}
 
 function checkEnabled(
     classid: string | undefined, 
@@ -51,4 +61,49 @@ export function useAssignmentQuery(
         queryFn: async () => new AssignmentController(cid!).getByNumber(gn!),
         enabled: () => checkEnabled(cid, an, gn),
     });
+}
+
+export function useAssignmentSubmissionsQuery(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    groupNumber: MaybeRefOrGetter<number | undefined>,
+    full: MaybeRefOrGetter<boolean> = true,
+): UseQueryReturnType<SubmissionsResponse, Error> {
+    const { cid, an, gn, f } = toValues(classid, assignmentNumber, groupNumber, full);
+
+    return useQuery({
+        queryKey: computed(() => assignmentSubmissionsQueryKey(cid!, an!, f)),
+        queryFn: async () => new AssignmentController(cid!).getSubmissions(gn!, f),
+        enabled: () => checkEnabled(cid, an, gn),
+    });
+}
+
+export function useAssignmentQuestionsQuery(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    groupNumber: MaybeRefOrGetter<number | undefined>,
+    full: MaybeRefOrGetter<boolean> = true,
+): UseQueryReturnType<QuestionsResponse, Error> {
+    const { cid, an, gn, f } = toValues(classid, assignmentNumber, groupNumber, full);
+
+    return useQuery({
+        queryKey: computed(() => assignmentQuestionsQueryKey(cid!, an!, f)),
+        queryFn: async () => new AssignmentController(cid!).getQuestions(gn!, f),
+        enabled: () => checkEnabled(cid, an, gn),
+    });
+}
+
+export function useAssignmentGroupsQuery(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    groupNumber: MaybeRefOrGetter<number | undefined>,
+    full: MaybeRefOrGetter<boolean> = true,
+): UseQueryReturnType<GroupsResponse, Error> {
+    const { cid, an, gn, f } = toValues(classid, assignmentNumber, groupNumber, full);
+
+    return useQuery({
+        queryKey: computed(() => groupsQueryKey(cid!, an!, f)),
+        queryFn: async () => new AssignmentController(cid!).getQuestions(gn!, f),
+        enabled: () => checkEnabled(cid, an, gn),
+    });
 }
\ No newline at end of file
diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index 7223ebc6..50a5d92a 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -6,7 +6,7 @@ import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
 import { useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
-function groupsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
+export function groupsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
     return [ "groups", classid, assignmentNumber, full ];
 }
 function groupQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {

From 75f1ff013bab439f2cb14205468465686d9bca82 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 13 Apr 2025 12:03:11 +0200
Subject: [PATCH 154/177] feat: assignment query mutation queries
 geimplementeerd (POST, DELETE, PUT)

---
 frontend/src/queries/assignments.ts | 79 +++++++++++++++++++++++++----
 1 file changed, 70 insertions(+), 9 deletions(-)

diff --git a/frontend/src/queries/assignments.ts b/frontend/src/queries/assignments.ts
index bec4e52a..e3bf6d39 100644
--- a/frontend/src/queries/assignments.ts
+++ b/frontend/src/queries/assignments.ts
@@ -1,10 +1,11 @@
-import { AssignmentController, type AssignmentsResponse } from "@/controllers/assignments";
+import { AssignmentController, type AssignmentResponse, type AssignmentsResponse } from "@/controllers/assignments";
 import type { QuestionsResponse } from "@/controllers/questions";
 import type { SubmissionsResponse } from "@/controllers/submissions";
-import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
+import { useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 import { groupsQueryKey } from "./groups";
 import type { GroupsResponse } from "@/controllers/groups";
+import type { AssignmentDTO } from "@dwengo-1/common/interfaces/assignment";
 
 function assignmentsQueryKey(classid: string, full: boolean) {
     return [ "assignments", classid, full ];
@@ -37,29 +38,89 @@ function toValues(
 
 export function useAssignmentsQuery(
     classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<AssignmentsResponse, Error> {
-    const { cid, an, f } = toValues(classid, assignmentNumber, 1, full);
+    const { cid, f } = toValues(classid, 1, 1, full);
 
     return useQuery({
         queryKey: computed(() => (assignmentsQueryKey(cid!, f))),
         queryFn: async () => new AssignmentController(cid!).getAll(f),
-        enabled: () => checkEnabled(cid, an, 1),
+        enabled: () => checkEnabled(cid, 1, 1),
     });
 }
 
 export function useAssignmentQuery(
     classid: MaybeRefOrGetter<string | undefined>, 
     assignmentNumber: MaybeRefOrGetter<number | undefined>, 
-    groupNumber: MaybeRefOrGetter<number | undefined>,
 ): UseQueryReturnType<AssignmentsResponse, Error> {
-    const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber, true);
+    const { cid, an } = toValues(classid, assignmentNumber, 1, true);
 
     return useQuery({
         queryKey: computed(() => assignmentQueryKey(cid!, an!)),
-        queryFn: async () => new AssignmentController(cid!).getByNumber(gn!),
-        enabled: () => checkEnabled(cid, an, gn),
+        queryFn: async () => new AssignmentController(cid!).getByNumber(an!),
+        enabled: () => checkEnabled(cid, an, 1),
+    });
+}
+
+export function useCreateAssignmentMutation(
+    classid: MaybeRefOrGetter<string | undefined>, 
+): UseMutationReturnType<AssignmentResponse, Error, AssignmentDTO, unknown> {
+    const queryClient = useQueryClient();
+    const { cid } = toValues(classid, 1, 1, true);
+
+    return useMutation({
+        mutationFn: async (data) => new AssignmentController(cid!).createAssignment(data),
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: assignmentsQueryKey(cid!, true) });
+            await queryClient.invalidateQueries({ queryKey: assignmentsQueryKey(cid!, false) });
+        },
+    });
+}
+
+export function useDeleteAssignmentMutation(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+): UseMutationReturnType<AssignmentResponse, Error, number, unknown> {
+    const queryClient = useQueryClient();
+    const { cid, an } = toValues(classid, assignmentNumber, 1, true);
+
+    return useMutation({
+        mutationFn: async (id) => new AssignmentController(cid!).deleteAssignment(id),
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: assignmentQueryKey(cid!, an!) });
+
+            await queryClient.invalidateQueries({ queryKey: assignmentsQueryKey(cid!, true) });
+            await queryClient.invalidateQueries({ queryKey: assignmentsQueryKey(cid!, false) });
+
+            await queryClient.invalidateQueries({ queryKey: assignmentSubmissionsQueryKey(cid!, an!, true) });
+            await queryClient.invalidateQueries({ queryKey: assignmentSubmissionsQueryKey(cid!, an!, false) });
+
+            await queryClient.invalidateQueries({ queryKey: assignmentQuestionsQueryKey(cid!, an!, false) });
+            await queryClient.invalidateQueries({ queryKey: assignmentQuestionsQueryKey(cid!, an!, true) });
+            
+            // should probably invalidate all groups related to assignment
+            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, false) });
+            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, true) });
+        },
+    });
+}
+
+export function useUpdateAssignmentMutation(
+    classid: MaybeRefOrGetter<string | undefined>, 
+    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+): UseMutationReturnType<AssignmentResponse, Error, Partial<AssignmentDTO>, unknown> {
+    const queryClient = useQueryClient();
+    const { cid, an } = toValues(classid, assignmentNumber, 1, true);
+
+    return useMutation({
+        mutationFn: async (data) => new AssignmentController(cid!).updateAssignment(an!, data),
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, true) });
+            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, false) });
+
+            await queryClient.invalidateQueries({ queryKey: assignmentsQueryKey(cid!, true) });
+            await queryClient.invalidateQueries({ queryKey: assignmentsQueryKey(cid!, false) });
+        },
     });
 }
 

From 7bee08537a67f0a10863d1d21a4b2b807cb999d8 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 13 Apr 2025 14:37:29 +0200
Subject: [PATCH 155/177] fix/refactor: cache keys gefixt, useMutation
 argumenten rerefactord

---
 frontend/src/queries/assignments.ts | 77 ++++++++++++++---------------
 frontend/src/queries/classes.ts     | 38 +++++++++-----
 frontend/src/queries/groups.ts      | 22 ++++++++-
 frontend/src/queries/submissions.ts | 21 +++++++-
 4 files changed, 104 insertions(+), 54 deletions(-)

diff --git a/frontend/src/queries/assignments.ts b/frontend/src/queries/assignments.ts
index e3bf6d39..ddfe0bc4 100644
--- a/frontend/src/queries/assignments.ts
+++ b/frontend/src/queries/assignments.ts
@@ -3,9 +3,11 @@ import type { QuestionsResponse } from "@/controllers/questions";
 import type { SubmissionsResponse } from "@/controllers/submissions";
 import { useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
-import { groupsQueryKey } from "./groups";
+import { groupsQueryKey, invalidateAllGroupKeys } from "./groups";
 import type { GroupsResponse } from "@/controllers/groups";
 import type { AssignmentDTO } from "@dwengo-1/common/interfaces/assignment";
+import type { QueryClient } from "@tanstack/react-query";
+import { invalidateAllSubmissionKeys } from "./submissions";
 
 function assignmentsQueryKey(classid: string, full: boolean) {
     return [ "assignments", classid, full ];
@@ -20,6 +22,21 @@ function assignmentQuestionsQueryKey(classid: string, assignmentNumber: number,
     return [ "assignment-questions", classid, assignmentNumber, full ];
 }
 
+export async function invalidateAllAssignmentKeys(queryClient: QueryClient, classid?: string, assignmentNumber?: number) {
+    const keys = [
+        "assignment",
+        "assignment-submissions",
+        "assignment-questions",
+    ];
+
+    for (let key of keys) {
+        const queryKey = [key, classid, assignmentNumber].filter(arg => arg !== undefined);
+        await queryClient.invalidateQueries({ queryKey: queryKey });
+    }
+
+    await queryClient.invalidateQueries({ queryKey: [ "assignments", classid ].filter(arg => arg !== undefined) });
+}
+
 function checkEnabled(
     classid: string | undefined, 
     assignmentNumber: number | undefined, 
@@ -62,64 +79,44 @@ export function useAssignmentQuery(
     });
 }
 
-export function useCreateAssignmentMutation(
-    classid: MaybeRefOrGetter<string | undefined>, 
-): UseMutationReturnType<AssignmentResponse, Error, AssignmentDTO, unknown> {
+export function useCreateAssignmentMutation(): UseMutationReturnType<AssignmentResponse, Error, {cid: string, data: AssignmentDTO}, unknown> {
     const queryClient = useQueryClient();
-    const { cid } = toValues(classid, 1, 1, true);
 
     return useMutation({
-        mutationFn: async (data) => new AssignmentController(cid!).createAssignment(data),
-        onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: assignmentsQueryKey(cid!, true) });
-            await queryClient.invalidateQueries({ queryKey: assignmentsQueryKey(cid!, false) });
+        mutationFn: async ({ cid, data }) => new AssignmentController(cid).createAssignment(data),
+        onSuccess: async (_) => {
+            await queryClient.invalidateQueries({ queryKey: [ "assignments" ] });
         },
     });
 }
 
-export function useDeleteAssignmentMutation(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
-): UseMutationReturnType<AssignmentResponse, Error, number, unknown> {
+export function useDeleteAssignmentMutation(): UseMutationReturnType<AssignmentResponse, Error, {cid: string, an: number}, unknown> {
     const queryClient = useQueryClient();
-    const { cid, an } = toValues(classid, assignmentNumber, 1, true);
 
     return useMutation({
-        mutationFn: async (id) => new AssignmentController(cid!).deleteAssignment(id),
-        onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: assignmentQueryKey(cid!, an!) });
+        mutationFn: async ({ cid, an }) => new AssignmentController(cid).deleteAssignment(an),
+        onSuccess: async (response) => {
+            const cid = response.assignment.within;
+            const an = response.assignment.id;
 
-            await queryClient.invalidateQueries({ queryKey: assignmentsQueryKey(cid!, true) });
-            await queryClient.invalidateQueries({ queryKey: assignmentsQueryKey(cid!, false) });
-
-            await queryClient.invalidateQueries({ queryKey: assignmentSubmissionsQueryKey(cid!, an!, true) });
-            await queryClient.invalidateQueries({ queryKey: assignmentSubmissionsQueryKey(cid!, an!, false) });
-
-            await queryClient.invalidateQueries({ queryKey: assignmentQuestionsQueryKey(cid!, an!, false) });
-            await queryClient.invalidateQueries({ queryKey: assignmentQuestionsQueryKey(cid!, an!, true) });
-            
-            // should probably invalidate all groups related to assignment
-            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, false) });
-            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, true) });
+            await invalidateAllAssignmentKeys(queryClient, cid, an);
+            await invalidateAllGroupKeys(queryClient, cid, an);
+            await invalidateAllSubmissionKeys(queryClient, cid, an);
         },
     });
 }
 
-export function useUpdateAssignmentMutation(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
-): UseMutationReturnType<AssignmentResponse, Error, Partial<AssignmentDTO>, unknown> {
+export function useUpdateAssignmentMutation(): UseMutationReturnType<AssignmentResponse, Error, {cid: string, an: number, data: Partial<AssignmentDTO>}, unknown> {
     const queryClient = useQueryClient();
-    const { cid, an } = toValues(classid, assignmentNumber, 1, true);
 
     return useMutation({
-        mutationFn: async (data) => new AssignmentController(cid!).updateAssignment(an!, data),
-        onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, true) });
-            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, false) });
+        mutationFn: async ({ cid, an, data }) => new AssignmentController(cid).updateAssignment(an, data),
+        onSuccess: async (response) => {
+            const cid = response.assignment.within;
+            const an = response.assignment.id;
 
-            await queryClient.invalidateQueries({ queryKey: assignmentsQueryKey(cid!, true) });
-            await queryClient.invalidateQueries({ queryKey: assignmentsQueryKey(cid!, false) });
+            await invalidateAllGroupKeys(queryClient, cid, an);
+            await queryClient.invalidateQueries({ queryKey: [ "assignments" ] });
         },
     });
 }
diff --git a/frontend/src/queries/classes.ts b/frontend/src/queries/classes.ts
index 4faf5b19..a6d1c157 100644
--- a/frontend/src/queries/classes.ts
+++ b/frontend/src/queries/classes.ts
@@ -3,6 +3,9 @@ import type { StudentsResponse } from "@/controllers/students";
 import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
 import { QueryClient, useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
+import { invalidateAllAssignmentKeys } from "./assignments";
+import { invalidateAllGroupKeys } from "./groups";
+import { invalidateAllSubmissionKeys } from "./submissions";
 
 const classController = new ClassController();
 
@@ -23,19 +26,24 @@ function classTeacherInvitationsKey(classid: string, full: boolean) {
     return ["class-teacher-invitations", classid, full];
 }
 function classAssignmentsKey(classid: string, full: boolean) {
-    return ["class-assignments", classid];
+    return ["class-assignments", classid, full];
 }
 
-/* Function to invalidate all caches with certain class id */
-async function invalidateAll(classid: string, queryClient: QueryClient): Promise<void> {
-    await queryClient.invalidateQueries({ queryKey: ["classes"] });
-    await queryClient.invalidateQueries({ queryKey: classQueryKey(classid) });
-    for (let v of [true, false]) {
-        await queryClient.invalidateQueries({ queryKey: classStudentsKey(classid, v) });
-        await queryClient.invalidateQueries({ queryKey: classTeachersKey(classid, v) });
-        await queryClient.invalidateQueries({ queryKey: classAssignmentsKey(classid, v) });
-        await queryClient.invalidateQueries({ queryKey: classTeacherInvitationsKey(classid, v) });
+export async function invalidateAllClassKeys(queryClient: QueryClient, classid?: string) {
+    const keys = [
+        "class",
+        "class-students",
+        "class-teachers",
+        "class-teacher-invitations",
+        "class-assignments",
+    ];
+
+    for (let key of keys) {
+        const queryKey = [key, classid].filter(arg => arg !== undefined);
+        await queryClient.invalidateQueries({ queryKey: queryKey });
     }
+
+    await queryClient.invalidateQueries({ queryKey: [ "classes" ] });
 }
 
 /* Queries */
@@ -74,7 +82,10 @@ export function useDeleteClassMutation(): UseMutationReturnType<ClassResponse, E
     return useMutation({
         mutationFn: async (id) => classController.deleteClass(id),
         onSuccess: async (data) => {
-            await invalidateAll(data.class.id, queryClient);
+            await invalidateAllClassKeys(queryClient, data.class.id);
+            await invalidateAllAssignmentKeys(queryClient, data.class.id);
+            await invalidateAllGroupKeys(queryClient, data.class.id);
+            await invalidateAllSubmissionKeys(queryClient, data.class.id);
         },
     });
 }
@@ -85,7 +96,10 @@ export function useUpdateClassMutation(): UseMutationReturnType<ClassResponse, E
     return useMutation({
         mutationFn: async (data) => classController.updateClass(data.id, data),
         onSuccess: async (data) => {
-            await invalidateAll(data.class.id, queryClient);
+            await invalidateAllClassKeys(queryClient, data.class.id);
+            await invalidateAllAssignmentKeys(queryClient, data.class.id);
+            await invalidateAllGroupKeys(queryClient, data.class.id);
+            await invalidateAllSubmissionKeys(queryClient, data.class.id);
         },
     });
 }
diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index 50a5d92a..37270953 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -3,7 +3,7 @@ import { GroupController, type GroupResponse, type GroupsResponse } from "@/cont
 import type { QuestionsResponse } from "@/controllers/questions";
 import type { SubmissionsResponse } from "@/controllers/submissions";
 import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
-import { useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
+import { QueryClient, useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
 export function groupsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
@@ -19,6 +19,26 @@ function groupQuestionsQueryKey(classid: string, assignmentNumber: number, group
     return [ "group-questions", classid, assignmentNumber, groupNumber, full ];
 }
 
+export async function invalidateAllGroupKeys(
+    queryClient: QueryClient, 
+    classid?: string, 
+    assignmentNumber?: number,
+    groupNumber?: number,
+) {
+    const keys = [
+        "group",
+        "group-submissions",
+        "group-questions",
+    ];
+
+    for (let key of keys) {
+        const queryKey = [key, classid, assignmentNumber, groupNumber].filter(arg => arg !== undefined);
+        await queryClient.invalidateQueries({ queryKey: queryKey });
+    }
+
+    await queryClient.invalidateQueries({ queryKey: [ "groups", classid, assignmentNumber ].filter(arg => arg !== undefined) });
+}
+
 function checkEnabled(
     classid: string | undefined, 
     assignmentNumber: number | undefined, 
diff --git a/frontend/src/queries/submissions.ts b/frontend/src/queries/submissions.ts
index 3a15f16e..5b8d5691 100644
--- a/frontend/src/queries/submissions.ts
+++ b/frontend/src/queries/submissions.ts
@@ -1,6 +1,6 @@
 import { SubmissionController, type SubmissionResponse, type SubmissionsResponse } from "@/controllers/submissions";
 import type { SubmissionDTO } from "@dwengo-1/common/interfaces/submission";
-import { useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
+import { QueryClient, useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
 function submissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
@@ -10,6 +10,25 @@ function submissionQueryKey(classid: string, assignmentNumber: number, groupNumb
     return [ "submission", classid, assignmentNumber, groupNumber, submissionNumber ];
 }
 
+export async function invalidateAllSubmissionKeys(
+    queryClient: QueryClient, 
+    classid?: string, 
+    assignmentNumber?: number,
+    groupNumber?: number,
+    submissionNumber?: number,
+) {
+    const keys = [
+        "submission",
+    ];
+
+    for (let key of keys) {
+        const queryKey = [key, classid, assignmentNumber, groupNumber, submissionNumber].filter(arg => arg !== undefined);
+        await queryClient.invalidateQueries({ queryKey: queryKey });
+    }
+
+    await queryClient.invalidateQueries({ queryKey: [ "submissions", classid, assignmentNumber, groupNumber ].filter(arg => arg !== undefined) });
+}
+
 function checkEnabled(
     classid: string | undefined, 
     assignmentNumber: number | undefined, 

From 389ce91b52e555ec013e4662246d2ceeed394cb0 Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 13 Apr 2025 14:47:40 +0200
Subject: [PATCH 156/177] refactor/fix: group query argumenten gerefactord,
 group query cach keys gefixt

---
 frontend/src/queries/classes.ts |  7 ++--
 frontend/src/queries/groups.ts  | 62 +++++++++++++--------------------
 2 files changed, 28 insertions(+), 41 deletions(-)

diff --git a/frontend/src/queries/classes.ts b/frontend/src/queries/classes.ts
index a6d1c157..66be4acf 100644
--- a/frontend/src/queries/classes.ts
+++ b/frontend/src/queries/classes.ts
@@ -70,8 +70,7 @@ export function useCreateClassMutation(): UseMutationReturnType<ClassResponse, E
     return useMutation({
         mutationFn: async (data) => classController.createClass(data),
         onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: classesQueryKey(true) });
-            await queryClient.invalidateQueries({ queryKey: classesQueryKey(false) });
+            await queryClient.invalidateQueries({ queryKey: [ "classes" ] });
         },
     });
 }
@@ -90,11 +89,11 @@ export function useDeleteClassMutation(): UseMutationReturnType<ClassResponse, E
     });
 }
 
-export function useUpdateClassMutation(): UseMutationReturnType<ClassResponse, Error, ClassDTO, unknown> {
+export function useUpdateClassMutation(): UseMutationReturnType<ClassResponse, Error, {cid: string, data: Partial<ClassDTO>}, unknown> {
     const queryClient = useQueryClient();
 
     return useMutation({
-        mutationFn: async (data) => classController.updateClass(data.id, data),
+        mutationFn: async ({ cid, data }) => classController.updateClass(cid, data),
         onSuccess: async (data) => {
             await invalidateAllClassKeys(queryClient, data.class.id);
             await invalidateAllAssignmentKeys(queryClient, data.class.id);
diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index 37270953..dbe4bcd7 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -5,6 +5,8 @@ import type { SubmissionsResponse } from "@/controllers/submissions";
 import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
 import { QueryClient, useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
+import { invalidateAllAssignmentKeys } from "./assignments";
+import { invalidateAllSubmissionKeys } from "./submissions";
 
 export function groupsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
     return [ "groups", classid, assignmentNumber, full ];
@@ -83,62 +85,48 @@ export function useGroupQuery(
     });
 }
 
-// TODO: find way to check if cid and an are not undefined.
-// depends on how this function is used.
-export function useCreateGroupMutation(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
-): UseMutationReturnType<GroupResponse, Error, GroupDTO, unknown> {
+export function useCreateGroupMutation(): UseMutationReturnType<GroupResponse, Error, {cid: string, an: number, data: GroupDTO}, unknown> {
     const queryClient = useQueryClient();
-    const { cid, an } = toValues(classid, assignmentNumber, 1, true);
 
     return useMutation({
-        mutationFn: async (data) => new GroupController(cid!, an!).createGroup(data),
-        onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, true) });
-            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, false) });
+        mutationFn: async ({ cid, an, data }) => new GroupController(cid, an).createGroup(data),
+        onSuccess: async (response) => {
+            const cid = typeof(response.group.class) === 'string' ? response.group.class : response.group.class.id;
+            const an = typeof(response.group.assignment) === 'number' ? response.group.assignment : response.group.assignment.id;
+
+            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid, an, true) });
+            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid, an, false) });
         },
     });
 }
 
-export function useDeleteGroupMutation(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
-): UseMutationReturnType<GroupResponse, Error, number, unknown> {
+export function useDeleteGroupMutation(): UseMutationReturnType<GroupResponse, Error, {cid: string, an: number, gn: number}, unknown> {
     const queryClient = useQueryClient();
-    const { cid, an, gn } = toValues(classid, assignmentNumber, 1, true);
 
     return useMutation({
-        mutationFn: async (id) => new GroupController(cid!, an!).deleteGroup(id),
-        onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: groupQueryKey(cid!, an!, gn!) });
+        mutationFn: async ({cid, an, gn}) => new GroupController(cid, an).deleteGroup(gn),
+        onSuccess: async (response) => {
+            const cid = typeof(response.group.class) === 'string' ? response.group.class : response.group.class.id;
+            const an = typeof(response.group.assignment) === 'number' ? response.group.assignment : response.group.assignment.id;
+            const gn = response.group.groupNumber;
 
-            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, true) });
-            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, false) });
-
-            await queryClient.invalidateQueries({ queryKey: groupSubmissionsQueryKey(cid!, an!, gn!, true) });
-            await queryClient.invalidateQueries({ queryKey: groupSubmissionsQueryKey(cid!, an!, gn!, false) });
-
-            await queryClient.invalidateQueries({ queryKey: groupQuestionsQueryKey(cid!, an!, gn!, true) });
-            await queryClient.invalidateQueries({ queryKey: groupQuestionsQueryKey(cid!, an!, gn!, false) });
+            await invalidateAllGroupKeys(queryClient, cid, an, gn);
+            await invalidateAllSubmissionKeys(queryClient, cid, an, gn);
         },
     });
 }
 
-export function useUpdateGroupMutation(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
-): UseMutationReturnType<GroupResponse, Error, GroupDTO, unknown> {
+export function useUpdateGroupMutation(): UseMutationReturnType<GroupResponse, Error, {cid: string, an: number, gn: number, data: Partial<GroupDTO>}, unknown> {
     const queryClient = useQueryClient();
-    const { cid, an, gn } = toValues(classid, assignmentNumber, 1, true);
 
     return useMutation({
-        mutationFn: async (data) => new GroupController(cid!, an!).updateGroup(gn!, data),
-        onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: groupQueryKey(cid!, an!, gn!) });
+        mutationFn: async ({cid, an, gn, data}) => new GroupController(cid, an).updateGroup(gn, data),
+        onSuccess: async (response) => {
+            const cid = typeof(response.group.class) === 'string' ? response.group.class : response.group.class.id;
+            const an = typeof(response.group.assignment) === 'number' ? response.group.assignment : response.group.assignment.id;
+            const gn = response.group.groupNumber;
 
-            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, true) });
-            await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid!, an!, false) });
+            await invalidateAllGroupKeys(queryClient, cid, an, gn);
         },
     });
 }

From 67b60cadedee4a6576e4805c0d78e80e3a195d3c Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 13 Apr 2025 14:55:18 +0200
Subject: [PATCH 157/177] fix/refactor: submission query argumenten
 gerefactord, cache keys gefixt

---
 frontend/src/queries/submissions.ts | 54 +++++++++++++++++------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/frontend/src/queries/submissions.ts b/frontend/src/queries/submissions.ts
index 5b8d5691..743b1d09 100644
--- a/frontend/src/queries/submissions.ts
+++ b/frontend/src/queries/submissions.ts
@@ -27,6 +27,8 @@ export async function invalidateAllSubmissionKeys(
     }
 
     await queryClient.invalidateQueries({ queryKey: [ "submissions", classid, assignmentNumber, groupNumber ].filter(arg => arg !== undefined) });
+    await queryClient.invalidateQueries({ queryKey: [ "group-submissions", classid, assignmentNumber, groupNumber ].filter(arg => arg !== undefined) });
+    await queryClient.invalidateQueries({ queryKey: [ "assignment-submissions", classid, assignmentNumber ].filter(arg => arg !== undefined) });
 }
 
 function checkEnabled(
@@ -85,38 +87,46 @@ export function useSubmissionQuery(
     });
 }
 
-// TODO: find way to check if cid and an are not undefined.
-// depends on how this function is used.
-export function useCreateSubmissionMutation(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
-    groupNumber: MaybeRefOrGetter<number | undefined>, 
-): UseMutationReturnType<SubmissionResponse, Error, SubmissionDTO, unknown> {
+export function useCreateSubmissionMutation(): UseMutationReturnType<SubmissionResponse, Error, {cid: string, an: number, gn: number, data: SubmissionDTO}, unknown> {
     const queryClient = useQueryClient();
-    const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber, 1, true);
 
     return useMutation({
-        mutationFn: async (data) => new SubmissionController(cid!, an!, gn!).createSubmission(data),
-        onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, gn!, true) });
-            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, gn!, false) });
+        mutationFn: async ({cid, an, gn, data}) => new SubmissionController(cid, an, gn).createSubmission(data),
+        onSuccess: async (response) => {
+            if (!response.submission.group) {
+                await invalidateAllSubmissionKeys(queryClient);
+            } else {
+                const cls = response.submission.group.class;
+                const assignment = response.submission.group.assignment;
+                
+                const cid = typeof(cls) === 'string' ? cls : cls.id;
+                const an = typeof(assignment) === 'number' ? assignment : assignment.id;
+                const gn = response.submission.group.groupNumber;
+
+                await invalidateAllSubmissionKeys(queryClient, cid, an, gn);
+            }
         },
     });
 }
 
-export function useDeleteGroupMutation(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
-    groupNumber: MaybeRefOrGetter<number | undefined>, 
-): UseMutationReturnType<SubmissionResponse, Error, number, unknown> {
+export function useDeleteSubmissionMutation(): UseMutationReturnType<SubmissionResponse, Error, {cid: string, an: number, gn: number, sn: number}, unknown> {
     const queryClient = useQueryClient();
-    const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber, 1, true);
 
     return useMutation({
-        mutationFn: async (id) => new SubmissionController(cid!, an!, gn!).deleteSubmission(id),
-        onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, gn!, true) });
-            await queryClient.invalidateQueries({ queryKey: submissionsQueryKey(cid!, an!, gn!, false) });
+        mutationFn: async ({cid, an, gn, sn}) => new SubmissionController(cid, an, gn).deleteSubmission(sn),
+        onSuccess: async (response) => {
+            if (!response.submission.group) {
+                await invalidateAllSubmissionKeys(queryClient);
+            } else {
+                const cls = response.submission.group.class;
+                const assignment = response.submission.group.assignment;
+                
+                const cid = typeof(cls) === 'string' ? cls : cls.id;
+                const an = typeof(assignment) === 'number' ? assignment : assignment.id;
+                const gn = response.submission.group.groupNumber;
+
+                await invalidateAllSubmissionKeys(queryClient, cid, an, gn);
+            }
         },
     });
 }
\ No newline at end of file

From 8fde49c05123d7f4e65d067800e61bccdfc784e5 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Sun, 13 Apr 2025 13:00:05 +0000
Subject: [PATCH 158/177] style: fix linting issues met ESLint

---
 frontend/src/queries/assignments.ts |  2 +-
 frontend/src/queries/classes.ts     | 10 +++++-----
 frontend/src/queries/groups.ts      |  2 +-
 frontend/src/queries/submissions.ts |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/queries/assignments.ts b/frontend/src/queries/assignments.ts
index ddfe0bc4..8dd2912b 100644
--- a/frontend/src/queries/assignments.ts
+++ b/frontend/src/queries/assignments.ts
@@ -29,7 +29,7 @@ export async function invalidateAllAssignmentKeys(queryClient: QueryClient, clas
         "assignment-questions",
     ];
 
-    for (let key of keys) {
+    for (const key of keys) {
         const queryKey = [key, classid, assignmentNumber].filter(arg => arg !== undefined);
         await queryClient.invalidateQueries({ queryKey: queryKey });
     }
diff --git a/frontend/src/queries/classes.ts b/frontend/src/queries/classes.ts
index 66be4acf..e4ecfcb1 100644
--- a/frontend/src/queries/classes.ts
+++ b/frontend/src/queries/classes.ts
@@ -38,7 +38,7 @@ export async function invalidateAllClassKeys(queryClient: QueryClient, classid?:
         "class-assignments",
     ];
 
-    for (let key of keys) {
+    for (const key of keys) {
         const queryKey = [key, classid].filter(arg => arg !== undefined);
         await queryClient.invalidateQueries({ queryKey: queryKey });
     }
@@ -109,7 +109,7 @@ export function useClassStudentsQuery(
 ): UseQueryReturnType<StudentsResponse, Error> {
     return useQuery({
         queryKey: computed(() => classStudentsKey(toValue(id)!, toValue(full))),
-        queryFn: async () => classController.getStudents(toValue(id)!, toValue(full)!),
+        queryFn: async () => classController.getStudents(toValue(id)!, toValue(full)),
         enabled: () => Boolean(toValue(id)),
     })
 }
@@ -146,7 +146,7 @@ export function useClassTeachersQuery(
 ): UseQueryReturnType<StudentsResponse, Error> {
     return useQuery({
         queryKey: computed(() => classTeachersKey(toValue(id)!, toValue(full))),
-        queryFn: async () => classController.getTeachers(toValue(id)!, toValue(full)!),
+        queryFn: async () => classController.getTeachers(toValue(id)!, toValue(full)),
         enabled: () => Boolean(toValue(id)),
     });
 }
@@ -183,7 +183,7 @@ export function useClassTeacherInvitationsQuery(
 ): UseQueryReturnType<StudentsResponse, Error> {
     return useQuery({
         queryKey: computed(() => classTeacherInvitationsKey(toValue(id)!, toValue(full))),
-        queryFn: async () => classController.getTeacherInvitations(toValue(id)!, toValue(full)!),
+        queryFn: async () => classController.getTeacherInvitations(toValue(id)!, toValue(full)),
         enabled: () => Boolean(toValue(id)),
     });
 }
@@ -194,7 +194,7 @@ export function useClassAssignmentsQuery(
 ): UseQueryReturnType<StudentsResponse, Error> {
     return useQuery({
         queryKey: computed(() => classAssignmentsKey(toValue(id)!, toValue(full))),
-        queryFn: async () => classController.getAssignments(toValue(id)!, toValue(full)!),
+        queryFn: async () => classController.getAssignments(toValue(id)!, toValue(full)),
         enabled: () => Boolean(toValue(id)),
     });
 }
\ No newline at end of file
diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index dbe4bcd7..7ed67cbc 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -33,7 +33,7 @@ export async function invalidateAllGroupKeys(
         "group-questions",
     ];
 
-    for (let key of keys) {
+    for (const key of keys) {
         const queryKey = [key, classid, assignmentNumber, groupNumber].filter(arg => arg !== undefined);
         await queryClient.invalidateQueries({ queryKey: queryKey });
     }
diff --git a/frontend/src/queries/submissions.ts b/frontend/src/queries/submissions.ts
index 743b1d09..5360afaf 100644
--- a/frontend/src/queries/submissions.ts
+++ b/frontend/src/queries/submissions.ts
@@ -21,7 +21,7 @@ export async function invalidateAllSubmissionKeys(
         "submission",
     ];
 
-    for (let key of keys) {
+    for (const key of keys) {
         const queryKey = [key, classid, assignmentNumber, groupNumber, submissionNumber].filter(arg => arg !== undefined);
         await queryClient.invalidateQueries({ queryKey: queryKey });
     }

From 49c468d431e42e1dcda6f7fc415d5d16f9b5d6cf Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Sun, 13 Apr 2025 13:00:10 +0000
Subject: [PATCH 159/177] style: fix linting issues met Prettier

---
 frontend/src/queries/assignments.ts |  89 +++++++++++++---------
 frontend/src/queries/classes.ts     |  76 ++++++++++++-------
 frontend/src/queries/groups.ts      | 107 ++++++++++++++++----------
 frontend/src/queries/submissions.ts | 113 +++++++++++++++++-----------
 4 files changed, 242 insertions(+), 143 deletions(-)

diff --git a/frontend/src/queries/assignments.ts b/frontend/src/queries/assignments.ts
index 8dd2912b..3251836a 100644
--- a/frontend/src/queries/assignments.ts
+++ b/frontend/src/queries/assignments.ts
@@ -1,7 +1,13 @@
 import { AssignmentController, type AssignmentResponse, type AssignmentsResponse } from "@/controllers/assignments";
 import type { QuestionsResponse } from "@/controllers/questions";
 import type { SubmissionsResponse } from "@/controllers/submissions";
-import { useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
+import {
+    useMutation,
+    useQuery,
+    useQueryClient,
+    type UseMutationReturnType,
+    type UseQueryReturnType,
+} from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 import { groupsQueryKey, invalidateAllGroupKeys } from "./groups";
 import type { GroupsResponse } from "@/controllers/groups";
@@ -10,43 +16,43 @@ import type { QueryClient } from "@tanstack/react-query";
 import { invalidateAllSubmissionKeys } from "./submissions";
 
 function assignmentsQueryKey(classid: string, full: boolean) {
-    return [ "assignments", classid, full ];
+    return ["assignments", classid, full];
 }
 function assignmentQueryKey(classid: string, assignmentNumber: number) {
-    return [ "assignment", classid, assignmentNumber ];
+    return ["assignment", classid, assignmentNumber];
 }
 function assignmentSubmissionsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
-    return [ "assignment-submissions", classid, assignmentNumber, full ];
+    return ["assignment-submissions", classid, assignmentNumber, full];
 }
 function assignmentQuestionsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
-    return [ "assignment-questions", classid, assignmentNumber, full ];
+    return ["assignment-questions", classid, assignmentNumber, full];
 }
 
-export async function invalidateAllAssignmentKeys(queryClient: QueryClient, classid?: string, assignmentNumber?: number) {
-    const keys = [
-        "assignment",
-        "assignment-submissions",
-        "assignment-questions",
-    ];
+export async function invalidateAllAssignmentKeys(
+    queryClient: QueryClient,
+    classid?: string,
+    assignmentNumber?: number,
+) {
+    const keys = ["assignment", "assignment-submissions", "assignment-questions"];
 
     for (const key of keys) {
-        const queryKey = [key, classid, assignmentNumber].filter(arg => arg !== undefined);
+        const queryKey = [key, classid, assignmentNumber].filter((arg) => arg !== undefined);
         await queryClient.invalidateQueries({ queryKey: queryKey });
     }
 
-    await queryClient.invalidateQueries({ queryKey: [ "assignments", classid ].filter(arg => arg !== undefined) });
+    await queryClient.invalidateQueries({ queryKey: ["assignments", classid].filter((arg) => arg !== undefined) });
 }
 
 function checkEnabled(
-    classid: string | undefined, 
-    assignmentNumber: number | undefined, 
+    classid: string | undefined,
+    assignmentNumber: number | undefined,
     groupNumber: number | undefined,
 ): boolean {
-    return  Boolean(classid) && !isNaN(Number(groupNumber)) && !isNaN(Number(assignmentNumber));
+    return Boolean(classid) && !isNaN(Number(groupNumber)) && !isNaN(Number(assignmentNumber));
 }
 function toValues(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
+    assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean>,
 ) {
@@ -54,21 +60,21 @@ function toValues(
 }
 
 export function useAssignmentsQuery(
-    classid: MaybeRefOrGetter<string | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<AssignmentsResponse, Error> {
     const { cid, f } = toValues(classid, 1, 1, full);
 
     return useQuery({
-        queryKey: computed(() => (assignmentsQueryKey(cid!, f))),
+        queryKey: computed(() => assignmentsQueryKey(cid!, f)),
         queryFn: async () => new AssignmentController(cid!).getAll(f),
         enabled: () => checkEnabled(cid, 1, 1),
     });
 }
 
 export function useAssignmentQuery(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
+    assignmentNumber: MaybeRefOrGetter<number | undefined>,
 ): UseQueryReturnType<AssignmentsResponse, Error> {
     const { cid, an } = toValues(classid, assignmentNumber, 1, true);
 
@@ -79,18 +85,28 @@ export function useAssignmentQuery(
     });
 }
 
-export function useCreateAssignmentMutation(): UseMutationReturnType<AssignmentResponse, Error, {cid: string, data: AssignmentDTO}, unknown> {
+export function useCreateAssignmentMutation(): UseMutationReturnType<
+    AssignmentResponse,
+    Error,
+    { cid: string; data: AssignmentDTO },
+    unknown
+> {
     const queryClient = useQueryClient();
 
     return useMutation({
         mutationFn: async ({ cid, data }) => new AssignmentController(cid).createAssignment(data),
         onSuccess: async (_) => {
-            await queryClient.invalidateQueries({ queryKey: [ "assignments" ] });
+            await queryClient.invalidateQueries({ queryKey: ["assignments"] });
         },
     });
 }
 
-export function useDeleteAssignmentMutation(): UseMutationReturnType<AssignmentResponse, Error, {cid: string, an: number}, unknown> {
+export function useDeleteAssignmentMutation(): UseMutationReturnType<
+    AssignmentResponse,
+    Error,
+    { cid: string; an: number },
+    unknown
+> {
     const queryClient = useQueryClient();
 
     return useMutation({
@@ -106,7 +122,12 @@ export function useDeleteAssignmentMutation(): UseMutationReturnType<AssignmentR
     });
 }
 
-export function useUpdateAssignmentMutation(): UseMutationReturnType<AssignmentResponse, Error, {cid: string, an: number, data: Partial<AssignmentDTO>}, unknown> {
+export function useUpdateAssignmentMutation(): UseMutationReturnType<
+    AssignmentResponse,
+    Error,
+    { cid: string; an: number; data: Partial<AssignmentDTO> },
+    unknown
+> {
     const queryClient = useQueryClient();
 
     return useMutation({
@@ -116,14 +137,14 @@ export function useUpdateAssignmentMutation(): UseMutationReturnType<AssignmentR
             const an = response.assignment.id;
 
             await invalidateAllGroupKeys(queryClient, cid, an);
-            await queryClient.invalidateQueries({ queryKey: [ "assignments" ] });
+            await queryClient.invalidateQueries({ queryKey: ["assignments"] });
         },
     });
 }
 
 export function useAssignmentSubmissionsQuery(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
+    assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<SubmissionsResponse, Error> {
@@ -137,8 +158,8 @@ export function useAssignmentSubmissionsQuery(
 }
 
 export function useAssignmentQuestionsQuery(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
+    assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<QuestionsResponse, Error> {
@@ -152,8 +173,8 @@ export function useAssignmentQuestionsQuery(
 }
 
 export function useAssignmentGroupsQuery(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
+    assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<GroupsResponse, Error> {
@@ -164,4 +185,4 @@ export function useAssignmentGroupsQuery(
         queryFn: async () => new AssignmentController(cid!).getQuestions(gn!, f),
         enabled: () => checkEnabled(cid, an, gn),
     });
-}
\ No newline at end of file
+}
diff --git a/frontend/src/queries/classes.ts b/frontend/src/queries/classes.ts
index e4ecfcb1..68ba0127 100644
--- a/frontend/src/queries/classes.ts
+++ b/frontend/src/queries/classes.ts
@@ -1,7 +1,14 @@
 import { ClassController, type ClassesResponse, type ClassResponse } from "@/controllers/classes";
 import type { StudentsResponse } from "@/controllers/students";
 import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
-import { QueryClient, useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
+import {
+    QueryClient,
+    useMutation,
+    useQuery,
+    useQueryClient,
+    type UseMutationReturnType,
+    type UseQueryReturnType,
+} from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 import { invalidateAllAssignmentKeys } from "./assignments";
 import { invalidateAllGroupKeys } from "./groups";
@@ -30,33 +37,25 @@ function classAssignmentsKey(classid: string, full: boolean) {
 }
 
 export async function invalidateAllClassKeys(queryClient: QueryClient, classid?: string) {
-    const keys = [
-        "class",
-        "class-students",
-        "class-teachers",
-        "class-teacher-invitations",
-        "class-assignments",
-    ];
+    const keys = ["class", "class-students", "class-teachers", "class-teacher-invitations", "class-assignments"];
 
     for (const key of keys) {
-        const queryKey = [key, classid].filter(arg => arg !== undefined);
+        const queryKey = [key, classid].filter((arg) => arg !== undefined);
         await queryClient.invalidateQueries({ queryKey: queryKey });
     }
 
-    await queryClient.invalidateQueries({ queryKey: [ "classes" ] });
+    await queryClient.invalidateQueries({ queryKey: ["classes"] });
 }
 
 /* Queries */
 export function useClassesQuery(full: MaybeRefOrGetter<boolean> = true): UseQueryReturnType<ClassesResponse, Error> {
     return useQuery({
-        queryKey: computed(() => (classesQueryKey(toValue(full)))),
+        queryKey: computed(() => classesQueryKey(toValue(full))),
         queryFn: async () => classController.getAll(toValue(full)),
     });
 }
 
-export function useClassQuery(
-    id: MaybeRefOrGetter<string | undefined>,
-): UseQueryReturnType<ClassResponse, Error> {
+export function useClassQuery(id: MaybeRefOrGetter<string | undefined>): UseQueryReturnType<ClassResponse, Error> {
     return useQuery({
         queryKey: computed(() => classQueryKey(toValue(id)!)),
         queryFn: async () => classController.getById(toValue(id)!),
@@ -70,7 +69,7 @@ export function useCreateClassMutation(): UseMutationReturnType<ClassResponse, E
     return useMutation({
         mutationFn: async (data) => classController.createClass(data),
         onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: [ "classes" ] });
+            await queryClient.invalidateQueries({ queryKey: ["classes"] });
         },
     });
 }
@@ -89,7 +88,12 @@ export function useDeleteClassMutation(): UseMutationReturnType<ClassResponse, E
     });
 }
 
-export function useUpdateClassMutation(): UseMutationReturnType<ClassResponse, Error, {cid: string, data: Partial<ClassDTO>}, unknown> {
+export function useUpdateClassMutation(): UseMutationReturnType<
+    ClassResponse,
+    Error,
+    { cid: string; data: Partial<ClassDTO> },
+    unknown
+> {
     const queryClient = useQueryClient();
 
     return useMutation({
@@ -105,16 +109,21 @@ export function useUpdateClassMutation(): UseMutationReturnType<ClassResponse, E
 
 export function useClassStudentsQuery(
     id: MaybeRefOrGetter<string | undefined>,
-    full: MaybeRefOrGetter<boolean> = true
+    full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<StudentsResponse, Error> {
     return useQuery({
         queryKey: computed(() => classStudentsKey(toValue(id)!, toValue(full))),
         queryFn: async () => classController.getStudents(toValue(id)!, toValue(full)),
         enabled: () => Boolean(toValue(id)),
-    })
+    });
 }
 
-export function useClassAddStudentMutation(): UseMutationReturnType<ClassResponse, Error, {id: string, username: string}, unknown> {
+export function useClassAddStudentMutation(): UseMutationReturnType<
+    ClassResponse,
+    Error,
+    { id: string; username: string },
+    unknown
+> {
     const queryClient = useQueryClient();
 
     return useMutation({
@@ -127,7 +136,12 @@ export function useClassAddStudentMutation(): UseMutationReturnType<ClassRespons
     });
 }
 
-export function useClassDeleteStudentMutation(): UseMutationReturnType<ClassResponse, Error, {id: string, username: string}, unknown> {
+export function useClassDeleteStudentMutation(): UseMutationReturnType<
+    ClassResponse,
+    Error,
+    { id: string; username: string },
+    unknown
+> {
     const queryClient = useQueryClient();
 
     return useMutation({
@@ -142,7 +156,7 @@ export function useClassDeleteStudentMutation(): UseMutationReturnType<ClassResp
 
 export function useClassTeachersQuery(
     id: MaybeRefOrGetter<string | undefined>,
-    full: MaybeRefOrGetter<boolean> = true
+    full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<StudentsResponse, Error> {
     return useQuery({
         queryKey: computed(() => classTeachersKey(toValue(id)!, toValue(full))),
@@ -151,7 +165,12 @@ export function useClassTeachersQuery(
     });
 }
 
-export function useClassAddTeacherMutation(): UseMutationReturnType<ClassResponse, Error, {id: string, username: string}, unknown> {
+export function useClassAddTeacherMutation(): UseMutationReturnType<
+    ClassResponse,
+    Error,
+    { id: string; username: string },
+    unknown
+> {
     const queryClient = useQueryClient();
 
     return useMutation({
@@ -164,7 +183,12 @@ export function useClassAddTeacherMutation(): UseMutationReturnType<ClassRespons
     });
 }
 
-export function useClassDeleteTeacherMutation(): UseMutationReturnType<ClassResponse, Error, {id: string, username: string}, unknown> {
+export function useClassDeleteTeacherMutation(): UseMutationReturnType<
+    ClassResponse,
+    Error,
+    { id: string; username: string },
+    unknown
+> {
     const queryClient = useQueryClient();
 
     return useMutation({
@@ -179,7 +203,7 @@ export function useClassDeleteTeacherMutation(): UseMutationReturnType<ClassResp
 
 export function useClassTeacherInvitationsQuery(
     id: MaybeRefOrGetter<string | undefined>,
-    full: MaybeRefOrGetter<boolean> = true
+    full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<StudentsResponse, Error> {
     return useQuery({
         queryKey: computed(() => classTeacherInvitationsKey(toValue(id)!, toValue(full))),
@@ -190,11 +214,11 @@ export function useClassTeacherInvitationsQuery(
 
 export function useClassAssignmentsQuery(
     id: MaybeRefOrGetter<string | undefined>,
-    full: MaybeRefOrGetter<boolean> = true
+    full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<StudentsResponse, Error> {
     return useQuery({
         queryKey: computed(() => classAssignmentsKey(toValue(id)!, toValue(full))),
         queryFn: async () => classController.getAssignments(toValue(id)!, toValue(full)),
         enabled: () => Boolean(toValue(id)),
     });
-}
\ No newline at end of file
+}
diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index 7ed67cbc..cdef2899 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -3,54 +3,59 @@ import { GroupController, type GroupResponse, type GroupsResponse } from "@/cont
 import type { QuestionsResponse } from "@/controllers/questions";
 import type { SubmissionsResponse } from "@/controllers/submissions";
 import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
-import { QueryClient, useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
+import {
+    QueryClient,
+    useMutation,
+    useQuery,
+    useQueryClient,
+    type UseMutationReturnType,
+    type UseQueryReturnType,
+} from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 import { invalidateAllAssignmentKeys } from "./assignments";
 import { invalidateAllSubmissionKeys } from "./submissions";
 
 export function groupsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
-    return [ "groups", classid, assignmentNumber, full ];
+    return ["groups", classid, assignmentNumber, full];
 }
 function groupQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
-    return [ "group", classid, assignmentNumber, groupNumber ];
+    return ["group", classid, assignmentNumber, groupNumber];
 }
 function groupSubmissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
-    return [ "group-submissions", classid, assignmentNumber, groupNumber, full ];
+    return ["group-submissions", classid, assignmentNumber, groupNumber, full];
 }
 function groupQuestionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
-    return [ "group-questions", classid, assignmentNumber, groupNumber, full ];
+    return ["group-questions", classid, assignmentNumber, groupNumber, full];
 }
 
 export async function invalidateAllGroupKeys(
-    queryClient: QueryClient, 
-    classid?: string, 
+    queryClient: QueryClient,
+    classid?: string,
     assignmentNumber?: number,
     groupNumber?: number,
 ) {
-    const keys = [
-        "group",
-        "group-submissions",
-        "group-questions",
-    ];
+    const keys = ["group", "group-submissions", "group-questions"];
 
     for (const key of keys) {
-        const queryKey = [key, classid, assignmentNumber, groupNumber].filter(arg => arg !== undefined);
+        const queryKey = [key, classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined);
         await queryClient.invalidateQueries({ queryKey: queryKey });
     }
 
-    await queryClient.invalidateQueries({ queryKey: [ "groups", classid, assignmentNumber ].filter(arg => arg !== undefined) });
+    await queryClient.invalidateQueries({
+        queryKey: ["groups", classid, assignmentNumber].filter((arg) => arg !== undefined),
+    });
 }
 
 function checkEnabled(
-    classid: string | undefined, 
-    assignmentNumber: number | undefined, 
+    classid: string | undefined,
+    assignmentNumber: number | undefined,
     groupNumber: number | undefined,
 ): boolean {
-    return  Boolean(classid) && !isNaN(Number(groupNumber)) && !isNaN(Number(assignmentNumber));
+    return Boolean(classid) && !isNaN(Number(groupNumber)) && !isNaN(Number(assignmentNumber));
 }
 function toValues(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
+    assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean>,
 ) {
@@ -58,22 +63,22 @@ function toValues(
 }
 
 export function useGroupsQuery(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
+    assignmentNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<GroupsResponse, Error> {
     const { cid, an, f } = toValues(classid, assignmentNumber, 1, full);
 
     return useQuery({
-        queryKey: computed(() => (groupsQueryKey(cid!, an!, f))),
+        queryKey: computed(() => groupsQueryKey(cid!, an!, f)),
         queryFn: async () => new GroupController(cid!, an!).getAll(f),
         enabled: () => checkEnabled(cid, an, 1),
     });
 }
 
 export function useGroupQuery(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
+    assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
 ): UseQueryReturnType<GroupResponse, Error> {
     const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber, true);
@@ -85,14 +90,22 @@ export function useGroupQuery(
     });
 }
 
-export function useCreateGroupMutation(): UseMutationReturnType<GroupResponse, Error, {cid: string, an: number, data: GroupDTO}, unknown> {
+export function useCreateGroupMutation(): UseMutationReturnType<
+    GroupResponse,
+    Error,
+    { cid: string; an: number; data: GroupDTO },
+    unknown
+> {
     const queryClient = useQueryClient();
 
     return useMutation({
         mutationFn: async ({ cid, an, data }) => new GroupController(cid, an).createGroup(data),
         onSuccess: async (response) => {
-            const cid = typeof(response.group.class) === 'string' ? response.group.class : response.group.class.id;
-            const an = typeof(response.group.assignment) === 'number' ? response.group.assignment : response.group.assignment.id;
+            const cid = typeof response.group.class === "string" ? response.group.class : response.group.class.id;
+            const an =
+                typeof response.group.assignment === "number"
+                    ? response.group.assignment
+                    : response.group.assignment.id;
 
             await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid, an, true) });
             await queryClient.invalidateQueries({ queryKey: groupsQueryKey(cid, an, false) });
@@ -100,14 +113,22 @@ export function useCreateGroupMutation(): UseMutationReturnType<GroupResponse, E
     });
 }
 
-export function useDeleteGroupMutation(): UseMutationReturnType<GroupResponse, Error, {cid: string, an: number, gn: number}, unknown> {
+export function useDeleteGroupMutation(): UseMutationReturnType<
+    GroupResponse,
+    Error,
+    { cid: string; an: number; gn: number },
+    unknown
+> {
     const queryClient = useQueryClient();
 
     return useMutation({
-        mutationFn: async ({cid, an, gn}) => new GroupController(cid, an).deleteGroup(gn),
+        mutationFn: async ({ cid, an, gn }) => new GroupController(cid, an).deleteGroup(gn),
         onSuccess: async (response) => {
-            const cid = typeof(response.group.class) === 'string' ? response.group.class : response.group.class.id;
-            const an = typeof(response.group.assignment) === 'number' ? response.group.assignment : response.group.assignment.id;
+            const cid = typeof response.group.class === "string" ? response.group.class : response.group.class.id;
+            const an =
+                typeof response.group.assignment === "number"
+                    ? response.group.assignment
+                    : response.group.assignment.id;
             const gn = response.group.groupNumber;
 
             await invalidateAllGroupKeys(queryClient, cid, an, gn);
@@ -116,14 +137,22 @@ export function useDeleteGroupMutation(): UseMutationReturnType<GroupResponse, E
     });
 }
 
-export function useUpdateGroupMutation(): UseMutationReturnType<GroupResponse, Error, {cid: string, an: number, gn: number, data: Partial<GroupDTO>}, unknown> {
+export function useUpdateGroupMutation(): UseMutationReturnType<
+    GroupResponse,
+    Error,
+    { cid: string; an: number; gn: number; data: Partial<GroupDTO> },
+    unknown
+> {
     const queryClient = useQueryClient();
 
     return useMutation({
-        mutationFn: async ({cid, an, gn, data}) => new GroupController(cid, an).updateGroup(gn, data),
+        mutationFn: async ({ cid, an, gn, data }) => new GroupController(cid, an).updateGroup(gn, data),
         onSuccess: async (response) => {
-            const cid = typeof(response.group.class) === 'string' ? response.group.class : response.group.class.id;
-            const an = typeof(response.group.assignment) === 'number' ? response.group.assignment : response.group.assignment.id;
+            const cid = typeof response.group.class === "string" ? response.group.class : response.group.class.id;
+            const an =
+                typeof response.group.assignment === "number"
+                    ? response.group.assignment
+                    : response.group.assignment.id;
             const gn = response.group.groupNumber;
 
             await invalidateAllGroupKeys(queryClient, cid, an, gn);
@@ -132,8 +161,8 @@ export function useUpdateGroupMutation(): UseMutationReturnType<GroupResponse, E
 }
 
 export function useGroupSubmissionsQuery(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
+    assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<SubmissionsResponse, Error> {
@@ -147,8 +176,8 @@ export function useGroupSubmissionsQuery(
 }
 
 export function useGroupQuestionsQuery(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
+    assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<QuestionsResponse, Error> {
diff --git a/frontend/src/queries/submissions.ts b/frontend/src/queries/submissions.ts
index 5360afaf..97effd15 100644
--- a/frontend/src/queries/submissions.ts
+++ b/frontend/src/queries/submissions.ts
@@ -1,81 +1,96 @@
 import { SubmissionController, type SubmissionResponse, type SubmissionsResponse } from "@/controllers/submissions";
 import type { SubmissionDTO } from "@dwengo-1/common/interfaces/submission";
-import { QueryClient, useMutation, useQuery, useQueryClient, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
+import {
+    QueryClient,
+    useMutation,
+    useQuery,
+    useQueryClient,
+    type UseMutationReturnType,
+    type UseQueryReturnType,
+} from "@tanstack/vue-query";
 import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
 function submissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
-    return [ "submissions", classid, assignmentNumber, groupNumber, full ];
+    return ["submissions", classid, assignmentNumber, groupNumber, full];
 }
 function submissionQueryKey(classid: string, assignmentNumber: number, groupNumber: number, submissionNumber: number) {
-    return [ "submission", classid, assignmentNumber, groupNumber, submissionNumber ];
+    return ["submission", classid, assignmentNumber, groupNumber, submissionNumber];
 }
 
 export async function invalidateAllSubmissionKeys(
-    queryClient: QueryClient, 
-    classid?: string, 
+    queryClient: QueryClient,
+    classid?: string,
     assignmentNumber?: number,
     groupNumber?: number,
     submissionNumber?: number,
 ) {
-    const keys = [
-        "submission",
-    ];
+    const keys = ["submission"];
 
     for (const key of keys) {
-        const queryKey = [key, classid, assignmentNumber, groupNumber, submissionNumber].filter(arg => arg !== undefined);
+        const queryKey = [key, classid, assignmentNumber, groupNumber, submissionNumber].filter(
+            (arg) => arg !== undefined,
+        );
         await queryClient.invalidateQueries({ queryKey: queryKey });
     }
 
-    await queryClient.invalidateQueries({ queryKey: [ "submissions", classid, assignmentNumber, groupNumber ].filter(arg => arg !== undefined) });
-    await queryClient.invalidateQueries({ queryKey: [ "group-submissions", classid, assignmentNumber, groupNumber ].filter(arg => arg !== undefined) });
-    await queryClient.invalidateQueries({ queryKey: [ "assignment-submissions", classid, assignmentNumber ].filter(arg => arg !== undefined) });
+    await queryClient.invalidateQueries({
+        queryKey: ["submissions", classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined),
+    });
+    await queryClient.invalidateQueries({
+        queryKey: ["group-submissions", classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined),
+    });
+    await queryClient.invalidateQueries({
+        queryKey: ["assignment-submissions", classid, assignmentNumber].filter((arg) => arg !== undefined),
+    });
 }
 
 function checkEnabled(
-    classid: string | undefined, 
-    assignmentNumber: number | undefined, 
+    classid: string | undefined,
+    assignmentNumber: number | undefined,
     groupNumber: number | undefined,
-    submissionNumber: number | undefined
+    submissionNumber: number | undefined,
 ): boolean {
-    return  Boolean(classid) 
-        && !isNaN(Number(groupNumber)) 
-        && !isNaN(Number(assignmentNumber))
-        && !isNaN(Number(submissionNumber));
+    return (
+        Boolean(classid) &&
+        !isNaN(Number(groupNumber)) &&
+        !isNaN(Number(assignmentNumber)) &&
+        !isNaN(Number(submissionNumber))
+    );
 }
 function toValues(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
+    assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
     submissionNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean>,
 ) {
-    return { 
-        cid: toValue(classid), 
-        an: toValue(assignmentNumber), 
-        gn: toValue(groupNumber), 
-        sn: toValue(submissionNumber), 
-        f: toValue(full) 
+    return {
+        cid: toValue(classid),
+        an: toValue(assignmentNumber),
+        gn: toValue(groupNumber),
+        sn: toValue(submissionNumber),
+        f: toValue(full),
     };
 }
 
 export function useSubmissionsQuery(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
-    groupNumber: MaybeRefOrGetter<number | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
+    assignmentNumber: MaybeRefOrGetter<number | undefined>,
+    groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean> = true,
 ): UseQueryReturnType<SubmissionsResponse, Error> {
     const { cid, an, gn, sn, f } = toValues(classid, assignmentNumber, groupNumber, 1, full);
 
     return useQuery({
-        queryKey: computed(() => (submissionsQueryKey(cid!, an!, gn!, f))),
+        queryKey: computed(() => submissionsQueryKey(cid!, an!, gn!, f)),
         queryFn: async () => new SubmissionController(cid!, an!, gn!).getAll(f),
         enabled: () => checkEnabled(cid, an, gn, sn),
     });
 }
 
 export function useSubmissionQuery(
-    classid: MaybeRefOrGetter<string | undefined>, 
-    assignmentNumber: MaybeRefOrGetter<number | undefined>, 
+    classid: MaybeRefOrGetter<string | undefined>,
+    assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
 ): UseQueryReturnType<SubmissionResponse, Error> {
     const { cid, an, gn, sn, f } = toValues(classid, assignmentNumber, groupNumber, 1, true);
@@ -87,20 +102,25 @@ export function useSubmissionQuery(
     });
 }
 
-export function useCreateSubmissionMutation(): UseMutationReturnType<SubmissionResponse, Error, {cid: string, an: number, gn: number, data: SubmissionDTO}, unknown> {
+export function useCreateSubmissionMutation(): UseMutationReturnType<
+    SubmissionResponse,
+    Error,
+    { cid: string; an: number; gn: number; data: SubmissionDTO },
+    unknown
+> {
     const queryClient = useQueryClient();
 
     return useMutation({
-        mutationFn: async ({cid, an, gn, data}) => new SubmissionController(cid, an, gn).createSubmission(data),
+        mutationFn: async ({ cid, an, gn, data }) => new SubmissionController(cid, an, gn).createSubmission(data),
         onSuccess: async (response) => {
             if (!response.submission.group) {
                 await invalidateAllSubmissionKeys(queryClient);
             } else {
                 const cls = response.submission.group.class;
                 const assignment = response.submission.group.assignment;
-                
-                const cid = typeof(cls) === 'string' ? cls : cls.id;
-                const an = typeof(assignment) === 'number' ? assignment : assignment.id;
+
+                const cid = typeof cls === "string" ? cls : cls.id;
+                const an = typeof assignment === "number" ? assignment : assignment.id;
                 const gn = response.submission.group.groupNumber;
 
                 await invalidateAllSubmissionKeys(queryClient, cid, an, gn);
@@ -109,24 +129,29 @@ export function useCreateSubmissionMutation(): UseMutationReturnType<SubmissionR
     });
 }
 
-export function useDeleteSubmissionMutation(): UseMutationReturnType<SubmissionResponse, Error, {cid: string, an: number, gn: number, sn: number}, unknown> {
+export function useDeleteSubmissionMutation(): UseMutationReturnType<
+    SubmissionResponse,
+    Error,
+    { cid: string; an: number; gn: number; sn: number },
+    unknown
+> {
     const queryClient = useQueryClient();
 
     return useMutation({
-        mutationFn: async ({cid, an, gn, sn}) => new SubmissionController(cid, an, gn).deleteSubmission(sn),
+        mutationFn: async ({ cid, an, gn, sn }) => new SubmissionController(cid, an, gn).deleteSubmission(sn),
         onSuccess: async (response) => {
             if (!response.submission.group) {
                 await invalidateAllSubmissionKeys(queryClient);
             } else {
                 const cls = response.submission.group.class;
                 const assignment = response.submission.group.assignment;
-                
-                const cid = typeof(cls) === 'string' ? cls : cls.id;
-                const an = typeof(assignment) === 'number' ? assignment : assignment.id;
+
+                const cid = typeof cls === "string" ? cls : cls.id;
+                const an = typeof assignment === "number" ? assignment : assignment.id;
                 const gn = response.submission.group.groupNumber;
 
                 await invalidateAllSubmissionKeys(queryClient, cid, an, gn);
             }
         },
     });
-}
\ No newline at end of file
+}

From e995419227a9bad743ac90e80656ad3871a34abc Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 13 Apr 2025 15:01:22 +0200
Subject: [PATCH 160/177] fix: fixed linting error

---
 frontend/src/controllers/submissions.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/src/controllers/submissions.ts b/frontend/src/controllers/submissions.ts
index 1f281e62..0d9c73f0 100644
--- a/frontend/src/controllers/submissions.ts
+++ b/frontend/src/controllers/submissions.ts
@@ -14,10 +14,6 @@ export class SubmissionController extends BaseController {
         super(`class/${classid}/assignments/${assignmentNumber}/groups/${groupNumber}/submissions`);
     }
 
-    protected getBasePath(classid: string, assignmentNumber: number, groupNumber: number) {
-        return `class/${classid}/assignments/${assignmentNumber}/groups/${groupNumber}/submissions`;
-    }
-
     async getAll(full = true): Promise<SubmissionsResponse> {
         return this.get<SubmissionsResponse>(`/`, { full });
     }

From 834e991568fbcdc50eb5f5f138d433d644ca6309 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Sun, 13 Apr 2025 19:40:20 +0200
Subject: [PATCH 161/177] fix: invitation geeft enkel classId field terug

---
 backend/src/interfaces/teacher-invitation.ts  | 4 ++--
 backend/tests/setup-tests.ts                  | 8 ++++++--
 common/src/interfaces/teacher-invitation.ts   | 2 +-
 frontend/src/views/classes/TeacherClasses.vue | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/backend/src/interfaces/teacher-invitation.ts b/backend/src/interfaces/teacher-invitation.ts
index 98189938..bc2fd4af 100644
--- a/backend/src/interfaces/teacher-invitation.ts
+++ b/backend/src/interfaces/teacher-invitation.ts
@@ -10,7 +10,7 @@ export function mapToTeacherInvitationDTO(invitation: TeacherInvitation): Teache
     return {
         sender: mapToUserDTO(invitation.sender),
         receiver: mapToUserDTO(invitation.receiver),
-        class: mapToClassDTO(invitation.class),
+        classId: invitation.class.classId!,
     };
 }
 
@@ -18,7 +18,7 @@ export function mapToTeacherInvitationDTOIds(invitation: TeacherInvitation): Tea
     return {
         sender: invitation.sender.username,
         receiver: invitation.receiver.username,
-        class: invitation.class.classId!,
+        classId: invitation.class.classId!,
     };
 }
 
diff --git a/backend/tests/setup-tests.ts b/backend/tests/setup-tests.ts
index 5bd2fbd6..b666fbd2 100644
--- a/backend/tests/setup-tests.ts
+++ b/backend/tests/setup-tests.ts
@@ -13,6 +13,7 @@ import { makeTestAttachments } from './test_assets/content/attachments.testdata.
 import { makeTestQuestions } from './test_assets/questions/questions.testdata.js';
 import { makeTestAnswers } from './test_assets/questions/answers.testdata.js';
 import { makeTestSubmissions } from './test_assets/assignments/submission.testdata.js';
+import {Collection} from "@mikro-orm/core";
 
 export async function setupTestApp(): Promise<void> {
     dotenv.config({ path: '.env.test' });
@@ -28,8 +29,8 @@ export async function setupTestApp(): Promise<void> {
     const assignments = makeTestAssignemnts(em, classes);
     const groups = makeTestGroups(em, students, assignments);
 
-    assignments[0].groups = groups.slice(0, 3);
-    assignments[1].groups = groups.slice(3, 4);
+    assignments[0].groups = new Collection(groups.slice(0, 3));
+    assignments[1].groups = new Collection(groups.slice(3, 4));
 
     const teacherInvitations = makeTestTeacherInvitations(em, teachers, classes);
     const classJoinRequests = makeTestClassJoinRequests(em, students, classes);
@@ -41,6 +42,9 @@ export async function setupTestApp(): Promise<void> {
     const answers = makeTestAnswers(em, teachers, questions);
     const submissions = makeTestSubmissions(em, students, groups);
 
+    console.log("classes", classes);
+    console.log("invitations", teacherInvitations);
+
     await em.persistAndFlush([
         ...students,
         ...teachers,
diff --git a/common/src/interfaces/teacher-invitation.ts b/common/src/interfaces/teacher-invitation.ts
index c61f9a6a..c34f46f7 100644
--- a/common/src/interfaces/teacher-invitation.ts
+++ b/common/src/interfaces/teacher-invitation.ts
@@ -4,7 +4,7 @@ import { ClassDTO } from './class';
 export interface TeacherInvitationDTO {
     sender: string | UserDTO;
     receiver: string | UserDTO;
-    class: string | ClassDTO;
+    classId: string;
 }
 
 export interface TeacherInvitationData {
diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
index ae673d99..010cf2e2 100644
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -276,10 +276,10 @@
                 <tbody>
                     <tr
                         v-for="i in invitations"
-                        :key="(i.class as ClassDTO).id"
+                        :key="i.classId"
                     >
                         <td>
-                            {{ (i.class as ClassDTO).displayName }}
+                          {{ i.classId }} <!-- TODO fetch display name via classId because db only returns classId field -->
                         </td>
                         <td>{{ (i.sender as TeacherDTO).firstName + " " + (i.sender as TeacherDTO).lastName }}</td>
                         <td class="text-right">

From 17dc9649c5b4c4048586dd361cabc2049fd83118 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Sun, 13 Apr 2025 20:50:15 +0200
Subject: [PATCH 162/177] feat: controller + queries

---
 frontend/src/controllers/classes.ts           |  9 +--
 .../src/controllers/teacher-invitations.ts    | 28 ++++++++
 frontend/src/queries/teacher-invitations.ts   | 65 +++++++++++++++++++
 3 files changed, 94 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/controllers/teacher-invitations.ts
 create mode 100644 frontend/src/queries/teacher-invitations.ts

diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts
index 03e3f560..65a992a5 100644
--- a/frontend/src/controllers/classes.ts
+++ b/frontend/src/controllers/classes.ts
@@ -4,6 +4,7 @@ import type { StudentsResponse } from "./students";
 import type { AssignmentsResponse } from "./assignments";
 import type { TeacherInvitationDTO } from "@dwengo-1/common/interfaces/teacher-invitation";
 import type { TeachersResponse } from "@/controllers/teachers.ts";
+import type {TeacherInvitationsResponse} from "@/controllers/teacher-invitations.ts";
 
 export interface ClassesResponse {
     classes: ClassDTO[] | string[];
@@ -13,14 +14,6 @@ export interface ClassResponse {
     class: ClassDTO;
 }
 
-export interface TeacherInvitationsResponse {
-    invites: TeacherInvitationDTO[];
-}
-
-export interface TeacherInvitationResponse {
-    invite: TeacherInvitationDTO;
-}
-
 export class ClassController extends BaseController {
     constructor() {
         super("class");
diff --git a/frontend/src/controllers/teacher-invitations.ts b/frontend/src/controllers/teacher-invitations.ts
new file mode 100644
index 00000000..30201821
--- /dev/null
+++ b/frontend/src/controllers/teacher-invitations.ts
@@ -0,0 +1,28 @@
+import {BaseController} from "@/controllers/base-controller.ts";
+import type {TeacherInvitationData, TeacherInvitationDTO} from "@dwengo-1/common/interfaces/teacher-invitation";
+
+export interface TeacherInvitationsResponse {
+    invitations: TeacherInvitationDTO[]
+}
+
+export interface TeacherInvitationResponse {
+    invitation: TeacherInvitationDTO
+}
+
+export class TeacherInvitationController extends BaseController {
+    constructor() {
+        super("teachers/invitations");
+    }
+
+    async getAll(username: string, by: boolean): Promise<TeacherInvitationsResponse> {
+        return this.get<TeacherInvitationsResponse>(`/${username}`, { by });
+    }
+
+    async create(data: TeacherInvitationData): Promise<TeacherInvitationResponse> {
+        return this.post<TeacherInvitationResponse>("/", data);
+    }
+
+    async respond(data: TeacherInvitationData, accepted: boolean): Promise<TeacherInvitationResponse> {
+        return this.delete<TeacherInvitationResponse>(`/${data.sender}/${data.receiver}/${data.class}`, { accepted });
+    }
+}
diff --git a/frontend/src/queries/teacher-invitations.ts b/frontend/src/queries/teacher-invitations.ts
new file mode 100644
index 00000000..e0b1e957
--- /dev/null
+++ b/frontend/src/queries/teacher-invitations.ts
@@ -0,0 +1,65 @@
+import {
+    useMutation,
+    useQuery,
+    type UseMutationReturnType,
+    type UseQueryReturnType,
+} from "@tanstack/vue-query";
+import { computed, toValue } from "vue";
+import type { MaybeRefOrGetter } from "vue";
+import {
+    TeacherInvitationController,
+    type TeacherInvitationResponse,
+    type TeacherInvitationsResponse
+} from "@/controllers/teacher-invitations.ts";
+import type {TeacherInvitationData} from "@dwengo-1/common/dist/interfaces/teacher-invitation.ts";
+import type {TeacherDTO} from "@dwengo-1/common/dist/interfaces/teacher.ts";
+
+const controller = new TeacherInvitationController();
+
+/**
+    all the invitations the teacher send
+**/
+export function useTeacherInvitationsByQuery(username: MaybeRefOrGetter<string | undefined>
+): UseQueryReturnType<TeacherInvitationsResponse, Error> {
+    return useQuery({
+        queryFn: computed(() => controller.getAll(toValue(username), true)),
+        enabled: () => Boolean(toValue(username)),
+    })
+}
+
+/**
+    all the pending invitations send to this teacher
+ */
+export function useTeacherInvitationsForQuery(username: MaybeRefOrGetter<string | undefined>
+): UseQueryReturnType<TeacherInvitationsResponse, Error> {
+    return useQuery({
+        queryFn: computed(() => controller.getAll(toValue(username), false)),
+        enabled: () => Boolean(toValue(username)),
+    })
+}
+
+export function useCreateTeacherInvitationMutation(): UseMutationReturnType<TeacherInvitationResponse, Error, TeacherDTO, unknown>{
+    return useMutation({
+        mutationFn: async (data: TeacherInvitationData) => controller.create(data)
+    })
+}
+
+export function useAcceptTeacherInvitationMutation(): UseMutationReturnType<TeacherInvitationResponse, Error, TeacherDTO, unknown> {
+    return useMutation({
+        mutationFn: async (data: TeacherInvitationData) => controller.respond(data, true)
+    })
+}
+
+export function useDeclineTeacherInvitationMutation(): UseMutationReturnType<TeacherInvitationResponse, Error, TeacherDTO, unknown> {
+    return useMutation({
+        mutationFn: async (data: TeacherInvitationData) => controller.respond(data, false)
+    })
+}
+
+export function useDeleteTeacherInvitationMutation(): UseMutationReturnType<TeacherInvitationResponse, Error, TeacherDTO, unknown> {
+    return useMutation({
+        mutationFn: async (data: TeacherInvitationData) => controller.respond(data, false)
+    })
+}
+
+

From a824cdff9475d9fd4444d428080bdcd500f98f72 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Sun, 13 Apr 2025 20:54:05 +0200
Subject: [PATCH 163/177] fix: lint

---
 backend/src/interfaces/teacher-invitation.ts | 1 -
 backend/src/services/teacher-invitations.ts  | 2 +-
 backend/tests/setup-tests.ts                 | 3 ---
 common/src/interfaces/teacher-invitation.ts  | 1 -
 frontend/src/controllers/classes.ts          | 1 -
 frontend/src/queries/teacher-invitations.ts  | 8 ++++----
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/backend/src/interfaces/teacher-invitation.ts b/backend/src/interfaces/teacher-invitation.ts
index bc2fd4af..87741e3d 100644
--- a/backend/src/interfaces/teacher-invitation.ts
+++ b/backend/src/interfaces/teacher-invitation.ts
@@ -1,5 +1,4 @@
 import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity.js';
-import { mapToClassDTO } from './class.js';
 import { mapToUserDTO } from './user.js';
 import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
 import {getTeacherInvitationRepository} from "../data/repositories";
diff --git a/backend/src/services/teacher-invitations.ts b/backend/src/services/teacher-invitations.ts
index 1b9ef179..08886eb2 100644
--- a/backend/src/services/teacher-invitations.ts
+++ b/backend/src/services/teacher-invitations.ts
@@ -50,7 +50,7 @@ async function fetchInvitation(sender: Teacher, receiver: Teacher, cls: Class):
     return invite;
 }
 
-export async function deleteInvitationFor(usernameSender: string, usernameReceiver: string, classId: string, accepted: boolean) {
+export async function deleteInvitationFor(usernameSender: string, usernameReceiver: string, classId: string, accepted: boolean): Promise<TeacherInvitationDTO> {
     const teacherInvitationRepository = getTeacherInvitationRepository();
     const sender = await fetchTeacher(usernameSender);
     const receiver = await fetchTeacher(usernameReceiver);
diff --git a/backend/tests/setup-tests.ts b/backend/tests/setup-tests.ts
index b666fbd2..b0e5ef5b 100644
--- a/backend/tests/setup-tests.ts
+++ b/backend/tests/setup-tests.ts
@@ -42,9 +42,6 @@ export async function setupTestApp(): Promise<void> {
     const answers = makeTestAnswers(em, teachers, questions);
     const submissions = makeTestSubmissions(em, students, groups);
 
-    console.log("classes", classes);
-    console.log("invitations", teacherInvitations);
-
     await em.persistAndFlush([
         ...students,
         ...teachers,
diff --git a/common/src/interfaces/teacher-invitation.ts b/common/src/interfaces/teacher-invitation.ts
index c34f46f7..b952b051 100644
--- a/common/src/interfaces/teacher-invitation.ts
+++ b/common/src/interfaces/teacher-invitation.ts
@@ -1,5 +1,4 @@
 import { UserDTO } from './user';
-import { ClassDTO } from './class';
 
 export interface TeacherInvitationDTO {
     sender: string | UserDTO;
diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts
index 65a992a5..9020e166 100644
--- a/frontend/src/controllers/classes.ts
+++ b/frontend/src/controllers/classes.ts
@@ -2,7 +2,6 @@ import { BaseController } from "./base-controller";
 import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
 import type { StudentsResponse } from "./students";
 import type { AssignmentsResponse } from "./assignments";
-import type { TeacherInvitationDTO } from "@dwengo-1/common/interfaces/teacher-invitation";
 import type { TeachersResponse } from "@/controllers/teachers.ts";
 import type {TeacherInvitationsResponse} from "@/controllers/teacher-invitations.ts";
 
diff --git a/frontend/src/queries/teacher-invitations.ts b/frontend/src/queries/teacher-invitations.ts
index e0b1e957..4d9c5a52 100644
--- a/frontend/src/queries/teacher-invitations.ts
+++ b/frontend/src/queries/teacher-invitations.ts
@@ -17,23 +17,23 @@ import type {TeacherDTO} from "@dwengo-1/common/dist/interfaces/teacher.ts";
 const controller = new TeacherInvitationController();
 
 /**
-    all the invitations the teacher send
+    All the invitations the teacher send
 **/
 export function useTeacherInvitationsByQuery(username: MaybeRefOrGetter<string | undefined>
 ): UseQueryReturnType<TeacherInvitationsResponse, Error> {
     return useQuery({
-        queryFn: computed(() => controller.getAll(toValue(username), true)),
+        queryFn: computed(async () => controller.getAll(toValue(username), true)),
         enabled: () => Boolean(toValue(username)),
     })
 }
 
 /**
-    all the pending invitations send to this teacher
+    All the pending invitations send to this teacher
  */
 export function useTeacherInvitationsForQuery(username: MaybeRefOrGetter<string | undefined>
 ): UseQueryReturnType<TeacherInvitationsResponse, Error> {
     return useQuery({
-        queryFn: computed(() => controller.getAll(toValue(username), false)),
+        queryFn: computed(async () => controller.getAll(toValue(username), false)),
         enabled: () => Boolean(toValue(username)),
     })
 }

From 783c91b2e37e6cf9ad21a23ba82343811ee552e1 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Sun, 13 Apr 2025 18:59:56 +0000
Subject: [PATCH 164/177] style: fix linting issues met Prettier

---
 .../src/controllers/teacher-invitations.ts    |  6 +-
 .../classes/teacher-invitation-repository.ts  |  2 +-
 backend/src/interfaces/teacher-invitation.ts  | 10 +--
 backend/src/routes/teacher-invitations.ts     |  9 +--
 backend/src/services/teacher-invitations.ts   | 42 +++++------
 .../controllers/teacher-invitations.test.ts   | 52 +++++++-------
 backend/tests/setup-tests.ts                  |  2 +-
 frontend/src/controllers/classes.ts           |  2 +-
 .../src/controllers/teacher-invitations.ts    |  8 +--
 frontend/src/queries/teacher-invitations.ts   | 69 +++++++++++--------
 frontend/src/views/classes/TeacherClasses.vue |  3 +-
 11 files changed, 112 insertions(+), 93 deletions(-)

diff --git a/backend/src/controllers/teacher-invitations.ts b/backend/src/controllers/teacher-invitations.ts
index 15bfc936..b826dee3 100644
--- a/backend/src/controllers/teacher-invitations.ts
+++ b/backend/src/controllers/teacher-invitations.ts
@@ -1,7 +1,7 @@
 import { Request, Response } from 'express';
-import {requireFields} from "./error-helper";
-import {createInvitation, deleteInvitationFor, getAllInvitations} from "../services/teacher-invitations";
-import {TeacherInvitationData} from "@dwengo-1/common/interfaces/teacher-invitation";
+import { requireFields } from './error-helper';
+import { createInvitation, deleteInvitationFor, getAllInvitations } from '../services/teacher-invitations';
+import { TeacherInvitationData } from '@dwengo-1/common/interfaces/teacher-invitation';
 
 export async function getAllInvitationsHandler(req: Request, res: Response): Promise<void> {
     const username = req.params.username;
diff --git a/backend/src/data/classes/teacher-invitation-repository.ts b/backend/src/data/classes/teacher-invitation-repository.ts
index 5461d29b..69c0a972 100644
--- a/backend/src/data/classes/teacher-invitation-repository.ts
+++ b/backend/src/data/classes/teacher-invitation-repository.ts
@@ -25,6 +25,6 @@ export class TeacherInvitationRepository extends DwengoEntityRepository<TeacherI
             sender: sender,
             receiver: receiver,
             class: clazz,
-        })
+        });
     }
 }
diff --git a/backend/src/interfaces/teacher-invitation.ts b/backend/src/interfaces/teacher-invitation.ts
index 87741e3d..4d1284db 100644
--- a/backend/src/interfaces/teacher-invitation.ts
+++ b/backend/src/interfaces/teacher-invitation.ts
@@ -1,9 +1,9 @@
 import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity.js';
 import { mapToUserDTO } from './user.js';
 import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
-import {getTeacherInvitationRepository} from "../data/repositories";
-import {Teacher} from "../entities/users/teacher.entity";
-import {Class} from "../entities/classes/class.entity";
+import { getTeacherInvitationRepository } from '../data/repositories';
+import { Teacher } from '../entities/users/teacher.entity';
+import { Class } from '../entities/classes/class.entity';
 
 export function mapToTeacherInvitationDTO(invitation: TeacherInvitation): TeacherInvitationDTO {
     return {
@@ -23,6 +23,8 @@ export function mapToTeacherInvitationDTOIds(invitation: TeacherInvitation): Tea
 
 export function mapToInvitation(sender: Teacher, receiver: Teacher, cls: Class): TeacherInvitation {
     return getTeacherInvitationRepository().create({
-        sender, receiver, class: cls
+        sender,
+        receiver,
+        class: cls,
     });
 }
diff --git a/backend/src/routes/teacher-invitations.ts b/backend/src/routes/teacher-invitations.ts
index 01a18195..7af71fdc 100644
--- a/backend/src/routes/teacher-invitations.ts
+++ b/backend/src/routes/teacher-invitations.ts
@@ -1,9 +1,5 @@
-import express from "express";
-import {
-    createInvitationHandler,
-    deleteInvitationForHandler,
-    getAllInvitationsHandler
-} from "../controllers/teacher-invitations";
+import express from 'express';
+import { createInvitationHandler, deleteInvitationForHandler, getAllInvitationsHandler } from '../controllers/teacher-invitations';
 
 const router = express.Router({ mergeParams: true });
 
@@ -13,5 +9,4 @@ router.post('/', createInvitationHandler);
 
 router.delete('/:sender/:receiver/:classId', deleteInvitationForHandler);
 
-
 export default router;
diff --git a/backend/src/services/teacher-invitations.ts b/backend/src/services/teacher-invitations.ts
index 08886eb2..dc54d5e5 100644
--- a/backend/src/services/teacher-invitations.ts
+++ b/backend/src/services/teacher-invitations.ts
@@ -1,13 +1,13 @@
-import {fetchTeacher} from "./teachers";
-import {getTeacherInvitationRepository} from "../data/repositories";
-import {mapToInvitation, mapToTeacherInvitationDTO} from "../interfaces/teacher-invitation";
-import {addClassTeacher, fetchClass} from "./classes";
-import {TeacherInvitationData, TeacherInvitationDTO} from "@dwengo-1/common/interfaces/teacher-invitation";
-import {ConflictException} from "../exceptions/conflict-exception";
-import {Teacher} from "../entities/users/teacher.entity";
-import {Class} from "../entities/classes/class.entity";
-import {NotFoundException} from "../exceptions/not-found-exception";
-import {TeacherInvitation} from "../entities/classes/teacher-invitation.entity";
+import { fetchTeacher } from './teachers';
+import { getTeacherInvitationRepository } from '../data/repositories';
+import { mapToInvitation, mapToTeacherInvitationDTO } from '../interfaces/teacher-invitation';
+import { addClassTeacher, fetchClass } from './classes';
+import { TeacherInvitationData, TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
+import { ConflictException } from '../exceptions/conflict-exception';
+import { Teacher } from '../entities/users/teacher.entity';
+import { Class } from '../entities/classes/class.entity';
+import { NotFoundException } from '../exceptions/not-found-exception';
+import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity';
 
 export async function getAllInvitations(username: string, by: boolean): Promise<TeacherInvitationDTO[]> {
     const teacher = await fetchTeacher(username);
@@ -29,12 +29,12 @@ export async function createInvitation(data: TeacherInvitationData): Promise<Tea
 
     const cls = await fetchClass(data.class);
 
-    if (!cls.teachers.contains(sender)){
-        throw new ConflictException("The teacher sending the invite is not part of the class");
+    if (!cls.teachers.contains(sender)) {
+        throw new ConflictException('The teacher sending the invite is not part of the class');
     }
 
     const newInvitation = mapToInvitation(sender, receiver, cls);
-    await teacherInvitationRepository.save(newInvitation, {preventOverwrite: true});
+    await teacherInvitationRepository.save(newInvitation, { preventOverwrite: true });
 
     return mapToTeacherInvitationDTO(newInvitation);
 }
@@ -43,14 +43,19 @@ async function fetchInvitation(sender: Teacher, receiver: Teacher, cls: Class):
     const teacherInvitationRepository = getTeacherInvitationRepository();
     const invite = await teacherInvitationRepository.findBy(cls, sender, receiver);
 
-    if (!invite){
-        throw new NotFoundException("Teacher invite not found");
+    if (!invite) {
+        throw new NotFoundException('Teacher invite not found');
     }
 
     return invite;
 }
 
-export async function deleteInvitationFor(usernameSender: string, usernameReceiver: string, classId: string, accepted: boolean): Promise<TeacherInvitationDTO> {
+export async function deleteInvitationFor(
+    usernameSender: string,
+    usernameReceiver: string,
+    classId: string,
+    accepted: boolean
+): Promise<TeacherInvitationDTO> {
     const teacherInvitationRepository = getTeacherInvitationRepository();
     const sender = await fetchTeacher(usernameSender);
     const receiver = await fetchTeacher(usernameReceiver);
@@ -60,12 +65,9 @@ export async function deleteInvitationFor(usernameSender: string, usernameReceiv
     const invitation = await fetchInvitation(sender, receiver, cls);
     await teacherInvitationRepository.deleteBy(cls, sender, receiver);
 
-    if (accepted){
+    if (accepted) {
         await addClassTeacher(classId, usernameReceiver);
     }
 
     return mapToTeacherInvitationDTO(invitation);
 }
-
-
-
diff --git a/backend/tests/controllers/teacher-invitations.test.ts b/backend/tests/controllers/teacher-invitations.test.ts
index 8135281a..6f233898 100644
--- a/backend/tests/controllers/teacher-invitations.test.ts
+++ b/backend/tests/controllers/teacher-invitations.test.ts
@@ -1,13 +1,9 @@
 import { beforeAll, beforeEach, describe, expect, it, Mock, vi } from 'vitest';
 import { Request, Response } from 'express';
 import { setupTestApp } from '../setup-tests.js';
-import {
-    createInvitationHandler,
-    deleteInvitationForHandler,
-    getAllInvitationsHandler
-} from "../../src/controllers/teacher-invitations";
-import {TeacherInvitationData} from "@dwengo-1/common/interfaces/teacher-invitation";
-import {getClassHandler} from "../../src/controllers/classes";
+import { createInvitationHandler, deleteInvitationForHandler, getAllInvitationsHandler } from '../../src/controllers/teacher-invitations';
+import { TeacherInvitationData } from '@dwengo-1/common/interfaces/teacher-invitation';
+import { getClassHandler } from '../../src/controllers/classes';
 
 describe('Teacher controllers', () => {
     let req: Partial<Request>;
@@ -27,22 +23,22 @@ describe('Teacher controllers', () => {
     });
 
     it('Get teacher invitations by', async () => {
-        req = {params: {username: 'LimpBizkit'}, query: {by: 'true' }};
+        req = { params: { username: 'LimpBizkit' }, query: { by: 'true' } };
 
         await getAllInvitationsHandler(req as Request, res as Response);
 
-        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({invitations: expect.anything()}));
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ invitations: expect.anything() }));
 
         const result = jsonMock.mock.lastCall?.[0];
         expect(result.invitations).to.have.length.greaterThan(0);
     });
 
     it('Get teacher invitations for', async () => {
-        req = {params: {username: 'FooFighters'}, query: {by: 'false' }};
+        req = { params: { username: 'FooFighters' }, query: { by: 'false' } };
 
         await getAllInvitationsHandler(req as Request, res as Response);
 
-        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({invitations: expect.anything()}));
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ invitations: expect.anything() }));
 
         const result = jsonMock.mock.lastCall?.[0];
         expect(result.invitations).to.have.length.greaterThan(0);
@@ -50,8 +46,9 @@ describe('Teacher controllers', () => {
 
     it('Create and delete invitation', async () => {
         const body = {
-            sender: 'LimpBizkit', receiver: 'testleerkracht1',
-            class: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89'
+            sender: 'LimpBizkit',
+            receiver: 'testleerkracht1',
+            class: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89',
         } as TeacherInvitationData;
         req = { body };
 
@@ -59,9 +56,11 @@ describe('Teacher controllers', () => {
 
         req = {
             params: {
-            sender: 'LimpBizkit', receiver: 'testleerkracht1',
-                classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89'
-            }, body: { accepted: 'false' }
+                sender: 'LimpBizkit',
+                receiver: 'testleerkracht1',
+                classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89',
+            },
+            body: { accepted: 'false' },
         };
 
         await deleteInvitationForHandler(req as Request, res as Response);
@@ -69,8 +68,9 @@ describe('Teacher controllers', () => {
 
     it('Create and accept invitation', async () => {
         const body = {
-            sender: 'LimpBizkit', receiver: 'testleerkracht1',
-            class: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89'
+            sender: 'LimpBizkit',
+            receiver: 'testleerkracht1',
+            class: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89',
         } as TeacherInvitationData;
         req = { body };
 
@@ -78,16 +78,20 @@ describe('Teacher controllers', () => {
 
         req = {
             params: {
-                sender: 'LimpBizkit', receiver: 'testleerkracht1',
-                classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89'
-            }, body: { accepted: 'true' }
+                sender: 'LimpBizkit',
+                receiver: 'testleerkracht1',
+                classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89',
+            },
+            body: { accepted: 'true' },
         };
 
         await deleteInvitationForHandler(req as Request, res as Response);
 
-        req = {params: {
-            id: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89'
-        }};
+        req = {
+            params: {
+                id: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89',
+            },
+        };
 
         await getClassHandler(req as Request, res as Response);
 
diff --git a/backend/tests/setup-tests.ts b/backend/tests/setup-tests.ts
index b0e5ef5b..699e081b 100644
--- a/backend/tests/setup-tests.ts
+++ b/backend/tests/setup-tests.ts
@@ -13,7 +13,7 @@ import { makeTestAttachments } from './test_assets/content/attachments.testdata.
 import { makeTestQuestions } from './test_assets/questions/questions.testdata.js';
 import { makeTestAnswers } from './test_assets/questions/answers.testdata.js';
 import { makeTestSubmissions } from './test_assets/assignments/submission.testdata.js';
-import {Collection} from "@mikro-orm/core";
+import { Collection } from '@mikro-orm/core';
 
 export async function setupTestApp(): Promise<void> {
     dotenv.config({ path: '.env.test' });
diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts
index 9020e166..c9b7f6fa 100644
--- a/frontend/src/controllers/classes.ts
+++ b/frontend/src/controllers/classes.ts
@@ -3,7 +3,7 @@ import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
 import type { StudentsResponse } from "./students";
 import type { AssignmentsResponse } from "./assignments";
 import type { TeachersResponse } from "@/controllers/teachers.ts";
-import type {TeacherInvitationsResponse} from "@/controllers/teacher-invitations.ts";
+import type { TeacherInvitationsResponse } from "@/controllers/teacher-invitations.ts";
 
 export interface ClassesResponse {
     classes: ClassDTO[] | string[];
diff --git a/frontend/src/controllers/teacher-invitations.ts b/frontend/src/controllers/teacher-invitations.ts
index 30201821..a6e2045a 100644
--- a/frontend/src/controllers/teacher-invitations.ts
+++ b/frontend/src/controllers/teacher-invitations.ts
@@ -1,12 +1,12 @@
-import {BaseController} from "@/controllers/base-controller.ts";
-import type {TeacherInvitationData, TeacherInvitationDTO} from "@dwengo-1/common/interfaces/teacher-invitation";
+import { BaseController } from "@/controllers/base-controller.ts";
+import type { TeacherInvitationData, TeacherInvitationDTO } from "@dwengo-1/common/interfaces/teacher-invitation";
 
 export interface TeacherInvitationsResponse {
-    invitations: TeacherInvitationDTO[]
+    invitations: TeacherInvitationDTO[];
 }
 
 export interface TeacherInvitationResponse {
-    invitation: TeacherInvitationDTO
+    invitation: TeacherInvitationDTO;
 }
 
 export class TeacherInvitationController extends BaseController {
diff --git a/frontend/src/queries/teacher-invitations.ts b/frontend/src/queries/teacher-invitations.ts
index 4d9c5a52..a56ea9cd 100644
--- a/frontend/src/queries/teacher-invitations.ts
+++ b/frontend/src/queries/teacher-invitations.ts
@@ -1,65 +1,80 @@
-import {
-    useMutation,
-    useQuery,
-    type UseMutationReturnType,
-    type UseQueryReturnType,
-} from "@tanstack/vue-query";
+import { useMutation, useQuery, type UseMutationReturnType, type UseQueryReturnType } from "@tanstack/vue-query";
 import { computed, toValue } from "vue";
 import type { MaybeRefOrGetter } from "vue";
 import {
     TeacherInvitationController,
     type TeacherInvitationResponse,
-    type TeacherInvitationsResponse
+    type TeacherInvitationsResponse,
 } from "@/controllers/teacher-invitations.ts";
-import type {TeacherInvitationData} from "@dwengo-1/common/dist/interfaces/teacher-invitation.ts";
-import type {TeacherDTO} from "@dwengo-1/common/dist/interfaces/teacher.ts";
+import type { TeacherInvitationData } from "@dwengo-1/common/dist/interfaces/teacher-invitation.ts";
+import type { TeacherDTO } from "@dwengo-1/common/dist/interfaces/teacher.ts";
 
 const controller = new TeacherInvitationController();
 
 /**
     All the invitations the teacher send
 **/
-export function useTeacherInvitationsByQuery(username: MaybeRefOrGetter<string | undefined>
+export function useTeacherInvitationsByQuery(
+    username: MaybeRefOrGetter<string | undefined>,
 ): UseQueryReturnType<TeacherInvitationsResponse, Error> {
     return useQuery({
         queryFn: computed(async () => controller.getAll(toValue(username), true)),
         enabled: () => Boolean(toValue(username)),
-    })
+    });
 }
 
 /**
     All the pending invitations send to this teacher
  */
-export function useTeacherInvitationsForQuery(username: MaybeRefOrGetter<string | undefined>
+export function useTeacherInvitationsForQuery(
+    username: MaybeRefOrGetter<string | undefined>,
 ): UseQueryReturnType<TeacherInvitationsResponse, Error> {
     return useQuery({
         queryFn: computed(async () => controller.getAll(toValue(username), false)),
         enabled: () => Boolean(toValue(username)),
-    })
+    });
 }
 
-export function useCreateTeacherInvitationMutation(): UseMutationReturnType<TeacherInvitationResponse, Error, TeacherDTO, unknown>{
+export function useCreateTeacherInvitationMutation(): UseMutationReturnType<
+    TeacherInvitationResponse,
+    Error,
+    TeacherDTO,
+    unknown
+> {
     return useMutation({
-        mutationFn: async (data: TeacherInvitationData) => controller.create(data)
-    })
+        mutationFn: async (data: TeacherInvitationData) => controller.create(data),
+    });
 }
 
-export function useAcceptTeacherInvitationMutation(): UseMutationReturnType<TeacherInvitationResponse, Error, TeacherDTO, unknown> {
+export function useAcceptTeacherInvitationMutation(): UseMutationReturnType<
+    TeacherInvitationResponse,
+    Error,
+    TeacherDTO,
+    unknown
+> {
     return useMutation({
-        mutationFn: async (data: TeacherInvitationData) => controller.respond(data, true)
-    })
+        mutationFn: async (data: TeacherInvitationData) => controller.respond(data, true),
+    });
 }
 
-export function useDeclineTeacherInvitationMutation(): UseMutationReturnType<TeacherInvitationResponse, Error, TeacherDTO, unknown> {
+export function useDeclineTeacherInvitationMutation(): UseMutationReturnType<
+    TeacherInvitationResponse,
+    Error,
+    TeacherDTO,
+    unknown
+> {
     return useMutation({
-        mutationFn: async (data: TeacherInvitationData) => controller.respond(data, false)
-    })
+        mutationFn: async (data: TeacherInvitationData) => controller.respond(data, false),
+    });
 }
 
-export function useDeleteTeacherInvitationMutation(): UseMutationReturnType<TeacherInvitationResponse, Error, TeacherDTO, unknown> {
+export function useDeleteTeacherInvitationMutation(): UseMutationReturnType<
+    TeacherInvitationResponse,
+    Error,
+    TeacherDTO,
+    unknown
+> {
     return useMutation({
-        mutationFn: async (data: TeacherInvitationData) => controller.respond(data, false)
-    })
+        mutationFn: async (data: TeacherInvitationData) => controller.respond(data, false),
+    });
 }
-
-
diff --git a/frontend/src/views/classes/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
index 010cf2e2..a3fba26e 100644
--- a/frontend/src/views/classes/TeacherClasses.vue
+++ b/frontend/src/views/classes/TeacherClasses.vue
@@ -279,7 +279,8 @@
                         :key="i.classId"
                     >
                         <td>
-                          {{ i.classId }} <!-- TODO fetch display name via classId because db only returns classId field -->
+                            {{ i.classId }}
+                            <!-- TODO fetch display name via classId because db only returns classId field -->
                         </td>
                         <td>{{ (i.sender as TeacherDTO).firstName + " " + (i.sender as TeacherDTO).lastName }}</td>
                         <td class="text-right">

From f3d2b3313c43f30e75b52f020600bf9d2e6fe2b3 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Mon, 14 Apr 2025 16:50:54 +0200
Subject: [PATCH 165/177] feat: status teacher invite

---
 .../src/controllers/teacher-invitations.ts    | 54 +++++++++++---
 .../classes/class-join-request-repository.ts  |  4 +-
 .../classes/teacher-invitation-repository.ts  | 11 +--
 .../classes/class-join-request.entity.ts      |  6 +-
 .../classes/teacher-invitation.entity.ts      |  6 +-
 backend/src/interfaces/student-request.ts     |  4 +-
 backend/src/interfaces/teacher-invitation.ts  | 16 +++--
 backend/src/routes/teacher-invitations.ts     | 13 +++-
 backend/src/services/teacher-invitations.ts   | 70 +++++++++++--------
 backend/src/services/teachers.ts              |  6 +-
 .../controllers/teacher-invitations.test.ts   | 41 +++++++++--
 .../classes/class-join-requests.testdata.ts   | 10 +--
 .../classes/teacher-invitations.testdata.ts   | 13 ++--
 common/src/interfaces/class-join-request.ts   |  4 +-
 common/src/interfaces/teacher-invitation.ts   |  3 +
 common/src/util/class-join-request.ts         |  2 +-
 16 files changed, 184 insertions(+), 79 deletions(-)

diff --git a/backend/src/controllers/teacher-invitations.ts b/backend/src/controllers/teacher-invitations.ts
index b826dee3..f7cfa05a 100644
--- a/backend/src/controllers/teacher-invitations.ts
+++ b/backend/src/controllers/teacher-invitations.ts
@@ -1,11 +1,17 @@
-import { Request, Response } from 'express';
-import { requireFields } from './error-helper';
-import { createInvitation, deleteInvitationFor, getAllInvitations } from '../services/teacher-invitations';
-import { TeacherInvitationData } from '@dwengo-1/common/interfaces/teacher-invitation';
+import {Request, Response} from 'express';
+import {requireFields} from './error-helper';
+import {
+    createInvitation,
+    deleteInvitation,
+    getAllInvitations,
+    getInvitation,
+    updateInvitation
+} from '../services/teacher-invitations';
+import {TeacherInvitationData} from '@dwengo-1/common/interfaces/teacher-invitation';
 
 export async function getAllInvitationsHandler(req: Request, res: Response): Promise<void> {
     const username = req.params.username;
-    const by = req.query.by === 'true';
+    const by = req.query.sent === 'true';
     requireFields({ username });
 
     const invitations = await getAllInvitations(username, by);
@@ -13,6 +19,17 @@ export async function getAllInvitationsHandler(req: Request, res: Response): Pro
     res.json({ invitations });
 }
 
+export async function getInvitationHandler(req: Request, res: Response): Promise<void> {
+    const sender = req.params.sender;
+    const receiver = req.params.receiver;
+    const classId = req.params.classId;
+    requireFields({ sender, receiver, classId });
+
+    const invitation = await getInvitation(sender, receiver, classId);
+
+    res.json({ invitation });
+}
+
 export async function createInvitationHandler(req: Request, res: Response): Promise<void> {
     const sender = req.body.sender;
     const receiver = req.body.receiver;
@@ -25,14 +42,29 @@ export async function createInvitationHandler(req: Request, res: Response): Prom
     res.json({ invitation });
 }
 
-export async function deleteInvitationForHandler(req: Request, res: Response): Promise<void> {
-    const sender = req.params.sender;
-    const receiver = req.params.receiver;
-    const classId = req.params.classId;
-    const accepted = req.body.accepted !== 'false';
+export async function updateInvitationHandler(req: Request, res: Response): Promise<void> {
+    const sender = req.body.sender;
+    const receiver = req.body.receiver;
+    const classId = req.body.class;
+    req.body.accepted = req.body.accepted !== 'false';
     requireFields({ sender, receiver, classId });
 
-    const invitation = await deleteInvitationFor(sender, receiver, classId, accepted);
+    const data = req.body as TeacherInvitationData;
+    const invitation = await updateInvitation(data);
+
+    res.json({ invitation });
+}
+
+export async function deleteInvitationHandler(req: Request, res: Response): Promise<void> {
+    const sender = req.params.sender;
+    const receiver = req.params.receiver;
+    const classId = req.params.classId;
+    requireFields({ sender, receiver, classId });
+
+    const data: TeacherInvitationData = {
+        sender, receiver, class: classId
+    };
+    const invitation = await deleteInvitation(data);
 
     res.json({ invitation });
 }
diff --git a/backend/src/data/classes/class-join-request-repository.ts b/backend/src/data/classes/class-join-request-repository.ts
index 0d9ab6e1..8bd0f81e 100644
--- a/backend/src/data/classes/class-join-request-repository.ts
+++ b/backend/src/data/classes/class-join-request-repository.ts
@@ -2,14 +2,14 @@ import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
 import { Class } from '../../entities/classes/class.entity.js';
 import { ClassJoinRequest } from '../../entities/classes/class-join-request.entity.js';
 import { Student } from '../../entities/users/student.entity.js';
-import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request';
+import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
 
 export class ClassJoinRequestRepository extends DwengoEntityRepository<ClassJoinRequest> {
     public async findAllRequestsBy(requester: Student): Promise<ClassJoinRequest[]> {
         return this.findAll({ where: { requester: requester } });
     }
     public async findAllOpenRequestsTo(clazz: Class): Promise<ClassJoinRequest[]> {
-        return this.findAll({ where: { class: clazz, status: ClassJoinRequestStatus.Open } }); // TODO check if works like this
+        return this.findAll({ where: { class: clazz, status: ClassStatus.Open } }); // TODO check if works like this
     }
     public async findByStudentAndClass(requester: Student, clazz: Class): Promise<ClassJoinRequest | null> {
         return this.findOne({ requester, class: clazz });
diff --git a/backend/src/data/classes/teacher-invitation-repository.ts b/backend/src/data/classes/teacher-invitation-repository.ts
index 69c0a972..46abc685 100644
--- a/backend/src/data/classes/teacher-invitation-repository.ts
+++ b/backend/src/data/classes/teacher-invitation-repository.ts
@@ -1,7 +1,8 @@
-import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
-import { Class } from '../../entities/classes/class.entity.js';
-import { TeacherInvitation } from '../../entities/classes/teacher-invitation.entity.js';
-import { Teacher } from '../../entities/users/teacher.entity.js';
+import {DwengoEntityRepository} from '../dwengo-entity-repository.js';
+import {Class} from '../../entities/classes/class.entity.js';
+import {TeacherInvitation} from '../../entities/classes/teacher-invitation.entity.js';
+import {Teacher} from '../../entities/users/teacher.entity.js';
+import {ClassStatus} from "@dwengo-1/common/util/class-join-request";
 
 export class TeacherInvitationRepository extends DwengoEntityRepository<TeacherInvitation> {
     public async findAllInvitationsForClass(clazz: Class): Promise<TeacherInvitation[]> {
@@ -11,7 +12,7 @@ export class TeacherInvitationRepository extends DwengoEntityRepository<TeacherI
         return this.findAll({ where: { sender: sender } });
     }
     public async findAllInvitationsFor(receiver: Teacher): Promise<TeacherInvitation[]> {
-        return this.findAll({ where: { receiver: receiver } });
+        return this.findAll({ where: { receiver: receiver, status: ClassStatus.Open } });
     }
     public async deleteBy(clazz: Class, sender: Teacher, receiver: Teacher): Promise<void> {
         return this.deleteWhere({
diff --git a/backend/src/entities/classes/class-join-request.entity.ts b/backend/src/entities/classes/class-join-request.entity.ts
index 907c0199..548968a6 100644
--- a/backend/src/entities/classes/class-join-request.entity.ts
+++ b/backend/src/entities/classes/class-join-request.entity.ts
@@ -2,7 +2,7 @@ import { Entity, Enum, ManyToOne } from '@mikro-orm/core';
 import { Student } from '../users/student.entity.js';
 import { Class } from './class.entity.js';
 import { ClassJoinRequestRepository } from '../../data/classes/class-join-request-repository.js';
-import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request';
+import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
 
 @Entity({
     repository: () => ClassJoinRequestRepository,
@@ -20,6 +20,6 @@ export class ClassJoinRequest {
     })
     class!: Class;
 
-    @Enum(() => ClassJoinRequestStatus)
-    status!: ClassJoinRequestStatus;
+    @Enum(() => ClassStatus)
+    status!: ClassStatus;
 }
diff --git a/backend/src/entities/classes/teacher-invitation.entity.ts b/backend/src/entities/classes/teacher-invitation.entity.ts
index 668a0a1c..b7451682 100644
--- a/backend/src/entities/classes/teacher-invitation.entity.ts
+++ b/backend/src/entities/classes/teacher-invitation.entity.ts
@@ -1,7 +1,8 @@
-import { Entity, ManyToOne } from '@mikro-orm/core';
+import {Entity, Enum, ManyToOne} from '@mikro-orm/core';
 import { Teacher } from '../users/teacher.entity.js';
 import { Class } from './class.entity.js';
 import { TeacherInvitationRepository } from '../../data/classes/teacher-invitation-repository.js';
+import {ClassStatus} from "@dwengo-1/common/util/class-join-request";
 
 /**
  * Invitation of a teacher into a class (in order to teach it).
@@ -25,4 +26,7 @@ export class TeacherInvitation {
         primary: true,
     })
     class!: Class;
+
+    @Enum(() => ClassStatus)
+    status!: ClassStatus;
 }
diff --git a/backend/src/interfaces/student-request.ts b/backend/src/interfaces/student-request.ts
index d97f5eb5..a4d3b31b 100644
--- a/backend/src/interfaces/student-request.ts
+++ b/backend/src/interfaces/student-request.ts
@@ -4,7 +4,7 @@ import { getClassJoinRequestRepository } from '../data/repositories.js';
 import { Student } from '../entities/users/student.entity.js';
 import { Class } from '../entities/classes/class.entity.js';
 import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request';
-import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request';
+import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
 
 export function mapToStudentRequestDTO(request: ClassJoinRequest): ClassJoinRequestDTO {
     return {
@@ -18,6 +18,6 @@ export function mapToStudentRequest(student: Student, cls: Class): ClassJoinRequ
     return getClassJoinRequestRepository().create({
         requester: student,
         class: cls,
-        status: ClassJoinRequestStatus.Open,
+        status: ClassStatus.Open,
     });
 }
diff --git a/backend/src/interfaces/teacher-invitation.ts b/backend/src/interfaces/teacher-invitation.ts
index 4d1284db..f6cd1698 100644
--- a/backend/src/interfaces/teacher-invitation.ts
+++ b/backend/src/interfaces/teacher-invitation.ts
@@ -1,15 +1,17 @@
-import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity.js';
-import { mapToUserDTO } from './user.js';
-import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
-import { getTeacherInvitationRepository } from '../data/repositories';
-import { Teacher } from '../entities/users/teacher.entity';
-import { Class } from '../entities/classes/class.entity';
+import {TeacherInvitation} from '../entities/classes/teacher-invitation.entity.js';
+import {mapToUserDTO} from './user.js';
+import {TeacherInvitationDTO} from '@dwengo-1/common/interfaces/teacher-invitation';
+import {getTeacherInvitationRepository} from '../data/repositories';
+import {Teacher} from '../entities/users/teacher.entity';
+import {Class} from '../entities/classes/class.entity';
+import {ClassStatus} from "@dwengo-1/common/util/class-join-request";
 
 export function mapToTeacherInvitationDTO(invitation: TeacherInvitation): TeacherInvitationDTO {
     return {
         sender: mapToUserDTO(invitation.sender),
         receiver: mapToUserDTO(invitation.receiver),
         classId: invitation.class.classId!,
+        status: invitation.status
     };
 }
 
@@ -18,6 +20,7 @@ export function mapToTeacherInvitationDTOIds(invitation: TeacherInvitation): Tea
         sender: invitation.sender.username,
         receiver: invitation.receiver.username,
         classId: invitation.class.classId!,
+        status: invitation.status
     };
 }
 
@@ -26,5 +29,6 @@ export function mapToInvitation(sender: Teacher, receiver: Teacher, cls: Class):
         sender,
         receiver,
         class: cls,
+        status: ClassStatus.Open,
     });
 }
diff --git a/backend/src/routes/teacher-invitations.ts b/backend/src/routes/teacher-invitations.ts
index 7af71fdc..6826ec21 100644
--- a/backend/src/routes/teacher-invitations.ts
+++ b/backend/src/routes/teacher-invitations.ts
@@ -1,12 +1,21 @@
 import express from 'express';
-import { createInvitationHandler, deleteInvitationForHandler, getAllInvitationsHandler } from '../controllers/teacher-invitations';
+import {
+    createInvitationHandler,
+    deleteInvitationHandler,
+    getAllInvitationsHandler, getInvitationHandler,
+    updateInvitationHandler
+} from '../controllers/teacher-invitations';
 
 const router = express.Router({ mergeParams: true });
 
 router.get('/:username', getAllInvitationsHandler);
 
+router.get('/:sender/:receiver/:classId', getInvitationHandler);
+
 router.post('/', createInvitationHandler);
 
-router.delete('/:sender/:receiver/:classId', deleteInvitationForHandler);
+router.put('/', updateInvitationHandler);
+
+router.delete('/:sender/:receiver/:classId', deleteInvitationHandler);
 
 export default router;
diff --git a/backend/src/services/teacher-invitations.ts b/backend/src/services/teacher-invitations.ts
index dc54d5e5..19ead9a7 100644
--- a/backend/src/services/teacher-invitations.ts
+++ b/backend/src/services/teacher-invitations.ts
@@ -1,20 +1,19 @@
-import { fetchTeacher } from './teachers';
-import { getTeacherInvitationRepository } from '../data/repositories';
-import { mapToInvitation, mapToTeacherInvitationDTO } from '../interfaces/teacher-invitation';
-import { addClassTeacher, fetchClass } from './classes';
-import { TeacherInvitationData, TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
-import { ConflictException } from '../exceptions/conflict-exception';
-import { Teacher } from '../entities/users/teacher.entity';
-import { Class } from '../entities/classes/class.entity';
-import { NotFoundException } from '../exceptions/not-found-exception';
-import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity';
+import {fetchTeacher} from './teachers';
+import {getTeacherInvitationRepository} from '../data/repositories';
+import {mapToInvitation, mapToTeacherInvitationDTO} from '../interfaces/teacher-invitation';
+import {addClassTeacher, fetchClass} from './classes';
+import {TeacherInvitationData, TeacherInvitationDTO} from '@dwengo-1/common/interfaces/teacher-invitation';
+import {ConflictException} from '../exceptions/conflict-exception';
+import {NotFoundException} from '../exceptions/not-found-exception';
+import {TeacherInvitation} from '../entities/classes/teacher-invitation.entity';
+import {ClassStatus} from "@dwengo-1/common/util/class-join-request";
 
-export async function getAllInvitations(username: string, by: boolean): Promise<TeacherInvitationDTO[]> {
+export async function getAllInvitations(username: string, sent: boolean): Promise<TeacherInvitationDTO[]> {
     const teacher = await fetchTeacher(username);
     const teacherInvitationRepository = getTeacherInvitationRepository();
 
     let invitations;
-    if (by) {
+    if (sent) {
         invitations = await teacherInvitationRepository.findAllInvitationsBy(teacher);
     } else {
         invitations = await teacherInvitationRepository.findAllInvitationsFor(teacher);
@@ -39,7 +38,11 @@ export async function createInvitation(data: TeacherInvitationData): Promise<Tea
     return mapToTeacherInvitationDTO(newInvitation);
 }
 
-async function fetchInvitation(sender: Teacher, receiver: Teacher, cls: Class): Promise<TeacherInvitation> {
+async function fetchInvitation(usernameSender: string, usernameReceiver: string, classId: string): Promise<TeacherInvitation> {
+    const sender = await fetchTeacher(usernameSender);
+    const receiver = await fetchTeacher(usernameReceiver);
+    const cls = await fetchClass(classId);
+
     const teacherInvitationRepository = getTeacherInvitationRepository();
     const invite = await teacherInvitationRepository.findBy(cls, sender, receiver);
 
@@ -50,24 +53,35 @@ async function fetchInvitation(sender: Teacher, receiver: Teacher, cls: Class):
     return invite;
 }
 
-export async function deleteInvitationFor(
-    usernameSender: string,
-    usernameReceiver: string,
-    classId: string,
-    accepted: boolean
-): Promise<TeacherInvitationDTO> {
-    const teacherInvitationRepository = getTeacherInvitationRepository();
-    const sender = await fetchTeacher(usernameSender);
-    const receiver = await fetchTeacher(usernameReceiver);
+export async function getInvitation(sender: string, receiver: string, classId: string): Promise<TeacherInvitationDTO> {
+    const invitation = await fetchInvitation(sender, receiver, classId);
+    return mapToTeacherInvitationDTO(invitation);
+}
 
-    const cls = await fetchClass(classId);
+export async function updateInvitation(data: TeacherInvitationData): Promise<TeacherInvitationDTO> {
+    const invitation = await fetchInvitation(data.sender, data.receiver, data.class);
+    invitation.status = ClassStatus.Declined;
 
-    const invitation = await fetchInvitation(sender, receiver, cls);
-    await teacherInvitationRepository.deleteBy(cls, sender, receiver);
-
-    if (accepted) {
-        await addClassTeacher(classId, usernameReceiver);
+    if (data.accepted) {
+        invitation.status = ClassStatus.Accepted;
+        await addClassTeacher(data.class, data.receiver);
     }
 
+    const teacherInvitationRepository = getTeacherInvitationRepository();
+    await teacherInvitationRepository.save(invitation);
+
+    return mapToTeacherInvitationDTO(invitation);
+}
+
+export async function deleteInvitation(data: TeacherInvitationData): Promise<TeacherInvitationDTO> {
+    const invitation = await fetchInvitation(data.sender, data.receiver, data.class);
+
+    const sender = await fetchTeacher(data.sender);
+    const receiver = await fetchTeacher(data.receiver);
+    const cls = await fetchClass(data.class);
+
+    const teacherInvitationRepository = getTeacherInvitationRepository();
+    await teacherInvitationRepository.deleteBy(cls, sender, receiver);
+
     return mapToTeacherInvitationDTO(invitation);
 }
diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts
index e6596f9e..982b657b 100644
--- a/backend/src/services/teachers.ts
+++ b/backend/src/services/teachers.ts
@@ -28,7 +28,7 @@ import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 import { StudentDTO } from '@dwengo-1/common/interfaces/student';
 import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request';
-import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request';
+import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
 import { ConflictException } from '../exceptions/conflict-exception.js';
 
 export async function getAllTeachers(full: boolean): Promise<TeacherDTO[] | string[]> {
@@ -160,10 +160,10 @@ export async function updateClassJoinRequestStatus(studentUsername: string, clas
         throw new NotFoundException('Join request not found');
     }
 
-    request.status = ClassJoinRequestStatus.Declined;
+    request.status = ClassStatus.Declined;
 
     if (accepted) {
-        request.status = ClassJoinRequestStatus.Accepted;
+        request.status = ClassStatus.Accepted;
         await addClassStudent(classId, studentUsername);
     }
 
diff --git a/backend/tests/controllers/teacher-invitations.test.ts b/backend/tests/controllers/teacher-invitations.test.ts
index 6f233898..005dac26 100644
--- a/backend/tests/controllers/teacher-invitations.test.ts
+++ b/backend/tests/controllers/teacher-invitations.test.ts
@@ -1,9 +1,15 @@
 import { beforeAll, beforeEach, describe, expect, it, Mock, vi } from 'vitest';
 import { Request, Response } from 'express';
 import { setupTestApp } from '../setup-tests.js';
-import { createInvitationHandler, deleteInvitationForHandler, getAllInvitationsHandler } from '../../src/controllers/teacher-invitations';
+import {
+    createInvitationHandler,
+    deleteInvitationHandler,
+    getAllInvitationsHandler,
+    getInvitationHandler
+} from '../../src/controllers/teacher-invitations';
 import { TeacherInvitationData } from '@dwengo-1/common/interfaces/teacher-invitation';
 import { getClassHandler } from '../../src/controllers/classes';
+import {BadRequestException} from "../../src/exceptions/bad-request-exception";
 
 describe('Teacher controllers', () => {
     let req: Partial<Request>;
@@ -23,13 +29,14 @@ describe('Teacher controllers', () => {
     });
 
     it('Get teacher invitations by', async () => {
-        req = { params: { username: 'LimpBizkit' }, query: { by: 'true' } };
+        req = { params: { username: 'LimpBizkit' }, query: { sent: 'true' } };
 
         await getAllInvitationsHandler(req as Request, res as Response);
 
         expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ invitations: expect.anything() }));
 
         const result = jsonMock.mock.lastCall?.[0];
+        console.log(result.invitations);
         expect(result.invitations).to.have.length.greaterThan(0);
     });
 
@@ -63,9 +70,33 @@ describe('Teacher controllers', () => {
             body: { accepted: 'false' },
         };
 
-        await deleteInvitationForHandler(req as Request, res as Response);
+        await deleteInvitationHandler(req as Request, res as Response);
     });
 
+    it('Get invitation', async () => {
+        req = {
+            params: {
+                sender: 'LimpBizkit',
+                receiver: 'FooFighters',
+                classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89',
+            },
+        };
+        await getInvitationHandler(req as Request, res as Response);
+
+        expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ invitation: expect.anything() }));
+    });
+
+    it('Get invitation error', async () => {
+        req = {
+            params: { no: 'no params' },
+        };
+
+        await expect( async () => getInvitationHandler(req as Request, res as Response))
+            .rejects.toThrowError(BadRequestException);
+    });
+
+    /*
+
     it('Create and accept invitation', async () => {
         const body = {
             sender: 'LimpBizkit',
@@ -85,7 +116,7 @@ describe('Teacher controllers', () => {
             body: { accepted: 'true' },
         };
 
-        await deleteInvitationForHandler(req as Request, res as Response);
+        await deleteInvitationHandler(req as Request, res as Response);
 
         req = {
             params: {
@@ -98,4 +129,6 @@ describe('Teacher controllers', () => {
         const result = jsonMock.mock.lastCall?.[0];
         expect(result.class.teachers).toContain('testleerkracht1');
     });
+
+     */
 });
diff --git a/backend/tests/test_assets/classes/class-join-requests.testdata.ts b/backend/tests/test_assets/classes/class-join-requests.testdata.ts
index 32337b19..63319dc4 100644
--- a/backend/tests/test_assets/classes/class-join-requests.testdata.ts
+++ b/backend/tests/test_assets/classes/class-join-requests.testdata.ts
@@ -2,31 +2,31 @@ import { EntityManager } from '@mikro-orm/core';
 import { ClassJoinRequest } from '../../../src/entities/classes/class-join-request.entity';
 import { Student } from '../../../src/entities/users/student.entity';
 import { Class } from '../../../src/entities/classes/class.entity';
-import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request';
+import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
 
 export function makeTestClassJoinRequests(em: EntityManager, students: Student[], classes: Class[]): ClassJoinRequest[] {
     const classJoinRequest01 = em.create(ClassJoinRequest, {
         requester: students[4],
         class: classes[1],
-        status: ClassJoinRequestStatus.Open,
+        status: ClassStatus.Open,
     });
 
     const classJoinRequest02 = em.create(ClassJoinRequest, {
         requester: students[2],
         class: classes[1],
-        status: ClassJoinRequestStatus.Open,
+        status: ClassStatus.Open,
     });
 
     const classJoinRequest03 = em.create(ClassJoinRequest, {
         requester: students[4],
         class: classes[2],
-        status: ClassJoinRequestStatus.Open,
+        status: ClassStatus.Open,
     });
 
     const classJoinRequest04 = em.create(ClassJoinRequest, {
         requester: students[3],
         class: classes[2],
-        status: ClassJoinRequestStatus.Open,
+        status: ClassStatus.Open,
     });
 
     return [classJoinRequest01, classJoinRequest02, classJoinRequest03, classJoinRequest04];
diff --git a/backend/tests/test_assets/classes/teacher-invitations.testdata.ts b/backend/tests/test_assets/classes/teacher-invitations.testdata.ts
index 68204a57..35a3d1b8 100644
--- a/backend/tests/test_assets/classes/teacher-invitations.testdata.ts
+++ b/backend/tests/test_assets/classes/teacher-invitations.testdata.ts
@@ -1,31 +1,36 @@
-import { EntityManager } from '@mikro-orm/core';
-import { TeacherInvitation } from '../../../src/entities/classes/teacher-invitation.entity';
-import { Teacher } from '../../../src/entities/users/teacher.entity';
-import { Class } from '../../../src/entities/classes/class.entity';
+import {EntityManager} from '@mikro-orm/core';
+import {TeacherInvitation} from '../../../src/entities/classes/teacher-invitation.entity';
+import {Teacher} from '../../../src/entities/users/teacher.entity';
+import {Class} from '../../../src/entities/classes/class.entity';
+import {ClassStatus} from "@dwengo-1/common/util/class-join-request";
 
 export function makeTestTeacherInvitations(em: EntityManager, teachers: Teacher[], classes: Class[]): TeacherInvitation[] {
     const teacherInvitation01 = em.create(TeacherInvitation, {
         sender: teachers[1],
         receiver: teachers[0],
         class: classes[1],
+        status: ClassStatus.Open
     });
 
     const teacherInvitation02 = em.create(TeacherInvitation, {
         sender: teachers[1],
         receiver: teachers[2],
         class: classes[1],
+        status: ClassStatus.Open
     });
 
     const teacherInvitation03 = em.create(TeacherInvitation, {
         sender: teachers[2],
         receiver: teachers[0],
         class: classes[2],
+        status: ClassStatus.Open
     });
 
     const teacherInvitation04 = em.create(TeacherInvitation, {
         sender: teachers[0],
         receiver: teachers[1],
         class: classes[0],
+        status: ClassStatus.Open
     });
 
     return [teacherInvitation01, teacherInvitation02, teacherInvitation03, teacherInvitation04];
diff --git a/common/src/interfaces/class-join-request.ts b/common/src/interfaces/class-join-request.ts
index 6787998b..5e8b2683 100644
--- a/common/src/interfaces/class-join-request.ts
+++ b/common/src/interfaces/class-join-request.ts
@@ -1,8 +1,8 @@
 import { StudentDTO } from './student';
-import { ClassJoinRequestStatus } from '../util/class-join-request';
+import { ClassStatus } from '../util/class-join-request';
 
 export interface ClassJoinRequestDTO {
     requester: StudentDTO;
     class: string;
-    status: ClassJoinRequestStatus;
+    status: ClassStatus;
 }
diff --git a/common/src/interfaces/teacher-invitation.ts b/common/src/interfaces/teacher-invitation.ts
index b952b051..37a4029f 100644
--- a/common/src/interfaces/teacher-invitation.ts
+++ b/common/src/interfaces/teacher-invitation.ts
@@ -1,13 +1,16 @@
 import { UserDTO } from './user';
+import {ClassStatus} from "../util/class-join-request";
 
 export interface TeacherInvitationDTO {
     sender: string | UserDTO;
     receiver: string | UserDTO;
     classId: string;
+    status: ClassStatus;
 }
 
 export interface TeacherInvitationData {
     sender: string;
     receiver: string;
     class: string;
+    accepted?: boolean;
 }
diff --git a/common/src/util/class-join-request.ts b/common/src/util/class-join-request.ts
index 5f9410f0..2049a16d 100644
--- a/common/src/util/class-join-request.ts
+++ b/common/src/util/class-join-request.ts
@@ -1,4 +1,4 @@
-export enum ClassJoinRequestStatus {
+export enum ClassStatus {
     Open = 'open',
     Accepted = 'accepted',
     Declined = 'declined',

From 8e2643f596033375339986b2021bc1c6fcfe5473 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Mon, 14 Apr 2025 14:52:59 +0000
Subject: [PATCH 166/177] style: fix linting issues met ESLint

---
 backend/tests/controllers/teacher-invitations.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/tests/controllers/teacher-invitations.test.ts b/backend/tests/controllers/teacher-invitations.test.ts
index 005dac26..c7f61773 100644
--- a/backend/tests/controllers/teacher-invitations.test.ts
+++ b/backend/tests/controllers/teacher-invitations.test.ts
@@ -97,7 +97,7 @@ describe('Teacher controllers', () => {
 
     /*
 
-    it('Create and accept invitation', async () => {
+    It('Create and accept invitation', async () => {
         const body = {
             sender: 'LimpBizkit',
             receiver: 'testleerkracht1',

From d88add83511c6d5a5ed9f06d9bd957a9dd4f20b4 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Mon, 14 Apr 2025 14:53:04 +0000
Subject: [PATCH 167/177] style: fix linting issues met Prettier

---
 backend/src/controllers/teacher-invitations.ts | 18 +++++++-----------
 .../classes/teacher-invitation-repository.ts   | 10 +++++-----
 .../classes/teacher-invitation.entity.ts       |  4 ++--
 backend/src/interfaces/teacher-invitation.ts   | 18 +++++++++---------
 backend/src/routes/teacher-invitations.ts      |  5 +++--
 backend/src/services/teacher-invitations.ts    | 18 +++++++++---------
 .../controllers/teacher-invitations.test.ts    |  7 +++----
 .../classes/teacher-invitations.testdata.ts    | 18 +++++++++---------
 common/src/interfaces/teacher-invitation.ts    |  2 +-
 9 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/backend/src/controllers/teacher-invitations.ts b/backend/src/controllers/teacher-invitations.ts
index f7cfa05a..4956f3e2 100644
--- a/backend/src/controllers/teacher-invitations.ts
+++ b/backend/src/controllers/teacher-invitations.ts
@@ -1,13 +1,7 @@
-import {Request, Response} from 'express';
-import {requireFields} from './error-helper';
-import {
-    createInvitation,
-    deleteInvitation,
-    getAllInvitations,
-    getInvitation,
-    updateInvitation
-} from '../services/teacher-invitations';
-import {TeacherInvitationData} from '@dwengo-1/common/interfaces/teacher-invitation';
+import { Request, Response } from 'express';
+import { requireFields } from './error-helper';
+import { createInvitation, deleteInvitation, getAllInvitations, getInvitation, updateInvitation } from '../services/teacher-invitations';
+import { TeacherInvitationData } from '@dwengo-1/common/interfaces/teacher-invitation';
 
 export async function getAllInvitationsHandler(req: Request, res: Response): Promise<void> {
     const username = req.params.username;
@@ -62,7 +56,9 @@ export async function deleteInvitationHandler(req: Request, res: Response): Prom
     requireFields({ sender, receiver, classId });
 
     const data: TeacherInvitationData = {
-        sender, receiver, class: classId
+        sender,
+        receiver,
+        class: classId,
     };
     const invitation = await deleteInvitation(data);
 
diff --git a/backend/src/data/classes/teacher-invitation-repository.ts b/backend/src/data/classes/teacher-invitation-repository.ts
index 46abc685..c9442e29 100644
--- a/backend/src/data/classes/teacher-invitation-repository.ts
+++ b/backend/src/data/classes/teacher-invitation-repository.ts
@@ -1,8 +1,8 @@
-import {DwengoEntityRepository} from '../dwengo-entity-repository.js';
-import {Class} from '../../entities/classes/class.entity.js';
-import {TeacherInvitation} from '../../entities/classes/teacher-invitation.entity.js';
-import {Teacher} from '../../entities/users/teacher.entity.js';
-import {ClassStatus} from "@dwengo-1/common/util/class-join-request";
+import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
+import { Class } from '../../entities/classes/class.entity.js';
+import { TeacherInvitation } from '../../entities/classes/teacher-invitation.entity.js';
+import { Teacher } from '../../entities/users/teacher.entity.js';
+import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
 
 export class TeacherInvitationRepository extends DwengoEntityRepository<TeacherInvitation> {
     public async findAllInvitationsForClass(clazz: Class): Promise<TeacherInvitation[]> {
diff --git a/backend/src/entities/classes/teacher-invitation.entity.ts b/backend/src/entities/classes/teacher-invitation.entity.ts
index b7451682..6059f155 100644
--- a/backend/src/entities/classes/teacher-invitation.entity.ts
+++ b/backend/src/entities/classes/teacher-invitation.entity.ts
@@ -1,8 +1,8 @@
-import {Entity, Enum, ManyToOne} from '@mikro-orm/core';
+import { Entity, Enum, ManyToOne } from '@mikro-orm/core';
 import { Teacher } from '../users/teacher.entity.js';
 import { Class } from './class.entity.js';
 import { TeacherInvitationRepository } from '../../data/classes/teacher-invitation-repository.js';
-import {ClassStatus} from "@dwengo-1/common/util/class-join-request";
+import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
 
 /**
  * Invitation of a teacher into a class (in order to teach it).
diff --git a/backend/src/interfaces/teacher-invitation.ts b/backend/src/interfaces/teacher-invitation.ts
index f6cd1698..8fef17af 100644
--- a/backend/src/interfaces/teacher-invitation.ts
+++ b/backend/src/interfaces/teacher-invitation.ts
@@ -1,17 +1,17 @@
-import {TeacherInvitation} from '../entities/classes/teacher-invitation.entity.js';
-import {mapToUserDTO} from './user.js';
-import {TeacherInvitationDTO} from '@dwengo-1/common/interfaces/teacher-invitation';
-import {getTeacherInvitationRepository} from '../data/repositories';
-import {Teacher} from '../entities/users/teacher.entity';
-import {Class} from '../entities/classes/class.entity';
-import {ClassStatus} from "@dwengo-1/common/util/class-join-request";
+import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity.js';
+import { mapToUserDTO } from './user.js';
+import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
+import { getTeacherInvitationRepository } from '../data/repositories';
+import { Teacher } from '../entities/users/teacher.entity';
+import { Class } from '../entities/classes/class.entity';
+import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
 
 export function mapToTeacherInvitationDTO(invitation: TeacherInvitation): TeacherInvitationDTO {
     return {
         sender: mapToUserDTO(invitation.sender),
         receiver: mapToUserDTO(invitation.receiver),
         classId: invitation.class.classId!,
-        status: invitation.status
+        status: invitation.status,
     };
 }
 
@@ -20,7 +20,7 @@ export function mapToTeacherInvitationDTOIds(invitation: TeacherInvitation): Tea
         sender: invitation.sender.username,
         receiver: invitation.receiver.username,
         classId: invitation.class.classId!,
-        status: invitation.status
+        status: invitation.status,
     };
 }
 
diff --git a/backend/src/routes/teacher-invitations.ts b/backend/src/routes/teacher-invitations.ts
index 6826ec21..772b1351 100644
--- a/backend/src/routes/teacher-invitations.ts
+++ b/backend/src/routes/teacher-invitations.ts
@@ -2,8 +2,9 @@ import express from 'express';
 import {
     createInvitationHandler,
     deleteInvitationHandler,
-    getAllInvitationsHandler, getInvitationHandler,
-    updateInvitationHandler
+    getAllInvitationsHandler,
+    getInvitationHandler,
+    updateInvitationHandler,
 } from '../controllers/teacher-invitations';
 
 const router = express.Router({ mergeParams: true });
diff --git a/backend/src/services/teacher-invitations.ts b/backend/src/services/teacher-invitations.ts
index 19ead9a7..07f61bae 100644
--- a/backend/src/services/teacher-invitations.ts
+++ b/backend/src/services/teacher-invitations.ts
@@ -1,12 +1,12 @@
-import {fetchTeacher} from './teachers';
-import {getTeacherInvitationRepository} from '../data/repositories';
-import {mapToInvitation, mapToTeacherInvitationDTO} from '../interfaces/teacher-invitation';
-import {addClassTeacher, fetchClass} from './classes';
-import {TeacherInvitationData, TeacherInvitationDTO} from '@dwengo-1/common/interfaces/teacher-invitation';
-import {ConflictException} from '../exceptions/conflict-exception';
-import {NotFoundException} from '../exceptions/not-found-exception';
-import {TeacherInvitation} from '../entities/classes/teacher-invitation.entity';
-import {ClassStatus} from "@dwengo-1/common/util/class-join-request";
+import { fetchTeacher } from './teachers';
+import { getTeacherInvitationRepository } from '../data/repositories';
+import { mapToInvitation, mapToTeacherInvitationDTO } from '../interfaces/teacher-invitation';
+import { addClassTeacher, fetchClass } from './classes';
+import { TeacherInvitationData, TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
+import { ConflictException } from '../exceptions/conflict-exception';
+import { NotFoundException } from '../exceptions/not-found-exception';
+import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity';
+import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
 
 export async function getAllInvitations(username: string, sent: boolean): Promise<TeacherInvitationDTO[]> {
     const teacher = await fetchTeacher(username);
diff --git a/backend/tests/controllers/teacher-invitations.test.ts b/backend/tests/controllers/teacher-invitations.test.ts
index c7f61773..38184d7d 100644
--- a/backend/tests/controllers/teacher-invitations.test.ts
+++ b/backend/tests/controllers/teacher-invitations.test.ts
@@ -5,11 +5,11 @@ import {
     createInvitationHandler,
     deleteInvitationHandler,
     getAllInvitationsHandler,
-    getInvitationHandler
+    getInvitationHandler,
 } from '../../src/controllers/teacher-invitations';
 import { TeacherInvitationData } from '@dwengo-1/common/interfaces/teacher-invitation';
 import { getClassHandler } from '../../src/controllers/classes';
-import {BadRequestException} from "../../src/exceptions/bad-request-exception";
+import { BadRequestException } from '../../src/exceptions/bad-request-exception';
 
 describe('Teacher controllers', () => {
     let req: Partial<Request>;
@@ -91,8 +91,7 @@ describe('Teacher controllers', () => {
             params: { no: 'no params' },
         };
 
-        await expect( async () => getInvitationHandler(req as Request, res as Response))
-            .rejects.toThrowError(BadRequestException);
+        await expect(async () => getInvitationHandler(req as Request, res as Response)).rejects.toThrowError(BadRequestException);
     });
 
     /*
diff --git a/backend/tests/test_assets/classes/teacher-invitations.testdata.ts b/backend/tests/test_assets/classes/teacher-invitations.testdata.ts
index 35a3d1b8..6337a513 100644
--- a/backend/tests/test_assets/classes/teacher-invitations.testdata.ts
+++ b/backend/tests/test_assets/classes/teacher-invitations.testdata.ts
@@ -1,36 +1,36 @@
-import {EntityManager} from '@mikro-orm/core';
-import {TeacherInvitation} from '../../../src/entities/classes/teacher-invitation.entity';
-import {Teacher} from '../../../src/entities/users/teacher.entity';
-import {Class} from '../../../src/entities/classes/class.entity';
-import {ClassStatus} from "@dwengo-1/common/util/class-join-request";
+import { EntityManager } from '@mikro-orm/core';
+import { TeacherInvitation } from '../../../src/entities/classes/teacher-invitation.entity';
+import { Teacher } from '../../../src/entities/users/teacher.entity';
+import { Class } from '../../../src/entities/classes/class.entity';
+import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
 
 export function makeTestTeacherInvitations(em: EntityManager, teachers: Teacher[], classes: Class[]): TeacherInvitation[] {
     const teacherInvitation01 = em.create(TeacherInvitation, {
         sender: teachers[1],
         receiver: teachers[0],
         class: classes[1],
-        status: ClassStatus.Open
+        status: ClassStatus.Open,
     });
 
     const teacherInvitation02 = em.create(TeacherInvitation, {
         sender: teachers[1],
         receiver: teachers[2],
         class: classes[1],
-        status: ClassStatus.Open
+        status: ClassStatus.Open,
     });
 
     const teacherInvitation03 = em.create(TeacherInvitation, {
         sender: teachers[2],
         receiver: teachers[0],
         class: classes[2],
-        status: ClassStatus.Open
+        status: ClassStatus.Open,
     });
 
     const teacherInvitation04 = em.create(TeacherInvitation, {
         sender: teachers[0],
         receiver: teachers[1],
         class: classes[0],
-        status: ClassStatus.Open
+        status: ClassStatus.Open,
     });
 
     return [teacherInvitation01, teacherInvitation02, teacherInvitation03, teacherInvitation04];
diff --git a/common/src/interfaces/teacher-invitation.ts b/common/src/interfaces/teacher-invitation.ts
index 37a4029f..0979bceb 100644
--- a/common/src/interfaces/teacher-invitation.ts
+++ b/common/src/interfaces/teacher-invitation.ts
@@ -1,5 +1,5 @@
 import { UserDTO } from './user';
-import {ClassStatus} from "../util/class-join-request";
+import { ClassStatus } from '../util/class-join-request';
 
 export interface TeacherInvitationDTO {
     sender: string | UserDTO;

From ef04f6c7af638bb29e5e7f04d2c8cabf8cdf17d1 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Tue, 15 Apr 2025 17:33:03 +0200
Subject: [PATCH 168/177] fix: put route frontend + veranderingen delete

---
 .../controllers/teacher-invitations.test.ts   | 26 +++++--------
 common/src/interfaces/teacher-invitation.ts   |  2 +-
 .../src/controllers/teacher-invitations.ts    | 16 ++++++--
 frontend/src/queries/teacher-invitations.ts   | 38 +++++++++----------
 4 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/backend/tests/controllers/teacher-invitations.test.ts b/backend/tests/controllers/teacher-invitations.test.ts
index 005dac26..c9e0d623 100644
--- a/backend/tests/controllers/teacher-invitations.test.ts
+++ b/backend/tests/controllers/teacher-invitations.test.ts
@@ -5,11 +5,12 @@ import {
     createInvitationHandler,
     deleteInvitationHandler,
     getAllInvitationsHandler,
-    getInvitationHandler
+    getInvitationHandler, updateInvitationHandler
 } from '../../src/controllers/teacher-invitations';
 import { TeacherInvitationData } from '@dwengo-1/common/interfaces/teacher-invitation';
 import { getClassHandler } from '../../src/controllers/classes';
 import {BadRequestException} from "../../src/exceptions/bad-request-exception";
+import {ClassStatus} from "@dwengo-1/common/util/class-join-request";
 
 describe('Teacher controllers', () => {
     let req: Partial<Request>;
@@ -95,28 +96,19 @@ describe('Teacher controllers', () => {
             .rejects.toThrowError(BadRequestException);
     });
 
-    /*
 
-    it('Create and accept invitation', async () => {
+    it('Accept invitation', async () => {
         const body = {
             sender: 'LimpBizkit',
-            receiver: 'testleerkracht1',
+            receiver: 'FooFighters',
             class: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89',
         } as TeacherInvitationData;
         req = { body };
 
-        await createInvitationHandler(req as Request, res as Response);
+        await updateInvitationHandler(req as Request, res as Response);
 
-        req = {
-            params: {
-                sender: 'LimpBizkit',
-                receiver: 'testleerkracht1',
-                classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89',
-            },
-            body: { accepted: 'true' },
-        };
-
-        await deleteInvitationHandler(req as Request, res as Response);
+        const result1 = jsonMock.mock.lastCall?.[0];
+        expect(result1.invitation.status).toEqual(ClassStatus.Accepted);
 
         req = {
             params: {
@@ -127,8 +119,8 @@ describe('Teacher controllers', () => {
         await getClassHandler(req as Request, res as Response);
 
         const result = jsonMock.mock.lastCall?.[0];
-        expect(result.class.teachers).toContain('testleerkracht1');
+        expect(result.class.teachers).toContain('FooFighters');
     });
 
-     */
+
 });
diff --git a/common/src/interfaces/teacher-invitation.ts b/common/src/interfaces/teacher-invitation.ts
index 37a4029f..0d310d0e 100644
--- a/common/src/interfaces/teacher-invitation.ts
+++ b/common/src/interfaces/teacher-invitation.ts
@@ -12,5 +12,5 @@ export interface TeacherInvitationData {
     sender: string;
     receiver: string;
     class: string;
-    accepted?: boolean;
+    accepted?: boolean; // use for put requests, else skip
 }
diff --git a/frontend/src/controllers/teacher-invitations.ts b/frontend/src/controllers/teacher-invitations.ts
index a6e2045a..8083c152 100644
--- a/frontend/src/controllers/teacher-invitations.ts
+++ b/frontend/src/controllers/teacher-invitations.ts
@@ -14,15 +14,23 @@ export class TeacherInvitationController extends BaseController {
         super("teachers/invitations");
     }
 
-    async getAll(username: string, by: boolean): Promise<TeacherInvitationsResponse> {
-        return this.get<TeacherInvitationsResponse>(`/${username}`, { by });
+    async getAll(username: string, sent: boolean): Promise<TeacherInvitationsResponse> {
+        return this.get<TeacherInvitationsResponse>(`/${username}`, { sent });
+    }
+
+    async getBy(data: TeacherInvitationData): Promise<TeacherInvitationResponse> {
+        return this.get<TeacherInvitationResponse>(`/${data.sender}/${data.receiver}/${data.class}`)
     }
 
     async create(data: TeacherInvitationData): Promise<TeacherInvitationResponse> {
         return this.post<TeacherInvitationResponse>("/", data);
     }
 
-    async respond(data: TeacherInvitationData, accepted: boolean): Promise<TeacherInvitationResponse> {
-        return this.delete<TeacherInvitationResponse>(`/${data.sender}/${data.receiver}/${data.class}`, { accepted });
+    async remove(data: TeacherInvitationData): Promise<TeacherInvitationResponse> {
+        return this.delete<TeacherInvitationResponse>(`/${data.sender}/${data.receiver}/${data.class}`);
+    }
+
+    async respond(data: TeacherInvitationData) {
+        return this.put<TeacherInvitationResponse>("/", data);
     }
 }
diff --git a/frontend/src/queries/teacher-invitations.ts b/frontend/src/queries/teacher-invitations.ts
index a56ea9cd..59357c32 100644
--- a/frontend/src/queries/teacher-invitations.ts
+++ b/frontend/src/queries/teacher-invitations.ts
@@ -6,15 +6,15 @@ import {
     type TeacherInvitationResponse,
     type TeacherInvitationsResponse,
 } from "@/controllers/teacher-invitations.ts";
-import type { TeacherInvitationData } from "@dwengo-1/common/dist/interfaces/teacher-invitation.ts";
-import type { TeacherDTO } from "@dwengo-1/common/dist/interfaces/teacher.ts";
+import type { TeacherInvitationData } from "@dwengo-1/common/interfaces/teacher-invitation";
+import type { TeacherDTO } from "@dwengo-1/common/interfaces/teacher";
 
 const controller = new TeacherInvitationController();
 
 /**
-    All the invitations the teacher send
+    All the invitations the teacher sent
 **/
-export function useTeacherInvitationsByQuery(
+export function useTeacherInvitationsSentQuery(
     username: MaybeRefOrGetter<string | undefined>,
 ): UseQueryReturnType<TeacherInvitationsResponse, Error> {
     return useQuery({
@@ -24,9 +24,9 @@ export function useTeacherInvitationsByQuery(
 }
 
 /**
-    All the pending invitations send to this teacher
+    All the pending invitations sent to this teacher
  */
-export function useTeacherInvitationsForQuery(
+export function useTeacherInvitationsReceivedQuery(
     username: MaybeRefOrGetter<string | undefined>,
 ): UseQueryReturnType<TeacherInvitationsResponse, Error> {
     return useQuery({
@@ -35,6 +35,15 @@ export function useTeacherInvitationsForQuery(
     });
 }
 
+export function useTeacherInvitationQuery(
+    data: MaybeRefOrGetter<TeacherInvitationData | undefined>,
+): UseQueryReturnType<TeacherInvitationResponse, Error> {
+    return useQuery({
+        queryFn: computed(async () => controller.getBy(toValue(data))),
+        enabled: () => Boolean(toValue(data)),
+    });
+}
+
 export function useCreateTeacherInvitationMutation(): UseMutationReturnType<
     TeacherInvitationResponse,
     Error,
@@ -46,25 +55,14 @@ export function useCreateTeacherInvitationMutation(): UseMutationReturnType<
     });
 }
 
-export function useAcceptTeacherInvitationMutation(): UseMutationReturnType<
+export function useRespondTeacherInvitationMutation(): UseMutationReturnType<
     TeacherInvitationResponse,
     Error,
     TeacherDTO,
     unknown
 > {
     return useMutation({
-        mutationFn: async (data: TeacherInvitationData) => controller.respond(data, true),
-    });
-}
-
-export function useDeclineTeacherInvitationMutation(): UseMutationReturnType<
-    TeacherInvitationResponse,
-    Error,
-    TeacherDTO,
-    unknown
-> {
-    return useMutation({
-        mutationFn: async (data: TeacherInvitationData) => controller.respond(data, false),
+        mutationFn: async (data: TeacherInvitationData) => controller.respond(data),
     });
 }
 
@@ -75,6 +73,6 @@ export function useDeleteTeacherInvitationMutation(): UseMutationReturnType<
     unknown
 > {
     return useMutation({
-        mutationFn: async (data: TeacherInvitationData) => controller.respond(data, false),
+        mutationFn: async (data: TeacherInvitationData) => controller.remove(data),
     });
 }

From d84e6b485e76dbb38c8ad67223026b591434f1b7 Mon Sep 17 00:00:00 2001
From: Gabriellvl <vanlangenhovefga@gmail.com>
Date: Tue, 15 Apr 2025 17:36:13 +0200
Subject: [PATCH 169/177] fix: lint

---
 backend/tests/controllers/teacher-invitations.test.ts | 2 +-
 common/src/interfaces/teacher-invitation.ts           | 2 +-
 frontend/src/controllers/teacher-invitations.ts       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/tests/controllers/teacher-invitations.test.ts b/backend/tests/controllers/teacher-invitations.test.ts
index c9e0d623..f14d3b3a 100644
--- a/backend/tests/controllers/teacher-invitations.test.ts
+++ b/backend/tests/controllers/teacher-invitations.test.ts
@@ -37,7 +37,7 @@ describe('Teacher controllers', () => {
         expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ invitations: expect.anything() }));
 
         const result = jsonMock.mock.lastCall?.[0];
-        console.log(result.invitations);
+        // console.log(result.invitations);
         expect(result.invitations).to.have.length.greaterThan(0);
     });
 
diff --git a/common/src/interfaces/teacher-invitation.ts b/common/src/interfaces/teacher-invitation.ts
index 0d310d0e..3158b806 100644
--- a/common/src/interfaces/teacher-invitation.ts
+++ b/common/src/interfaces/teacher-invitation.ts
@@ -12,5 +12,5 @@ export interface TeacherInvitationData {
     sender: string;
     receiver: string;
     class: string;
-    accepted?: boolean; // use for put requests, else skip
+    accepted?: boolean; // Use for put requests, else skip
 }
diff --git a/frontend/src/controllers/teacher-invitations.ts b/frontend/src/controllers/teacher-invitations.ts
index 8083c152..f3383395 100644
--- a/frontend/src/controllers/teacher-invitations.ts
+++ b/frontend/src/controllers/teacher-invitations.ts
@@ -30,7 +30,7 @@ export class TeacherInvitationController extends BaseController {
         return this.delete<TeacherInvitationResponse>(`/${data.sender}/${data.receiver}/${data.class}`);
     }
 
-    async respond(data: TeacherInvitationData) {
+    async respond(data: TeacherInvitationData): Promise<TeacherInvitationResponse> {
         return this.put<TeacherInvitationResponse>("/", data);
     }
 }

From 447aeee9f3b504ec1bbea2b29226cc9394293908 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Tue, 15 Apr 2025 15:44:17 +0000
Subject: [PATCH 170/177] style: fix linting issues met ESLint

---
 backend/tests/controllers/teacher-invitations.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/tests/controllers/teacher-invitations.test.ts b/backend/tests/controllers/teacher-invitations.test.ts
index f14d3b3a..2e9b594f 100644
--- a/backend/tests/controllers/teacher-invitations.test.ts
+++ b/backend/tests/controllers/teacher-invitations.test.ts
@@ -37,7 +37,7 @@ describe('Teacher controllers', () => {
         expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ invitations: expect.anything() }));
 
         const result = jsonMock.mock.lastCall?.[0];
-        // console.log(result.invitations);
+        // Console.log(result.invitations);
         expect(result.invitations).to.have.length.greaterThan(0);
     });
 

From 63045c4223571cb84615111be9672c46f413277a Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Tue, 15 Apr 2025 15:44:22 +0000
Subject: [PATCH 171/177] style: fix linting issues met Prettier

---
 .../tests/controllers/teacher-invitations.test.ts   | 13 +++++--------
 frontend/src/controllers/teacher-invitations.ts     |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/backend/tests/controllers/teacher-invitations.test.ts b/backend/tests/controllers/teacher-invitations.test.ts
index 2e9b594f..ed2f5ebf 100644
--- a/backend/tests/controllers/teacher-invitations.test.ts
+++ b/backend/tests/controllers/teacher-invitations.test.ts
@@ -5,12 +5,13 @@ import {
     createInvitationHandler,
     deleteInvitationHandler,
     getAllInvitationsHandler,
-    getInvitationHandler, updateInvitationHandler
+    getInvitationHandler,
+    updateInvitationHandler,
 } from '../../src/controllers/teacher-invitations';
 import { TeacherInvitationData } from '@dwengo-1/common/interfaces/teacher-invitation';
 import { getClassHandler } from '../../src/controllers/classes';
-import {BadRequestException} from "../../src/exceptions/bad-request-exception";
-import {ClassStatus} from "@dwengo-1/common/util/class-join-request";
+import { BadRequestException } from '../../src/exceptions/bad-request-exception';
+import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
 
 describe('Teacher controllers', () => {
     let req: Partial<Request>;
@@ -92,11 +93,9 @@ describe('Teacher controllers', () => {
             params: { no: 'no params' },
         };
 
-        await expect( async () => getInvitationHandler(req as Request, res as Response))
-            .rejects.toThrowError(BadRequestException);
+        await expect(async () => getInvitationHandler(req as Request, res as Response)).rejects.toThrowError(BadRequestException);
     });
 
-
     it('Accept invitation', async () => {
         const body = {
             sender: 'LimpBizkit',
@@ -121,6 +120,4 @@ describe('Teacher controllers', () => {
         const result = jsonMock.mock.lastCall?.[0];
         expect(result.class.teachers).toContain('FooFighters');
     });
-
-
 });
diff --git a/frontend/src/controllers/teacher-invitations.ts b/frontend/src/controllers/teacher-invitations.ts
index f3383395..7750dea5 100644
--- a/frontend/src/controllers/teacher-invitations.ts
+++ b/frontend/src/controllers/teacher-invitations.ts
@@ -19,7 +19,7 @@ export class TeacherInvitationController extends BaseController {
     }
 
     async getBy(data: TeacherInvitationData): Promise<TeacherInvitationResponse> {
-        return this.get<TeacherInvitationResponse>(`/${data.sender}/${data.receiver}/${data.class}`)
+        return this.get<TeacherInvitationResponse>(`/${data.sender}/${data.receiver}/${data.class}`);
     }
 
     async create(data: TeacherInvitationData): Promise<TeacherInvitationResponse> {

From 827a2f0e71ef450f313967e554737a13a7ba2c2e Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Thu, 17 Apr 2025 09:07:11 +0200
Subject: [PATCH 172/177] fix: .js toevoegen aan imports

---
 backend/src/controllers/teacher-invitations.ts |  4 ++--
 backend/src/interfaces/group.ts                |  2 +-
 backend/src/interfaces/submission.ts           |  6 +++---
 backend/src/interfaces/teacher-invitation.ts   |  6 +++---
 backend/src/routes/teacher-invitations.ts      |  2 +-
 backend/src/services/questions.ts              |  2 +-
 backend/src/services/teacher-invitations.ts    | 14 +++++++-------
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/backend/src/controllers/teacher-invitations.ts b/backend/src/controllers/teacher-invitations.ts
index 4956f3e2..5f003f7f 100644
--- a/backend/src/controllers/teacher-invitations.ts
+++ b/backend/src/controllers/teacher-invitations.ts
@@ -1,6 +1,6 @@
 import { Request, Response } from 'express';
-import { requireFields } from './error-helper';
-import { createInvitation, deleteInvitation, getAllInvitations, getInvitation, updateInvitation } from '../services/teacher-invitations';
+import { requireFields } from './error-helper.js';
+import { createInvitation, deleteInvitation, getAllInvitations, getInvitation, updateInvitation } from '../services/teacher-invitations.js';
 import { TeacherInvitationData } from '@dwengo-1/common/interfaces/teacher-invitation';
 
 export async function getAllInvitationsHandler(req: Request, res: Response): Promise<void> {
diff --git a/backend/src/interfaces/group.ts b/backend/src/interfaces/group.ts
index 2a8287a3..792086d4 100644
--- a/backend/src/interfaces/group.ts
+++ b/backend/src/interfaces/group.ts
@@ -8,7 +8,7 @@ import { getGroupRepository } from '../data/repositories.js';
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
 import { Class } from '../entities/classes/class.entity.js';
 import { StudentDTO } from '@dwengo-1/common/interfaces/student';
-import { mapToClassDTO } from './class';
+import { mapToClassDTO } from './class.js';
 
 export function mapToGroup(groupDto: GroupDTO, clazz: Class): Group {
     const assignmentDto = groupDto.assignment as AssignmentDTO;
diff --git a/backend/src/interfaces/submission.ts b/backend/src/interfaces/submission.ts
index aa88f4a1..e179d458 100644
--- a/backend/src/interfaces/submission.ts
+++ b/backend/src/interfaces/submission.ts
@@ -2,9 +2,9 @@ import { Submission } from '../entities/assignments/submission.entity.js';
 import { mapToGroupDTO } from './group.js';
 import { mapToStudentDTO } from './student.js';
 import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
-import { getSubmissionRepository } from '../data/repositories';
-import { Student } from '../entities/users/student.entity';
-import { Group } from '../entities/assignments/group.entity';
+import { getSubmissionRepository } from '../data/repositories.js';
+import { Student } from '../entities/users/student.entity.js';
+import { Group } from '../entities/assignments/group.entity.js';
 
 export function mapToSubmissionDTO(submission: Submission): SubmissionDTO {
     return {
diff --git a/backend/src/interfaces/teacher-invitation.ts b/backend/src/interfaces/teacher-invitation.ts
index 8fef17af..88b66f7a 100644
--- a/backend/src/interfaces/teacher-invitation.ts
+++ b/backend/src/interfaces/teacher-invitation.ts
@@ -1,9 +1,9 @@
 import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity.js';
 import { mapToUserDTO } from './user.js';
 import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
-import { getTeacherInvitationRepository } from '../data/repositories';
-import { Teacher } from '../entities/users/teacher.entity';
-import { Class } from '../entities/classes/class.entity';
+import { getTeacherInvitationRepository } from '../data/repositories.js';
+import { Teacher } from '../entities/users/teacher.entity.js';
+import { Class } from '../entities/classes/class.entity.js';
 import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
 
 export function mapToTeacherInvitationDTO(invitation: TeacherInvitation): TeacherInvitationDTO {
diff --git a/backend/src/routes/teacher-invitations.ts b/backend/src/routes/teacher-invitations.ts
index 772b1351..23b943d0 100644
--- a/backend/src/routes/teacher-invitations.ts
+++ b/backend/src/routes/teacher-invitations.ts
@@ -5,7 +5,7 @@ import {
     getAllInvitationsHandler,
     getInvitationHandler,
     updateInvitationHandler,
-} from '../controllers/teacher-invitations';
+} from '../controllers/teacher-invitations.js';
 
 const router = express.Router({ mergeParams: true });
 
diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts
index 49bf9e92..a16c277b 100644
--- a/backend/src/services/questions.ts
+++ b/backend/src/services/questions.ts
@@ -10,7 +10,7 @@ import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
 import { mapToAssignment } from '../interfaces/assignment.js';
 import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
 import { fetchStudent } from './students.js';
-import { NotFoundException } from '../exceptions/not-found-exception';
+import { NotFoundException } from '../exceptions/not-found-exception.js';
 import { FALLBACK_VERSION_NUM } from '../config.js';
 
 export async function getQuestionsAboutLearningObjectInAssignment(
diff --git a/backend/src/services/teacher-invitations.ts b/backend/src/services/teacher-invitations.ts
index 07f61bae..aead8715 100644
--- a/backend/src/services/teacher-invitations.ts
+++ b/backend/src/services/teacher-invitations.ts
@@ -1,11 +1,11 @@
-import { fetchTeacher } from './teachers';
-import { getTeacherInvitationRepository } from '../data/repositories';
-import { mapToInvitation, mapToTeacherInvitationDTO } from '../interfaces/teacher-invitation';
-import { addClassTeacher, fetchClass } from './classes';
+import { fetchTeacher } from './teachers.js';
+import { getTeacherInvitationRepository } from '../data/repositories.js';
+import { mapToInvitation, mapToTeacherInvitationDTO } from '../interfaces/teacher-invitation.js';
+import { addClassTeacher, fetchClass } from './classes.js';
 import { TeacherInvitationData, TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
-import { ConflictException } from '../exceptions/conflict-exception';
-import { NotFoundException } from '../exceptions/not-found-exception';
-import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity';
+import { ConflictException } from '../exceptions/conflict-exception.js';
+import { NotFoundException } from '../exceptions/not-found-exception.js';
+import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity.js';
 import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
 
 export async function getAllInvitations(username: string, sent: boolean): Promise<TeacherInvitationDTO[]> {

From cda07055dde73558c91ea9f436cb80607d68ac23 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Thu, 17 Apr 2025 09:08:04 +0200
Subject: [PATCH 173/177] chore(frontend): Verberg Disccusions

Verberg knop uit menubalk, luister niet naar endpoint
---
 frontend/src/components/MenuBar.vue | 15 ++++++++-------
 frontend/src/router/index.ts        | 11 ++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/MenuBar.vue b/frontend/src/components/MenuBar.vue
index 328d607a..1240099d 100644
--- a/frontend/src/components/MenuBar.vue
+++ b/frontend/src/components/MenuBar.vue
@@ -80,13 +80,14 @@
             >
                 {{ t("classes") }}
             </v-btn>
-            <v-btn
-                class="menu_item"
-                variant="text"
-                to="/user/discussion"
-            >
-                {{ t("discussions") }}
-            </v-btn>
+            <!-- TODO Re-enable this button when the discussion page is ready -->
+<!--            <v-btn-->
+<!--                class="menu_item"-->
+<!--                variant="text"-->
+<!--                to="/user/discussion"-->
+<!--            >-->
+<!--                {{ t("discussions") }}-->
+<!--            </v-btn>-->
             <v-menu open-on-hover>
                 <template v-slot:activator="{ props }">
                     <v-btn
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 23695680..90bc1f2c 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -57,11 +57,12 @@ const router = createRouter({
                     name: "UserClasses",
                     component: UserClasses,
                 },
-                {
-                    path: "discussion",
-                    name: "UserDiscussions",
-                    component: UserDiscussions,
-                },
+                // TODO Re-enable this route when the discussion page is ready
+                // {
+                //     Path: "discussion",
+                //     Name: "UserDiscussions",
+                //     Component: UserDiscussions,
+                // },
             ],
         },
 

From bb0a5273dcf9d081beaa49cec842667146790f1e Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Thu, 17 Apr 2025 07:16:58 +0000
Subject: [PATCH 174/177] style: fix linting issues met Prettier

---
 frontend/src/components/MenuBar.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/MenuBar.vue b/frontend/src/components/MenuBar.vue
index 1240099d..847dca84 100644
--- a/frontend/src/components/MenuBar.vue
+++ b/frontend/src/components/MenuBar.vue
@@ -81,13 +81,13 @@
                 {{ t("classes") }}
             </v-btn>
             <!-- TODO Re-enable this button when the discussion page is ready -->
-<!--            <v-btn-->
-<!--                class="menu_item"-->
-<!--                variant="text"-->
-<!--                to="/user/discussion"-->
-<!--            >-->
-<!--                {{ t("discussions") }}-->
-<!--            </v-btn>-->
+            <!--            <v-btn-->
+            <!--                class="menu_item"-->
+            <!--                variant="text"-->
+            <!--                to="/user/discussion"-->
+            <!--            >-->
+            <!--                {{ t("discussions") }}-->
+            <!--            </v-btn>-->
             <v-menu open-on-hover>
                 <template v-slot:activator="{ props }">
                     <v-btn

From 12005d197c0ef5714236e923d7c953d8a5df280b Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Thu, 17 Apr 2025 09:53:03 +0200
Subject: [PATCH 175/177] style(frontend): Linting

---
 frontend/eslint.config.ts           | 30 +++++------
 frontend/src/queries/assignments.ts | 41 ++++++++++----
 frontend/src/queries/classes.ts     | 41 ++++++++++----
 frontend/src/queries/groups.ts      | 84 +++++++++++++++++------------
 frontend/src/queries/submissions.ts | 66 ++++++++++++++---------
 frontend/src/router/index.ts        |  1 -
 6 files changed, 168 insertions(+), 95 deletions(-)

diff --git a/frontend/eslint.config.ts b/frontend/eslint.config.ts
index 9ca1a08b..3e012904 100644
--- a/frontend/eslint.config.ts
+++ b/frontend/eslint.config.ts
@@ -1,9 +1,9 @@
-import pluginVue from "eslint-plugin-vue";
-import { defineConfigWithVueTs, vueTsConfigs } from "@vue/eslint-config-typescript";
-import pluginVitest from "@vitest/eslint-plugin";
-import pluginPlaywright from "eslint-plugin-playwright";
-import skipFormatting from "@vue/eslint-config-prettier/skip-formatting";
-import rootConfig from "../eslint.config";
+import pluginVue from 'eslint-plugin-vue';
+import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript';
+import pluginVitest from '@vitest/eslint-plugin';
+import pluginPlaywright from 'eslint-plugin-playwright';
+import skipFormatting from '@vue/eslint-config-prettier/skip-formatting';
+import rootConfig from '../eslint.config';
 
 // To allow more languages other than `ts` in `.vue` files, uncomment the following lines:
 // Import { configureVueProject } from '@vue/eslint-config-typescript'
@@ -12,29 +12,29 @@ import rootConfig from "../eslint.config";
 
 const vueConfig = defineConfigWithVueTs(
     {
-        name: "app/files-to-lint",
-        files: ["**/*.{ts,mts,tsx,vue}"],
+        name: 'app/files-to-lint',
+        files: ['**/*.{ts,mts,tsx,vue}'],
         rules: {
-            "no-useless-assignment": "off", // Depend on `no-unused-vars` to catch this
+            'no-useless-assignment': 'off', // Depend on `no-unused-vars` to catch this
         },
     },
 
     {
-        name: "app/files-to-ignore",
-        ignores: ["**/dist/**", "**/dist-ssr/**", "**/coverage/**", "prettier.config.js"],
+        name: 'app/files-to-ignore',
+        ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**', 'prettier.config.js', '**/test-results/**', '**/playwright-report/**'],
     },
 
-    pluginVue.configs["flat/essential"],
+    pluginVue.configs['flat/essential'],
     vueTsConfigs.recommended,
 
     {
         ...pluginVitest.configs.recommended,
-        files: ["src/**/__tests__/*"],
+        files: ['src/**/__tests__/*'],
     },
 
     {
-        ...pluginPlaywright.configs["flat/recommended"],
-        files: ["e2e/**/*.{test,spec}.{js,ts,jsx,tsx}"],
+        ...pluginPlaywright.configs['flat/recommended'],
+        files: ['e2e/**/*.{test,spec}.{js,ts,jsx,tsx}'],
     },
     skipFormatting,
 );
diff --git a/frontend/src/queries/assignments.ts b/frontend/src/queries/assignments.ts
index 3251836a..fadfa1f7 100644
--- a/frontend/src/queries/assignments.ts
+++ b/frontend/src/queries/assignments.ts
@@ -15,16 +15,27 @@ import type { AssignmentDTO } from "@dwengo-1/common/interfaces/assignment";
 import type { QueryClient } from "@tanstack/react-query";
 import { invalidateAllSubmissionKeys } from "./submissions";
 
-function assignmentsQueryKey(classid: string, full: boolean) {
+type AssignmentsQueryKey = ["assignments", string, boolean];
+
+function assignmentsQueryKey(classid: string, full: boolean): AssignmentsQueryKey {
     return ["assignments", classid, full];
 }
-function assignmentQueryKey(classid: string, assignmentNumber: number) {
+
+type AssignmentQueryKey = ["assignment", string, number];
+
+function assignmentQueryKey(classid: string, assignmentNumber: number): AssignmentQueryKey {
     return ["assignment", classid, assignmentNumber];
 }
-function assignmentSubmissionsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
+
+type AssignmentSubmissionsQueryKey = ["assignment-submissions", string, number, boolean];
+
+function assignmentSubmissionsQueryKey(classid: string, assignmentNumber: number, full: boolean): AssignmentSubmissionsQueryKey {
     return ["assignment-submissions", classid, assignmentNumber, full];
 }
-function assignmentQuestionsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
+
+type AssignmentQuestionsQueryKey = ["assignment-questions", string, number, boolean];
+
+function assignmentQuestionsQueryKey(classid: string, assignmentNumber: number, full: boolean): AssignmentQuestionsQueryKey {
     return ["assignment-questions", classid, assignmentNumber, full];
 }
 
@@ -32,13 +43,15 @@ export async function invalidateAllAssignmentKeys(
     queryClient: QueryClient,
     classid?: string,
     assignmentNumber?: number,
-) {
+): Promise<void> {
     const keys = ["assignment", "assignment-submissions", "assignment-questions"];
 
-    for (const key of keys) {
-        const queryKey = [key, classid, assignmentNumber].filter((arg) => arg !== undefined);
-        await queryClient.invalidateQueries({ queryKey: queryKey });
-    }
+    await Promise.all(
+        keys.map(async (key) => {
+            const queryKey = [key, classid, assignmentNumber].filter((arg) => arg !== undefined);
+            return queryClient.invalidateQueries({ queryKey: queryKey });
+        })
+    );
 
     await queryClient.invalidateQueries({ queryKey: ["assignments", classid].filter((arg) => arg !== undefined) });
 }
@@ -50,12 +63,20 @@ function checkEnabled(
 ): boolean {
     return Boolean(classid) && !isNaN(Number(groupNumber)) && !isNaN(Number(assignmentNumber));
 }
+
+interface Values {
+    cid: string | undefined;
+    an: number | undefined;
+    gn: number | undefined;
+    f: boolean;
+}
+
 function toValues(
     classid: MaybeRefOrGetter<string | undefined>,
     assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean>,
-) {
+): Values {
     return { cid: toValue(classid), an: toValue(assignmentNumber), gn: toValue(groupNumber), f: toValue(full) };
 }
 
diff --git a/frontend/src/queries/classes.ts b/frontend/src/queries/classes.ts
index 68ba0127..aeb647a0 100644
--- a/frontend/src/queries/classes.ts
+++ b/frontend/src/queries/classes.ts
@@ -17,32 +17,51 @@ import { invalidateAllSubmissionKeys } from "./submissions";
 const classController = new ClassController();
 
 /* Query cache keys */
-function classesQueryKey(full: boolean) {
+type ClassesQueryKey = ["classes", boolean];
+
+function classesQueryKey(full: boolean): ClassesQueryKey {
     return ["classes", full];
 }
-function classQueryKey(classid: string) {
+
+type ClassQueryKey = ["class", string];
+
+function classQueryKey(classid: string): ClassQueryKey {
     return ["class", classid];
 }
-function classStudentsKey(classid: string, full: boolean) {
+
+type ClassStudentsKey = ["class-students", string, boolean];
+
+function classStudentsKey(classid: string, full: boolean): ClassStudentsKey {
     return ["class-students", classid, full];
 }
-function classTeachersKey(classid: string, full: boolean) {
+
+type ClassTeachersKey = ["class-teachers", string, boolean];
+
+function classTeachersKey(classid: string, full: boolean): ClassTeachersKey {
     return ["class-teachers", classid, full];
 }
-function classTeacherInvitationsKey(classid: string, full: boolean) {
+
+type ClassTeacherInvitationsKey = ["class-teacher-invitations", string, boolean];
+
+function classTeacherInvitationsKey(classid: string, full: boolean): ClassTeacherInvitationsKey {
     return ["class-teacher-invitations", classid, full];
 }
-function classAssignmentsKey(classid: string, full: boolean) {
+
+type ClassAssignmentsKey = ["class-assignments", string, boolean];
+
+function classAssignmentsKey(classid: string, full: boolean): ClassAssignmentsKey {
     return ["class-assignments", classid, full];
 }
 
-export async function invalidateAllClassKeys(queryClient: QueryClient, classid?: string) {
+export async function invalidateAllClassKeys(queryClient: QueryClient, classid?: string): Promise<void> {
     const keys = ["class", "class-students", "class-teachers", "class-teacher-invitations", "class-assignments"];
 
-    for (const key of keys) {
-        const queryKey = [key, classid].filter((arg) => arg !== undefined);
-        await queryClient.invalidateQueries({ queryKey: queryKey });
-    }
+    await Promise.all(
+        keys.map(async (key) => {
+            const queryKey = [key, classid].filter((arg) => arg !== undefined);
+            return queryClient.invalidateQueries({ queryKey: queryKey });
+        })
+    );
 
     await queryClient.invalidateQueries({ queryKey: ["classes"] });
 }
diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index cdef2899..bfa5ad32 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -1,31 +1,40 @@
-import type { ClassesResponse } from "@/controllers/classes";
-import { GroupController, type GroupResponse, type GroupsResponse } from "@/controllers/groups";
-import type { QuestionsResponse } from "@/controllers/questions";
-import type { SubmissionsResponse } from "@/controllers/submissions";
-import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
+import { GroupController, type GroupResponse, type GroupsResponse } from '@/controllers/groups';
+import type { QuestionsResponse } from '@/controllers/questions';
+import type { SubmissionsResponse } from '@/controllers/submissions';
+import type { GroupDTO } from '@dwengo-1/common/interfaces/group';
 import {
     QueryClient,
     useMutation,
+    type UseMutationReturnType,
     useQuery,
     useQueryClient,
-    type UseMutationReturnType,
     type UseQueryReturnType,
-} from "@tanstack/vue-query";
-import { computed, toValue, type MaybeRefOrGetter } from "vue";
-import { invalidateAllAssignmentKeys } from "./assignments";
-import { invalidateAllSubmissionKeys } from "./submissions";
+} from '@tanstack/vue-query';
+import { computed, type MaybeRefOrGetter, toValue } from 'vue';
+import { invalidateAllSubmissionKeys } from './submissions';
 
-export function groupsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
-    return ["groups", classid, assignmentNumber, full];
+type GroupsQueryKey = ['groups', string, number, boolean];
+
+export function groupsQueryKey(classid: string, assignmentNumber: number, full: boolean): GroupsQueryKey {
+    return ['groups', classid, assignmentNumber, full];
 }
-function groupQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
-    return ["group", classid, assignmentNumber, groupNumber];
+
+type GroupQueryKey = ['group', string, number, number];
+
+function groupQueryKey(classid: string, assignmentNumber: number, groupNumber: number): GroupQueryKey {
+    return ['group', classid, assignmentNumber, groupNumber];
 }
-function groupSubmissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
-    return ["group-submissions", classid, assignmentNumber, groupNumber, full];
+
+type GroupSubmissionsQueryKey = ['group-submissions', string, number, number, boolean];
+
+function groupSubmissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean): GroupSubmissionsQueryKey {
+    return ['group-submissions', classid, assignmentNumber, groupNumber, full];
 }
-function groupQuestionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
-    return ["group-questions", classid, assignmentNumber, groupNumber, full];
+
+type GroupQuestionsQueryKey = ['group-questions', string, number, number, boolean];
+
+function groupQuestionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean): GroupQuestionsQueryKey {
+    return ['group-questions', classid, assignmentNumber, groupNumber, full];
 }
 
 export async function invalidateAllGroupKeys(
@@ -33,16 +42,17 @@ export async function invalidateAllGroupKeys(
     classid?: string,
     assignmentNumber?: number,
     groupNumber?: number,
-) {
-    const keys = ["group", "group-submissions", "group-questions"];
-
-    for (const key of keys) {
-        const queryKey = [key, classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined);
-        await queryClient.invalidateQueries({ queryKey: queryKey });
-    }
+): Promise<void> {
+    const keys = ['group', 'group-submissions', 'group-questions'];
+    await Promise.all(
+        keys.map(async (key) => {
+            const queryKey = [key, classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined);
+            return queryClient.invalidateQueries({ queryKey: queryKey });
+        }),
+    );
 
     await queryClient.invalidateQueries({
-        queryKey: ["groups", classid, assignmentNumber].filter((arg) => arg !== undefined),
+        queryKey: ['groups', classid, assignmentNumber].filter((arg) => arg !== undefined),
     });
 }
 
@@ -53,12 +63,20 @@ function checkEnabled(
 ): boolean {
     return Boolean(classid) && !isNaN(Number(groupNumber)) && !isNaN(Number(assignmentNumber));
 }
+
+interface Values {
+    cid: string | undefined;
+    an: number | undefined;
+    gn: number | undefined;
+    f: boolean;
+}
+
 function toValues(
     classid: MaybeRefOrGetter<string | undefined>,
     assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean>,
-) {
+): Values {
     return { cid: toValue(classid), an: toValue(assignmentNumber), gn: toValue(groupNumber), f: toValue(full) };
 }
 
@@ -101,9 +119,9 @@ export function useCreateGroupMutation(): UseMutationReturnType<
     return useMutation({
         mutationFn: async ({ cid, an, data }) => new GroupController(cid, an).createGroup(data),
         onSuccess: async (response) => {
-            const cid = typeof response.group.class === "string" ? response.group.class : response.group.class.id;
+            const cid = typeof response.group.class === 'string' ? response.group.class : response.group.class.id;
             const an =
-                typeof response.group.assignment === "number"
+                typeof response.group.assignment === 'number'
                     ? response.group.assignment
                     : response.group.assignment.id;
 
@@ -124,9 +142,9 @@ export function useDeleteGroupMutation(): UseMutationReturnType<
     return useMutation({
         mutationFn: async ({ cid, an, gn }) => new GroupController(cid, an).deleteGroup(gn),
         onSuccess: async (response) => {
-            const cid = typeof response.group.class === "string" ? response.group.class : response.group.class.id;
+            const cid = typeof response.group.class === 'string' ? response.group.class : response.group.class.id;
             const an =
-                typeof response.group.assignment === "number"
+                typeof response.group.assignment === 'number'
                     ? response.group.assignment
                     : response.group.assignment.id;
             const gn = response.group.groupNumber;
@@ -148,9 +166,9 @@ export function useUpdateGroupMutation(): UseMutationReturnType<
     return useMutation({
         mutationFn: async ({ cid, an, gn, data }) => new GroupController(cid, an).updateGroup(gn, data),
         onSuccess: async (response) => {
-            const cid = typeof response.group.class === "string" ? response.group.class : response.group.class.id;
+            const cid = typeof response.group.class === 'string' ? response.group.class : response.group.class.id;
             const an =
-                typeof response.group.assignment === "number"
+                typeof response.group.assignment === 'number'
                     ? response.group.assignment
                     : response.group.assignment.id;
             const gn = response.group.groupNumber;
diff --git a/frontend/src/queries/submissions.ts b/frontend/src/queries/submissions.ts
index 97effd15..eef3fec2 100644
--- a/frontend/src/queries/submissions.ts
+++ b/frontend/src/queries/submissions.ts
@@ -1,5 +1,5 @@
-import { SubmissionController, type SubmissionResponse, type SubmissionsResponse } from "@/controllers/submissions";
-import type { SubmissionDTO } from "@dwengo-1/common/interfaces/submission";
+import { SubmissionController, type SubmissionResponse, type SubmissionsResponse } from '@/controllers/submissions';
+import type { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
 import {
     QueryClient,
     useMutation,
@@ -7,14 +7,19 @@ import {
     useQueryClient,
     type UseMutationReturnType,
     type UseQueryReturnType,
-} from "@tanstack/vue-query";
-import { computed, toValue, type MaybeRefOrGetter } from "vue";
+} from '@tanstack/vue-query';
+import { computed, toValue, type MaybeRefOrGetter } from 'vue';
 
-function submissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
-    return ["submissions", classid, assignmentNumber, groupNumber, full];
+type SubmissionsQueryKey = ['submissions', string, number, number, boolean];
+
+function submissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean): SubmissionsQueryKey {
+    return ['submissions', classid, assignmentNumber, groupNumber, full];
 }
-function submissionQueryKey(classid: string, assignmentNumber: number, groupNumber: number, submissionNumber: number) {
-    return ["submission", classid, assignmentNumber, groupNumber, submissionNumber];
+
+type SubmissionQueryKey = ['submission', string, number, number, number];
+
+function submissionQueryKey(classid: string, assignmentNumber: number, groupNumber: number, submissionNumber: number): SubmissionQueryKey {
+    return ['submission', classid, assignmentNumber, groupNumber, submissionNumber];
 }
 
 export async function invalidateAllSubmissionKeys(
@@ -23,24 +28,26 @@ export async function invalidateAllSubmissionKeys(
     assignmentNumber?: number,
     groupNumber?: number,
     submissionNumber?: number,
-) {
-    const keys = ["submission"];
+): Promise<void> {
+    const keys = ['submission'];
 
-    for (const key of keys) {
-        const queryKey = [key, classid, assignmentNumber, groupNumber, submissionNumber].filter(
-            (arg) => arg !== undefined,
-        );
-        await queryClient.invalidateQueries({ queryKey: queryKey });
-    }
+    await Promise.all(
+        keys.map(async (key) => {
+            const queryKey = [key, classid, assignmentNumber, groupNumber, submissionNumber].filter(
+                (arg) => arg !== undefined,
+            );
+            return queryClient.invalidateQueries({ queryKey: queryKey });
+        })
+    );
 
     await queryClient.invalidateQueries({
-        queryKey: ["submissions", classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined),
+        queryKey: ['submissions', classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined),
     });
     await queryClient.invalidateQueries({
-        queryKey: ["group-submissions", classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined),
+        queryKey: ['group-submissions', classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined),
     });
     await queryClient.invalidateQueries({
-        queryKey: ["assignment-submissions", classid, assignmentNumber].filter((arg) => arg !== undefined),
+        queryKey: ['assignment-submissions', classid, assignmentNumber].filter((arg) => arg !== undefined),
     });
 }
 
@@ -57,13 +64,22 @@ function checkEnabled(
         !isNaN(Number(submissionNumber))
     );
 }
+
+interface Values {
+    cid: string | undefined;
+    an: number | undefined;
+    gn: number | undefined;
+    sn: number | undefined;
+    f: boolean;
+}
+
 function toValues(
     classid: MaybeRefOrGetter<string | undefined>,
     assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
     submissionNumber: MaybeRefOrGetter<number | undefined>,
     full: MaybeRefOrGetter<boolean>,
-) {
+): Values {
     return {
         cid: toValue(classid),
         an: toValue(assignmentNumber),
@@ -93,7 +109,7 @@ export function useSubmissionQuery(
     assignmentNumber: MaybeRefOrGetter<number | undefined>,
     groupNumber: MaybeRefOrGetter<number | undefined>,
 ): UseQueryReturnType<SubmissionResponse, Error> {
-    const { cid, an, gn, sn, f } = toValues(classid, assignmentNumber, groupNumber, 1, true);
+    const { cid, an, gn, sn } = toValues(classid, assignmentNumber, groupNumber, 1, true);
 
     return useQuery({
         queryKey: computed(() => submissionQueryKey(cid!, an!, gn!, sn!)),
@@ -119,8 +135,8 @@ export function useCreateSubmissionMutation(): UseMutationReturnType<
                 const cls = response.submission.group.class;
                 const assignment = response.submission.group.assignment;
 
-                const cid = typeof cls === "string" ? cls : cls.id;
-                const an = typeof assignment === "number" ? assignment : assignment.id;
+                const cid = typeof cls === 'string' ? cls : cls.id;
+                const an = typeof assignment === 'number' ? assignment : assignment.id;
                 const gn = response.submission.group.groupNumber;
 
                 await invalidateAllSubmissionKeys(queryClient, cid, an, gn);
@@ -146,8 +162,8 @@ export function useDeleteSubmissionMutation(): UseMutationReturnType<
                 const cls = response.submission.group.class;
                 const assignment = response.submission.group.assignment;
 
-                const cid = typeof cls === "string" ? cls : cls.id;
-                const an = typeof assignment === "number" ? assignment : assignment.id;
+                const cid = typeof cls === 'string' ? cls : cls.id;
+                const an = typeof assignment === 'number' ? assignment : assignment.id;
                 const gn = response.submission.group.groupNumber;
 
                 await invalidateAllSubmissionKeys(queryClient, cid, an, gn);
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 90bc1f2c..e7aa8d24 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -7,7 +7,6 @@ import CreateClass from "@/views/classes/CreateClass.vue";
 import CreateAssignment from "@/views/assignments/CreateAssignment.vue";
 import CreateDiscussion from "@/views/discussions/CreateDiscussion.vue";
 import CallbackPage from "@/views/CallbackPage.vue";
-import UserDiscussions from "@/views/discussions/UserDiscussions.vue";
 import UserClasses from "@/views/classes/UserClasses.vue";
 import UserAssignments from "@/views/classes/UserAssignments.vue";
 import authState from "@/services/auth/auth-service.ts";

From 45e85233a32153dc96724076362481ae5de3736a Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Thu, 17 Apr 2025 07:56:08 +0000
Subject: [PATCH 176/177] style: fix linting issues met Prettier

---
 frontend/eslint.config.ts           | 37 ++++++++++--------
 frontend/src/queries/assignments.ts | 14 +++++--
 frontend/src/queries/classes.ts     |  2 +-
 frontend/src/queries/groups.ts      | 60 +++++++++++++++++------------
 frontend/src/queries/submissions.ts | 48 ++++++++++++++---------
 5 files changed, 98 insertions(+), 63 deletions(-)

diff --git a/frontend/eslint.config.ts b/frontend/eslint.config.ts
index 3e012904..b7f15371 100644
--- a/frontend/eslint.config.ts
+++ b/frontend/eslint.config.ts
@@ -1,9 +1,9 @@
-import pluginVue from 'eslint-plugin-vue';
-import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript';
-import pluginVitest from '@vitest/eslint-plugin';
-import pluginPlaywright from 'eslint-plugin-playwright';
-import skipFormatting from '@vue/eslint-config-prettier/skip-formatting';
-import rootConfig from '../eslint.config';
+import pluginVue from "eslint-plugin-vue";
+import { defineConfigWithVueTs, vueTsConfigs } from "@vue/eslint-config-typescript";
+import pluginVitest from "@vitest/eslint-plugin";
+import pluginPlaywright from "eslint-plugin-playwright";
+import skipFormatting from "@vue/eslint-config-prettier/skip-formatting";
+import rootConfig from "../eslint.config";
 
 // To allow more languages other than `ts` in `.vue` files, uncomment the following lines:
 // Import { configureVueProject } from '@vue/eslint-config-typescript'
@@ -12,29 +12,36 @@ import rootConfig from '../eslint.config';
 
 const vueConfig = defineConfigWithVueTs(
     {
-        name: 'app/files-to-lint',
-        files: ['**/*.{ts,mts,tsx,vue}'],
+        name: "app/files-to-lint",
+        files: ["**/*.{ts,mts,tsx,vue}"],
         rules: {
-            'no-useless-assignment': 'off', // Depend on `no-unused-vars` to catch this
+            "no-useless-assignment": "off", // Depend on `no-unused-vars` to catch this
         },
     },
 
     {
-        name: 'app/files-to-ignore',
-        ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**', 'prettier.config.js', '**/test-results/**', '**/playwright-report/**'],
+        name: "app/files-to-ignore",
+        ignores: [
+            "**/dist/**",
+            "**/dist-ssr/**",
+            "**/coverage/**",
+            "prettier.config.js",
+            "**/test-results/**",
+            "**/playwright-report/**",
+        ],
     },
 
-    pluginVue.configs['flat/essential'],
+    pluginVue.configs["flat/essential"],
     vueTsConfigs.recommended,
 
     {
         ...pluginVitest.configs.recommended,
-        files: ['src/**/__tests__/*'],
+        files: ["src/**/__tests__/*"],
     },
 
     {
-        ...pluginPlaywright.configs['flat/recommended'],
-        files: ['e2e/**/*.{test,spec}.{js,ts,jsx,tsx}'],
+        ...pluginPlaywright.configs["flat/recommended"],
+        files: ["e2e/**/*.{test,spec}.{js,ts,jsx,tsx}"],
     },
     skipFormatting,
 );
diff --git a/frontend/src/queries/assignments.ts b/frontend/src/queries/assignments.ts
index fadfa1f7..8362faaa 100644
--- a/frontend/src/queries/assignments.ts
+++ b/frontend/src/queries/assignments.ts
@@ -29,13 +29,21 @@ function assignmentQueryKey(classid: string, assignmentNumber: number): Assignme
 
 type AssignmentSubmissionsQueryKey = ["assignment-submissions", string, number, boolean];
 
-function assignmentSubmissionsQueryKey(classid: string, assignmentNumber: number, full: boolean): AssignmentSubmissionsQueryKey {
+function assignmentSubmissionsQueryKey(
+    classid: string,
+    assignmentNumber: number,
+    full: boolean,
+): AssignmentSubmissionsQueryKey {
     return ["assignment-submissions", classid, assignmentNumber, full];
 }
 
 type AssignmentQuestionsQueryKey = ["assignment-questions", string, number, boolean];
 
-function assignmentQuestionsQueryKey(classid: string, assignmentNumber: number, full: boolean): AssignmentQuestionsQueryKey {
+function assignmentQuestionsQueryKey(
+    classid: string,
+    assignmentNumber: number,
+    full: boolean,
+): AssignmentQuestionsQueryKey {
     return ["assignment-questions", classid, assignmentNumber, full];
 }
 
@@ -50,7 +58,7 @@ export async function invalidateAllAssignmentKeys(
         keys.map(async (key) => {
             const queryKey = [key, classid, assignmentNumber].filter((arg) => arg !== undefined);
             return queryClient.invalidateQueries({ queryKey: queryKey });
-        })
+        }),
     );
 
     await queryClient.invalidateQueries({ queryKey: ["assignments", classid].filter((arg) => arg !== undefined) });
diff --git a/frontend/src/queries/classes.ts b/frontend/src/queries/classes.ts
index aeb647a0..4bef8ad6 100644
--- a/frontend/src/queries/classes.ts
+++ b/frontend/src/queries/classes.ts
@@ -60,7 +60,7 @@ export async function invalidateAllClassKeys(queryClient: QueryClient, classid?:
         keys.map(async (key) => {
             const queryKey = [key, classid].filter((arg) => arg !== undefined);
             return queryClient.invalidateQueries({ queryKey: queryKey });
-        })
+        }),
     );
 
     await queryClient.invalidateQueries({ queryKey: ["classes"] });
diff --git a/frontend/src/queries/groups.ts b/frontend/src/queries/groups.ts
index bfa5ad32..2ac92348 100644
--- a/frontend/src/queries/groups.ts
+++ b/frontend/src/queries/groups.ts
@@ -1,7 +1,7 @@
-import { GroupController, type GroupResponse, type GroupsResponse } from '@/controllers/groups';
-import type { QuestionsResponse } from '@/controllers/questions';
-import type { SubmissionsResponse } from '@/controllers/submissions';
-import type { GroupDTO } from '@dwengo-1/common/interfaces/group';
+import { GroupController, type GroupResponse, type GroupsResponse } from "@/controllers/groups";
+import type { QuestionsResponse } from "@/controllers/questions";
+import type { SubmissionsResponse } from "@/controllers/submissions";
+import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
 import {
     QueryClient,
     useMutation,
@@ -9,32 +9,42 @@ import {
     useQuery,
     useQueryClient,
     type UseQueryReturnType,
-} from '@tanstack/vue-query';
-import { computed, type MaybeRefOrGetter, toValue } from 'vue';
-import { invalidateAllSubmissionKeys } from './submissions';
+} from "@tanstack/vue-query";
+import { computed, type MaybeRefOrGetter, toValue } from "vue";
+import { invalidateAllSubmissionKeys } from "./submissions";
 
-type GroupsQueryKey = ['groups', string, number, boolean];
+type GroupsQueryKey = ["groups", string, number, boolean];
 
 export function groupsQueryKey(classid: string, assignmentNumber: number, full: boolean): GroupsQueryKey {
-    return ['groups', classid, assignmentNumber, full];
+    return ["groups", classid, assignmentNumber, full];
 }
 
-type GroupQueryKey = ['group', string, number, number];
+type GroupQueryKey = ["group", string, number, number];
 
 function groupQueryKey(classid: string, assignmentNumber: number, groupNumber: number): GroupQueryKey {
-    return ['group', classid, assignmentNumber, groupNumber];
+    return ["group", classid, assignmentNumber, groupNumber];
 }
 
-type GroupSubmissionsQueryKey = ['group-submissions', string, number, number, boolean];
+type GroupSubmissionsQueryKey = ["group-submissions", string, number, number, boolean];
 
-function groupSubmissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean): GroupSubmissionsQueryKey {
-    return ['group-submissions', classid, assignmentNumber, groupNumber, full];
+function groupSubmissionsQueryKey(
+    classid: string,
+    assignmentNumber: number,
+    groupNumber: number,
+    full: boolean,
+): GroupSubmissionsQueryKey {
+    return ["group-submissions", classid, assignmentNumber, groupNumber, full];
 }
 
-type GroupQuestionsQueryKey = ['group-questions', string, number, number, boolean];
+type GroupQuestionsQueryKey = ["group-questions", string, number, number, boolean];
 
-function groupQuestionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean): GroupQuestionsQueryKey {
-    return ['group-questions', classid, assignmentNumber, groupNumber, full];
+function groupQuestionsQueryKey(
+    classid: string,
+    assignmentNumber: number,
+    groupNumber: number,
+    full: boolean,
+): GroupQuestionsQueryKey {
+    return ["group-questions", classid, assignmentNumber, groupNumber, full];
 }
 
 export async function invalidateAllGroupKeys(
@@ -43,7 +53,7 @@ export async function invalidateAllGroupKeys(
     assignmentNumber?: number,
     groupNumber?: number,
 ): Promise<void> {
-    const keys = ['group', 'group-submissions', 'group-questions'];
+    const keys = ["group", "group-submissions", "group-questions"];
     await Promise.all(
         keys.map(async (key) => {
             const queryKey = [key, classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined);
@@ -52,7 +62,7 @@ export async function invalidateAllGroupKeys(
     );
 
     await queryClient.invalidateQueries({
-        queryKey: ['groups', classid, assignmentNumber].filter((arg) => arg !== undefined),
+        queryKey: ["groups", classid, assignmentNumber].filter((arg) => arg !== undefined),
     });
 }
 
@@ -119,9 +129,9 @@ export function useCreateGroupMutation(): UseMutationReturnType<
     return useMutation({
         mutationFn: async ({ cid, an, data }) => new GroupController(cid, an).createGroup(data),
         onSuccess: async (response) => {
-            const cid = typeof response.group.class === 'string' ? response.group.class : response.group.class.id;
+            const cid = typeof response.group.class === "string" ? response.group.class : response.group.class.id;
             const an =
-                typeof response.group.assignment === 'number'
+                typeof response.group.assignment === "number"
                     ? response.group.assignment
                     : response.group.assignment.id;
 
@@ -142,9 +152,9 @@ export function useDeleteGroupMutation(): UseMutationReturnType<
     return useMutation({
         mutationFn: async ({ cid, an, gn }) => new GroupController(cid, an).deleteGroup(gn),
         onSuccess: async (response) => {
-            const cid = typeof response.group.class === 'string' ? response.group.class : response.group.class.id;
+            const cid = typeof response.group.class === "string" ? response.group.class : response.group.class.id;
             const an =
-                typeof response.group.assignment === 'number'
+                typeof response.group.assignment === "number"
                     ? response.group.assignment
                     : response.group.assignment.id;
             const gn = response.group.groupNumber;
@@ -166,9 +176,9 @@ export function useUpdateGroupMutation(): UseMutationReturnType<
     return useMutation({
         mutationFn: async ({ cid, an, gn, data }) => new GroupController(cid, an).updateGroup(gn, data),
         onSuccess: async (response) => {
-            const cid = typeof response.group.class === 'string' ? response.group.class : response.group.class.id;
+            const cid = typeof response.group.class === "string" ? response.group.class : response.group.class.id;
             const an =
-                typeof response.group.assignment === 'number'
+                typeof response.group.assignment === "number"
                     ? response.group.assignment
                     : response.group.assignment.id;
             const gn = response.group.groupNumber;
diff --git a/frontend/src/queries/submissions.ts b/frontend/src/queries/submissions.ts
index eef3fec2..b9e94e12 100644
--- a/frontend/src/queries/submissions.ts
+++ b/frontend/src/queries/submissions.ts
@@ -1,5 +1,5 @@
-import { SubmissionController, type SubmissionResponse, type SubmissionsResponse } from '@/controllers/submissions';
-import type { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
+import { SubmissionController, type SubmissionResponse, type SubmissionsResponse } from "@/controllers/submissions";
+import type { SubmissionDTO } from "@dwengo-1/common/interfaces/submission";
 import {
     QueryClient,
     useMutation,
@@ -7,19 +7,29 @@ import {
     useQueryClient,
     type UseMutationReturnType,
     type UseQueryReturnType,
-} from '@tanstack/vue-query';
-import { computed, toValue, type MaybeRefOrGetter } from 'vue';
+} from "@tanstack/vue-query";
+import { computed, toValue, type MaybeRefOrGetter } from "vue";
 
-type SubmissionsQueryKey = ['submissions', string, number, number, boolean];
+type SubmissionsQueryKey = ["submissions", string, number, number, boolean];
 
-function submissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean): SubmissionsQueryKey {
-    return ['submissions', classid, assignmentNumber, groupNumber, full];
+function submissionsQueryKey(
+    classid: string,
+    assignmentNumber: number,
+    groupNumber: number,
+    full: boolean,
+): SubmissionsQueryKey {
+    return ["submissions", classid, assignmentNumber, groupNumber, full];
 }
 
-type SubmissionQueryKey = ['submission', string, number, number, number];
+type SubmissionQueryKey = ["submission", string, number, number, number];
 
-function submissionQueryKey(classid: string, assignmentNumber: number, groupNumber: number, submissionNumber: number): SubmissionQueryKey {
-    return ['submission', classid, assignmentNumber, groupNumber, submissionNumber];
+function submissionQueryKey(
+    classid: string,
+    assignmentNumber: number,
+    groupNumber: number,
+    submissionNumber: number,
+): SubmissionQueryKey {
+    return ["submission", classid, assignmentNumber, groupNumber, submissionNumber];
 }
 
 export async function invalidateAllSubmissionKeys(
@@ -29,7 +39,7 @@ export async function invalidateAllSubmissionKeys(
     groupNumber?: number,
     submissionNumber?: number,
 ): Promise<void> {
-    const keys = ['submission'];
+    const keys = ["submission"];
 
     await Promise.all(
         keys.map(async (key) => {
@@ -37,17 +47,17 @@ export async function invalidateAllSubmissionKeys(
                 (arg) => arg !== undefined,
             );
             return queryClient.invalidateQueries({ queryKey: queryKey });
-        })
+        }),
     );
 
     await queryClient.invalidateQueries({
-        queryKey: ['submissions', classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined),
+        queryKey: ["submissions", classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined),
     });
     await queryClient.invalidateQueries({
-        queryKey: ['group-submissions', classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined),
+        queryKey: ["group-submissions", classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined),
     });
     await queryClient.invalidateQueries({
-        queryKey: ['assignment-submissions', classid, assignmentNumber].filter((arg) => arg !== undefined),
+        queryKey: ["assignment-submissions", classid, assignmentNumber].filter((arg) => arg !== undefined),
     });
 }
 
@@ -135,8 +145,8 @@ export function useCreateSubmissionMutation(): UseMutationReturnType<
                 const cls = response.submission.group.class;
                 const assignment = response.submission.group.assignment;
 
-                const cid = typeof cls === 'string' ? cls : cls.id;
-                const an = typeof assignment === 'number' ? assignment : assignment.id;
+                const cid = typeof cls === "string" ? cls : cls.id;
+                const an = typeof assignment === "number" ? assignment : assignment.id;
                 const gn = response.submission.group.groupNumber;
 
                 await invalidateAllSubmissionKeys(queryClient, cid, an, gn);
@@ -162,8 +172,8 @@ export function useDeleteSubmissionMutation(): UseMutationReturnType<
                 const cls = response.submission.group.class;
                 const assignment = response.submission.group.assignment;
 
-                const cid = typeof cls === 'string' ? cls : cls.id;
-                const an = typeof assignment === 'number' ? assignment : assignment.id;
+                const cid = typeof cls === "string" ? cls : cls.id;
+                const an = typeof assignment === "number" ? assignment : assignment.id;
                 const gn = response.submission.group.groupNumber;
 
                 await invalidateAllSubmissionKeys(queryClient, cid, an, gn);

From 5bd7b64dd641507d60f7f8894699ef62f5e42a0f Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Thu, 17 Apr 2025 09:59:52 +0200
Subject: [PATCH 177/177] text(backend): Fix swagger

---
 backend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/package.json b/backend/package.json
index 3a89eb87..40d49982 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -12,7 +12,7 @@
         "format": "prettier --write src/",
         "format-check": "prettier --check src/",
         "lint": "eslint . --fix",
-        "pretest:unit": "npm run build",
+        "pretest:unit": "tsx ../docs/api/generate.ts && npm run build",
         "test:unit": "vitest --run"
     },
     "dependencies": {