From 1c99b03554c02869a5ec69c7645de744fce619ce Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Wed, 9 Apr 2025 19:26:38 +0200 Subject: [PATCH 01/39] 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 = true): UseQueryReturnType { + return useQuery({ + queryKey: computed(() => (classesQueryKey())), + queryFn: async () => classController.getAll(toValue(full)), + }); +} + +export function useClassQuery( + id: MaybeRefOrGetter, +): UseQueryReturnType { + 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 Date: Wed, 9 Apr 2025 19:42:02 +0200 Subject: [PATCH 02/39] 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 = true): UseQueryReturnType { return useQuery({ @@ -27,4 +36,37 @@ export function useClassQuery( queryFn: async () => classController.getById(toValue(id)!), enabled: () => Boolean(toValue(id)), }); +} + +export function useClassStudentsQuery( + id: MaybeRefOrGetter, + full: MaybeRefOrGetter = true +): UseQueryReturnType { + return useQuery({ + queryKey: computed(() => classStudentsKey(toValue(id)!)), + queryFn: async () => classController.getStudents(toValue(id)!, toValue(full)!), + enabled: () => Boolean(toValue(id)), + }) +} + +export function useClassTeachersQuery( + id: MaybeRefOrGetter, + full: MaybeRefOrGetter = true +): UseQueryReturnType { + return useQuery({ + queryKey: computed(() => classTeachersKey(toValue(id)!)), + queryFn: async () => classController.getTeachers(toValue(id)!, toValue(full)!), + enabled: () => Boolean(toValue(id)), + }); +} + +export function useClassTeacherInvitationsQuery( + id: MaybeRefOrGetter, + full: MaybeRefOrGetter = true +): UseQueryReturnType { + 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 Date: Wed, 9 Apr 2025 19:46:05 +0200 Subject: [PATCH 03/39] 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 = true): UseQueryReturnType { 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, + full: MaybeRefOrGetter = true +): UseQueryReturnType { + 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 Date: Wed, 9 Apr 2025 21:16:28 +0200 Subject: [PATCH 04/39] 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 { + 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 = true): UseQueryReturnType { return useQuery({ queryKey: computed(() => (classesQueryKey())), @@ -41,6 +51,39 @@ export function useClassQuery( }); } +export function useCreateClassMutation(): UseMutationReturnType { + const queryClient = useQueryClient(); + + return useMutation({ + mutationFn: async (data) => classController.createClass(data), + onSuccess: async () => { + await queryClient.invalidateQueries({ queryKey: ["classes"] }); + }, + }); +} + +export function useDeleteClassMutation(): UseMutationReturnType { + const queryClient = useQueryClient(); + + return useMutation({ + mutationFn: async (id) => classController.deleteClass(id), + onSuccess: async (data) => { + await invalidateAll(data.class.id, queryClient); + }, + }); +} + +export function useUpdateClassMutation(): UseMutationReturnType { + 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, full: MaybeRefOrGetter = true From 02076212fee06958bbf2dd650277414ed8789694 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Wed, 9 Apr 2025 21:23:17 +0200 Subject: [PATCH 05/39] 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 { 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 = true): UseQueryReturnType { return useQuery({ queryKey: computed(() => (classesQueryKey())), @@ -95,6 +98,18 @@ export function useClassStudentsQuery( }) } +export function useCreateClassStudentMutation(): UseMutationReturnType { + 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, full: MaybeRefOrGetter = true @@ -106,6 +121,18 @@ export function useClassTeachersQuery( }); } +export function useCreateClassTeacherMutation(): UseMutationReturnType { + 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, full: MaybeRefOrGetter = true From 77ca390bd2ea1bc5cbeabf2f23df2a3c00164bc2 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Wed, 9 Apr 2025 21:28:04 +0200 Subject: [PATCH 06/39] 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 { +export function useClassAddStudentMutation(): UseMutationReturnType { const queryClient = useQueryClient(); return useMutation({ @@ -110,6 +110,18 @@ export function useCreateClassStudentMutation(): UseMutationReturnType { + 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, full: MaybeRefOrGetter = true @@ -121,7 +133,7 @@ export function useClassTeachersQuery( }); } -export function useCreateClassTeacherMutation(): UseMutationReturnType { +export function useClassAddTeacherMutation(): UseMutationReturnType { const queryClient = useQueryClient(); return useMutation({ @@ -133,6 +145,18 @@ export function useCreateClassTeacherMutation(): UseMutationReturnType { + 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, full: MaybeRefOrGetter = true From 5c9314aa5968a37ecfda9ba868899c65ef87c8c4 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Wed, 9 Apr 2025 21:53:41 +0200 Subject: [PATCH 07/39] 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 { return this.get(`/`, { full }); } - async getByNumber(num: number): Promise { + async getByNumber(num: number | string): Promise { return this.get(`/${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 { + groupController.update(classid, assignmentNumber); + + return useQuery({ + queryKey: computed(() => (groupsQueryKey(classid, assignmentNumber))), + queryFn: async () => groupController.getAll(), + }); +} + +export function useGroupQuery( + classid: string, + assignmentNumber: number, + groupNumber: MaybeRefOrGetter, +): UseQueryReturnType { + 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, + full: MaybeRefOrGetter = true, +): UseQueryReturnType { + 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, + full: MaybeRefOrGetter = true, +): UseQueryReturnType { + 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 Date: Wed, 9 Apr 2025 21:56:39 +0200 Subject: [PATCH 08/39] 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 Date: Wed, 9 Apr 2025 22:06:52 +0200 Subject: [PATCH 09/39] 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, full: MaybeRefOrGetter = true, ): UseQueryReturnType { - 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 Date: Wed, 9 Apr 2025 22:29:08 +0200 Subject: [PATCH 10/39] 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 { - return this.get(`/`, { full }); + protected getBasePath(classid: string, assignmentNumber: number) { + return `class/${classid}/assignments/${assignmentNumber}/groups`; } - async getByNumber(num: number | string): Promise { - return this.get(`/${num}`); + async getAll(classid: string, assignmentNumber: number, full = true): Promise { + return this.get(`${this.getBasePath(classid, assignmentNumber)}/`, { full }); } - async createGroup(data: GroupDTO): Promise { - return this.post(`/`, data); + async getByNumber(classid: string, assignmentNumber: number, num: number | string): Promise { + return this.get(`${this.getBasePath(classid, assignmentNumber)}/${num}`); } - async deleteGroup(num: number): Promise { - return this.delete(`/${num}`); + async createGroup(classid: string, assignmentNumber: number, data: GroupDTO): Promise { + return this.post(`${this.getBasePath(classid, assignmentNumber)}/`, data); } - async updateGroup(num: number, data: Partial): Promise { - return this.put(`/${num}`, data); + async deleteGroup(classid: string, assignmentNumber: number, num: number): Promise { + return this.delete(`${this.getBasePath(classid, assignmentNumber)}/${num}`); } - async getSubmissions(groupNumber: number, full = true): Promise { - return this.get(`/${groupNumber}/submissions`, { full }); + async updateGroup(classid: string, assignmentNumber: number, num: number, data: Partial): Promise { + return this.put(`${this.getBasePath(classid, assignmentNumber)}/${num}`, data); } - async getQuestions(groupNumber: number, full = true): Promise { - return this.get(`/${groupNumber}/questions`, { full }); + async getSubmissions(classid: string, assignmentNumber: number, groupNumber: number, full = true): Promise { + return this.get(`${this.getBasePath(classid, assignmentNumber)}/${groupNumber}/submissions`, { full }); + } + + async getQuestions(classid: string, assignmentNumber: number, groupNumber: number, full = true): Promise { + return this.get(`${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, + assignmentNumber: MaybeRefOrGetter, + groupNumber: MaybeRefOrGetter, +) { + return { cid: toValue(classid), an: toValue(assignmentNumber), gn: toValue(groupNumber) }; +} + export function useGroupsQuery( - classid: string, - assignmentNumber: number, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, ): UseQueryReturnType { - 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, ): UseQueryReturnType { - 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, full: MaybeRefOrGetter = true, ): UseQueryReturnType { - 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, + assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, full: MaybeRefOrGetter = true, ): UseQueryReturnType { - 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 311e76149c1f27513bef421f3304e703c51a5092 Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Sat, 12 Apr 2025 17:55:39 +0200 Subject: [PATCH 11/39] 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 { + 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 { + 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 { + 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 { + 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 { + 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 { + 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 { + 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 Date: Sat, 12 Apr 2025 18:21:43 +0200 Subject: [PATCH 12/39] 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 { 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 = true): UseQueryReturnType { return useQuery({ - queryKey: computed(() => (classesQueryKey())), + queryKey: computed(() => (classesQueryKey(toValue(full)))), queryFn: async () => classController.getAll(toValue(full)), }); } @@ -60,7 +62,8 @@ export function useCreateClassMutation(): UseMutationReturnType 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 = true ): UseQueryReturnType { 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 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 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 = true ): UseQueryReturnType { 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 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 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 = true ): UseQueryReturnType { 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 = true ): UseQueryReturnType { 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 Date: Sat, 12 Apr 2025 18:26:32 +0200 Subject: [PATCH 13/39] 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, assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, + full: MaybeRefOrGetter, ) { - 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, assignmentNumber: MaybeRefOrGetter, ): UseQueryReturnType { - 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, ): UseQueryReturnType { - 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, full: MaybeRefOrGetter = true, ): UseQueryReturnType { - 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, full: MaybeRefOrGetter = true, ): UseQueryReturnType { - 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 Date: Sat, 12 Apr 2025 19:27:56 +0200 Subject: [PATCH 14/39] 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, + assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, ): UseQueryReturnType { 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, + assignmentNumber: MaybeRefOrGetter, +): UseMutationReturnType { + 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, + assignmentNumber: MaybeRefOrGetter, +): UseMutationReturnType { + 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, + assignmentNumber: MaybeRefOrGetter, +): UseMutationReturnType { + 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, + assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, full: MaybeRefOrGetter = true, ): UseQueryReturnType { From 2cda69ef5ef4f79e0d4aeb9b6eed9b10e8bc3c29 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sat, 12 Apr 2025 19:56:04 +0200 Subject: [PATCH 15/39] 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 { @@ -22,7 +26,7 @@ export class SubmissionController extends BaseController { return this.get(`/${submissionNumber}`); } - async createSubmission(data: unknown): Promise { + async createSubmission(data: SubmissionDTO): Promise { return this.post(`/`, 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, + assignmentNumber: MaybeRefOrGetter, + groupNumber: MaybeRefOrGetter, + submissionNumber: MaybeRefOrGetter, + full: MaybeRefOrGetter, +) { + return { + cid: toValue(classid), + an: toValue(assignmentNumber), + gn: toValue(groupNumber), + sn: toValue(submissionNumber), + f: toValue(full) + }; +} + +export function useSubmissionsQuery( + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, + groupNumber: MaybeRefOrGetter, + full: MaybeRefOrGetter = true, +): UseQueryReturnType { + 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, + assignmentNumber: MaybeRefOrGetter, + groupNumber: MaybeRefOrGetter, +): UseQueryReturnType { + 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 Date: Sat, 12 Apr 2025 20:01:53 +0200 Subject: [PATCH 16/39] 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, assignmentNumber: MaybeRefOrGetter, ): UseMutationReturnType { @@ -82,7 +82,7 @@ export function useCreateClassMutation( }); } -export function useDeleteClassMutation( +export function useDeleteGroupMutation( classid: MaybeRefOrGetter, assignmentNumber: MaybeRefOrGetter, ): UseMutationReturnType { @@ -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, assignmentNumber: MaybeRefOrGetter, ): UseMutationReturnType { 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, + assignmentNumber: MaybeRefOrGetter, + groupNumber: MaybeRefOrGetter, +): UseMutationReturnType { + 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, + assignmentNumber: MaybeRefOrGetter, + groupNumber: MaybeRefOrGetter, +): UseMutationReturnType { + 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 Date: Sat, 12 Apr 2025 20:13:14 +0200 Subject: [PATCH 17/39] 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 { + return this.get(`/`, { full }); } - protected getBasePath(classid: string, assignmentNumber: number) { - return `class/${classid}/assignments/${assignmentNumber}/groups`; + async getByNumber(num: number): Promise { + return this.get(`/${num}`); } - async getAll(classid: string, assignmentNumber: number, full = true): Promise { - return this.get(`${this.getBasePath(classid, assignmentNumber)}/`, { full }); + async createGroup(data: GroupDTO): Promise { + return this.post(`/`, data); } - async getByNumber(classid: string, assignmentNumber: number, num: number | string): Promise { - return this.get(`${this.getBasePath(classid, assignmentNumber)}/${num}`); + async deleteGroup(num: number): Promise { + return this.delete(`/${num}`); } - async createGroup(classid: string, assignmentNumber: number, data: GroupDTO): Promise { - return this.post(`${this.getBasePath(classid, assignmentNumber)}/`, data); + async updateGroup(num: number, data: Partial): Promise { + return this.put(`/${num}`, data); } - async deleteGroup(classid: string, assignmentNumber: number, num: number): Promise { - return this.delete(`${this.getBasePath(classid, assignmentNumber)}/${num}`); + async getSubmissions(num: number, full = true): Promise { + return this.get(`/${num}/submissions`, { full }); } - async updateGroup(classid: string, assignmentNumber: number, num: number, data: Partial): Promise { - return this.put(`${this.getBasePath(classid, assignmentNumber)}/${num}`, data); - } - - async getSubmissions(classid: string, assignmentNumber: number, groupNumber: number, full = true): Promise { - return this.get(`${this.getBasePath(classid, assignmentNumber)}/${groupNumber}/submissions`, { full }); - } - - async getQuestions(classid: string, assignmentNumber: number, groupNumber: number, full = true): Promise { - return this.get(`${this.getBasePath(classid, assignmentNumber)}/${groupNumber}/questions`, { full }); + async getQuestions(num: number, full = true): Promise { + return this.get(`/${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, assignmentNumber: MaybeRefOrGetter, + full: MaybeRefOrGetter = true, ): UseQueryReturnType { - 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 Date: Sat, 12 Apr 2025 20:14:24 +0200 Subject: [PATCH 18/39] 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, assignmentNumber: MaybeRefOrGetter, From 3ee66d2f6799290e006c6e92a492791b34e80af0 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sat, 12 Apr 2025 21:26:42 +0200 Subject: [PATCH 19/39] 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, + assignmentNumber: MaybeRefOrGetter, + groupNumber: MaybeRefOrGetter, + full: MaybeRefOrGetter, +) { + return { cid: toValue(classid), an: toValue(assignmentNumber), gn: toValue(groupNumber), f: toValue(full) }; +} + +export function useAssignmentsQuery( + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, + full: MaybeRefOrGetter = true, +): UseQueryReturnType { + 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, + assignmentNumber: MaybeRefOrGetter, + groupNumber: MaybeRefOrGetter, +): UseQueryReturnType { + 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 Date: Sun, 13 Apr 2025 09:48:34 +0200 Subject: [PATCH 20/39] 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 { 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; + let res: Partial; + + 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 Date: Sun, 13 Apr 2025 11:41:34 +0200 Subject: [PATCH 21/39] 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, + assignmentNumber: MaybeRefOrGetter, + groupNumber: MaybeRefOrGetter, + full: MaybeRefOrGetter = true, +): UseQueryReturnType { + 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, + assignmentNumber: MaybeRefOrGetter, + groupNumber: MaybeRefOrGetter, + full: MaybeRefOrGetter = true, +): UseQueryReturnType { + 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, + assignmentNumber: MaybeRefOrGetter, + groupNumber: MaybeRefOrGetter, + full: MaybeRefOrGetter = true, +): UseQueryReturnType { + 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 Date: Sun, 13 Apr 2025 12:03:11 +0200 Subject: [PATCH 22/39] 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, - assignmentNumber: MaybeRefOrGetter, full: MaybeRefOrGetter = true, ): UseQueryReturnType { - 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, assignmentNumber: MaybeRefOrGetter, - groupNumber: MaybeRefOrGetter, ): UseQueryReturnType { - 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, +): UseMutationReturnType { + 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, + assignmentNumber: MaybeRefOrGetter, +): UseMutationReturnType { + 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, + assignmentNumber: MaybeRefOrGetter, +): UseMutationReturnType, 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 Date: Sun, 13 Apr 2025 14:37:29 +0200 Subject: [PATCH 23/39] 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, -): UseMutationReturnType { +export function useCreateAssignmentMutation(): UseMutationReturnType { 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, - assignmentNumber: MaybeRefOrGetter, -): UseMutationReturnType { +export function useDeleteAssignmentMutation(): UseMutationReturnType { 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, - assignmentNumber: MaybeRefOrGetter, -): UseMutationReturnType, unknown> { +export function useUpdateAssignmentMutation(): UseMutationReturnType}, 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 { - 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 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 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 Date: Sun, 13 Apr 2025 14:47:40 +0200 Subject: [PATCH 24/39] 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 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 { +export function useUpdateClassMutation(): UseMutationReturnType}, 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, - assignmentNumber: MaybeRefOrGetter, -): UseMutationReturnType { +export function useCreateGroupMutation(): UseMutationReturnType { 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, - assignmentNumber: MaybeRefOrGetter, -): UseMutationReturnType { +export function useDeleteGroupMutation(): UseMutationReturnType { 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, - assignmentNumber: MaybeRefOrGetter, -): UseMutationReturnType { +export function useUpdateGroupMutation(): UseMutationReturnType}, 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 Date: Sun, 13 Apr 2025 14:55:18 +0200 Subject: [PATCH 25/39] 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, - assignmentNumber: MaybeRefOrGetter, - groupNumber: MaybeRefOrGetter, -): UseMutationReturnType { +export function useCreateSubmissionMutation(): UseMutationReturnType { 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, - assignmentNumber: MaybeRefOrGetter, - groupNumber: MaybeRefOrGetter, -): UseMutationReturnType { +export function useDeleteSubmissionMutation(): UseMutationReturnType { 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 Date: Sun, 13 Apr 2025 13:00:05 +0000 Subject: [PATCH 26/39] 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 { 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 { 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 { 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 { 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 Date: Sun, 13 Apr 2025 13:00:10 +0000 Subject: [PATCH 27/39] 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, - assignmentNumber: MaybeRefOrGetter, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, full: MaybeRefOrGetter, ) { @@ -54,21 +60,21 @@ function toValues( } export function useAssignmentsQuery( - classid: MaybeRefOrGetter, + classid: MaybeRefOrGetter, full: MaybeRefOrGetter = true, ): UseQueryReturnType { 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, - assignmentNumber: MaybeRefOrGetter, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, ): UseQueryReturnType { const { cid, an } = toValues(classid, assignmentNumber, 1, true); @@ -79,18 +85,28 @@ export function useAssignmentQuery( }); } -export function useCreateAssignmentMutation(): UseMutationReturnType { +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 { +export function useDeleteAssignmentMutation(): UseMutationReturnType< + AssignmentResponse, + Error, + { cid: string; an: number }, + unknown +> { const queryClient = useQueryClient(); return useMutation({ @@ -106,7 +122,12 @@ export function useDeleteAssignmentMutation(): UseMutationReturnType}, unknown> { +export function useUpdateAssignmentMutation(): UseMutationReturnType< + AssignmentResponse, + Error, + { cid: string; an: number; data: Partial }, + unknown +> { const queryClient = useQueryClient(); return useMutation({ @@ -116,14 +137,14 @@ export function useUpdateAssignmentMutation(): UseMutationReturnType, - assignmentNumber: MaybeRefOrGetter, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, full: MaybeRefOrGetter = true, ): UseQueryReturnType { @@ -137,8 +158,8 @@ export function useAssignmentSubmissionsQuery( } export function useAssignmentQuestionsQuery( - classid: MaybeRefOrGetter, - assignmentNumber: MaybeRefOrGetter, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, full: MaybeRefOrGetter = true, ): UseQueryReturnType { @@ -152,8 +173,8 @@ export function useAssignmentQuestionsQuery( } export function useAssignmentGroupsQuery( - classid: MaybeRefOrGetter, - assignmentNumber: MaybeRefOrGetter, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, full: MaybeRefOrGetter = true, ): UseQueryReturnType { @@ -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 = true): UseQueryReturnType { return useQuery({ - queryKey: computed(() => (classesQueryKey(toValue(full)))), + queryKey: computed(() => classesQueryKey(toValue(full))), queryFn: async () => classController.getAll(toValue(full)), }); } -export function useClassQuery( - id: MaybeRefOrGetter, -): UseQueryReturnType { +export function useClassQuery(id: MaybeRefOrGetter): UseQueryReturnType { return useQuery({ queryKey: computed(() => classQueryKey(toValue(id)!)), queryFn: async () => classController.getById(toValue(id)!), @@ -70,7 +69,7 @@ export function useCreateClassMutation(): UseMutationReturnType classController.createClass(data), onSuccess: async () => { - await queryClient.invalidateQueries({ queryKey: [ "classes" ] }); + await queryClient.invalidateQueries({ queryKey: ["classes"] }); }, }); } @@ -89,7 +88,12 @@ export function useDeleteClassMutation(): UseMutationReturnType}, unknown> { +export function useUpdateClassMutation(): UseMutationReturnType< + ClassResponse, + Error, + { cid: string; data: Partial }, + unknown +> { const queryClient = useQueryClient(); return useMutation({ @@ -105,16 +109,21 @@ export function useUpdateClassMutation(): UseMutationReturnType, - full: MaybeRefOrGetter = true + full: MaybeRefOrGetter = true, ): UseQueryReturnType { 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 { +export function useClassAddStudentMutation(): UseMutationReturnType< + ClassResponse, + Error, + { id: string; username: string }, + unknown +> { const queryClient = useQueryClient(); return useMutation({ @@ -127,7 +136,12 @@ export function useClassAddStudentMutation(): UseMutationReturnType { +export function useClassDeleteStudentMutation(): UseMutationReturnType< + ClassResponse, + Error, + { id: string; username: string }, + unknown +> { const queryClient = useQueryClient(); return useMutation({ @@ -142,7 +156,7 @@ export function useClassDeleteStudentMutation(): UseMutationReturnType, - full: MaybeRefOrGetter = true + full: MaybeRefOrGetter = true, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => classTeachersKey(toValue(id)!, toValue(full))), @@ -151,7 +165,12 @@ export function useClassTeachersQuery( }); } -export function useClassAddTeacherMutation(): UseMutationReturnType { +export function useClassAddTeacherMutation(): UseMutationReturnType< + ClassResponse, + Error, + { id: string; username: string }, + unknown +> { const queryClient = useQueryClient(); return useMutation({ @@ -164,7 +183,12 @@ export function useClassAddTeacherMutation(): UseMutationReturnType { +export function useClassDeleteTeacherMutation(): UseMutationReturnType< + ClassResponse, + Error, + { id: string; username: string }, + unknown +> { const queryClient = useQueryClient(); return useMutation({ @@ -179,7 +203,7 @@ export function useClassDeleteTeacherMutation(): UseMutationReturnType, - full: MaybeRefOrGetter = true + full: MaybeRefOrGetter = true, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => classTeacherInvitationsKey(toValue(id)!, toValue(full))), @@ -190,11 +214,11 @@ export function useClassTeacherInvitationsQuery( export function useClassAssignmentsQuery( id: MaybeRefOrGetter, - full: MaybeRefOrGetter = true + full: MaybeRefOrGetter = true, ): UseQueryReturnType { 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, - assignmentNumber: MaybeRefOrGetter, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, full: MaybeRefOrGetter, ) { @@ -58,22 +63,22 @@ function toValues( } export function useGroupsQuery( - classid: MaybeRefOrGetter, - assignmentNumber: MaybeRefOrGetter, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, full: MaybeRefOrGetter = true, ): UseQueryReturnType { 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, - assignmentNumber: MaybeRefOrGetter, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, ): UseQueryReturnType { const { cid, an, gn } = toValues(classid, assignmentNumber, groupNumber, true); @@ -85,14 +90,22 @@ export function useGroupQuery( }); } -export function useCreateGroupMutation(): UseMutationReturnType { +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 { +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}, unknown> { +export function useUpdateGroupMutation(): UseMutationReturnType< + GroupResponse, + Error, + { cid: string; an: number; gn: number; data: Partial }, + 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, - assignmentNumber: MaybeRefOrGetter, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, full: MaybeRefOrGetter = true, ): UseQueryReturnType { @@ -147,8 +176,8 @@ export function useGroupSubmissionsQuery( } export function useGroupQuestionsQuery( - classid: MaybeRefOrGetter, - assignmentNumber: MaybeRefOrGetter, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, full: MaybeRefOrGetter = true, ): UseQueryReturnType { 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, - assignmentNumber: MaybeRefOrGetter, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, submissionNumber: MaybeRefOrGetter, full: MaybeRefOrGetter, ) { - 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, - assignmentNumber: MaybeRefOrGetter, - groupNumber: MaybeRefOrGetter, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, + groupNumber: MaybeRefOrGetter, full: MaybeRefOrGetter = true, ): UseQueryReturnType { 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, - assignmentNumber: MaybeRefOrGetter, + classid: MaybeRefOrGetter, + assignmentNumber: MaybeRefOrGetter, groupNumber: MaybeRefOrGetter, ): UseQueryReturnType { const { cid, an, gn, sn, f } = toValues(classid, assignmentNumber, groupNumber, 1, true); @@ -87,20 +102,25 @@ export function useSubmissionQuery( }); } -export function useCreateSubmissionMutation(): UseMutationReturnType { +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 { +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 Date: Sun, 13 Apr 2025 15:01:22 +0200 Subject: [PATCH 28/39] 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 { return this.get(`/`, { full }); } From 834e991568fbcdc50eb5f5f138d433d644ca6309 Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Sun, 13 Apr 2025 19:40:20 +0200 Subject: [PATCH 29/39] 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 { dotenv.config({ path: '.env.test' }); @@ -28,8 +29,8 @@ export async function setupTestApp(): Promise { 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 { 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 @@ - {{ (i.class as ClassDTO).displayName }} + {{ i.classId }} {{ (i.sender as TeacherDTO).firstName + " " + (i.sender as TeacherDTO).lastName }} From 17dc9649c5b4c4048586dd361cabc2049fd83118 Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Sun, 13 Apr 2025 20:50:15 +0200 Subject: [PATCH 30/39] 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 { + return this.get(`/${username}`, { by }); + } + + async create(data: TeacherInvitationData): Promise { + return this.post("/", data); + } + + async respond(data: TeacherInvitationData, accepted: boolean): Promise { + return this.delete(`/${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 +): UseQueryReturnType { + 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 +): UseQueryReturnType { + return useQuery({ + queryFn: computed(() => controller.getAll(toValue(username), false)), + enabled: () => Boolean(toValue(username)), + }) +} + +export function useCreateTeacherInvitationMutation(): UseMutationReturnType{ + return useMutation({ + mutationFn: async (data: TeacherInvitationData) => controller.create(data) + }) +} + +export function useAcceptTeacherInvitationMutation(): UseMutationReturnType { + return useMutation({ + mutationFn: async (data: TeacherInvitationData) => controller.respond(data, true) + }) +} + +export function useDeclineTeacherInvitationMutation(): UseMutationReturnType { + return useMutation({ + mutationFn: async (data: TeacherInvitationData) => controller.respond(data, false) + }) +} + +export function useDeleteTeacherInvitationMutation(): UseMutationReturnType { + return useMutation({ + mutationFn: async (data: TeacherInvitationData) => controller.respond(data, false) + }) +} + + From a824cdff9475d9fd4444d428080bdcd500f98f72 Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Sun, 13 Apr 2025 20:54:05 +0200 Subject: [PATCH 31/39] 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 { 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 { 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 ): UseQueryReturnType { 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 ): UseQueryReturnType { 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 Date: Sun, 13 Apr 2025 18:59:56 +0000 Subject: [PATCH 32/39] 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 { 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 { const teacher = await fetchTeacher(username); @@ -29,12 +29,12 @@ export async function createInvitation(data: TeacherInvitationData): Promise { +export async function deleteInvitationFor( + usernameSender: string, + usernameReceiver: string, + classId: string, + accepted: boolean +): Promise { 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; @@ -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 { 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 +export function useTeacherInvitationsByQuery( + username: MaybeRefOrGetter, ): UseQueryReturnType { 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 +export function useTeacherInvitationsForQuery( + username: MaybeRefOrGetter, ): UseQueryReturnType { return useQuery({ queryFn: computed(async () => controller.getAll(toValue(username), false)), enabled: () => Boolean(toValue(username)), - }) + }); } -export function useCreateTeacherInvitationMutation(): UseMutationReturnType{ +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 { +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 { +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 { +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" > - {{ i.classId }} + {{ i.classId }} + {{ (i.sender as TeacherDTO).firstName + " " + (i.sender as TeacherDTO).lastName }} From f3d2b3313c43f30e75b52f020600bf9d2e6fe2b3 Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Mon, 14 Apr 2025 16:50:54 +0200 Subject: [PATCH 33/39] 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 { 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 { + 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 { 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 { - 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 { + 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 { + 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 { public async findAllRequestsBy(requester: Student): Promise { return this.findAll({ where: { requester: requester } }); } public async findAllOpenRequestsTo(clazz: Class): Promise { - 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 { 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 { public async findAllInvitationsForClass(clazz: Class): Promise { @@ -11,7 +12,7 @@ export class TeacherInvitationRepository extends DwengoEntityRepository { - 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 { 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 { +export async function getAllInvitations(username: string, sent: boolean): Promise { 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 { +async function fetchInvitation(usernameSender: string, usernameReceiver: string, classId: string): Promise { + 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 { - const teacherInvitationRepository = getTeacherInvitationRepository(); - const sender = await fetchTeacher(usernameSender); - const receiver = await fetchTeacher(usernameReceiver); +export async function getInvitation(sender: string, receiver: string, classId: string): Promise { + const invitation = await fetchInvitation(sender, receiver, classId); + return mapToTeacherInvitationDTO(invitation); +} - const cls = await fetchClass(classId); +export async function updateInvitation(data: TeacherInvitationData): Promise { + 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 { + 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 { @@ -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; @@ -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 Date: Mon, 14 Apr 2025 14:52:59 +0000 Subject: [PATCH 34/39] 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 Date: Mon, 14 Apr 2025 14:53:04 +0000 Subject: [PATCH 35/39] 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 { 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 { public async findAllInvitationsForClass(clazz: Class): Promise { 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 { 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; @@ -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 Date: Tue, 15 Apr 2025 17:33:03 +0200 Subject: [PATCH 36/39] 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; @@ -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 { - return this.get(`/${username}`, { by }); + async getAll(username: string, sent: boolean): Promise { + return this.get(`/${username}`, { sent }); + } + + async getBy(data: TeacherInvitationData): Promise { + return this.get(`/${data.sender}/${data.receiver}/${data.class}`) } async create(data: TeacherInvitationData): Promise { return this.post("/", data); } - async respond(data: TeacherInvitationData, accepted: boolean): Promise { - return this.delete(`/${data.sender}/${data.receiver}/${data.class}`, { accepted }); + async remove(data: TeacherInvitationData): Promise { + return this.delete(`/${data.sender}/${data.receiver}/${data.class}`); + } + + async respond(data: TeacherInvitationData) { + return this.put("/", 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, ): UseQueryReturnType { 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, ): UseQueryReturnType { return useQuery({ @@ -35,6 +35,15 @@ export function useTeacherInvitationsForQuery( }); } +export function useTeacherInvitationQuery( + data: MaybeRefOrGetter, +): UseQueryReturnType { + 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 Date: Tue, 15 Apr 2025 17:36:13 +0200 Subject: [PATCH 37/39] 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(`/${data.sender}/${data.receiver}/${data.class}`); } - async respond(data: TeacherInvitationData) { + async respond(data: TeacherInvitationData): Promise { return this.put("/", data); } } From 447aeee9f3b504ec1bbea2b29226cc9394293908 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Tue, 15 Apr 2025 15:44:17 +0000 Subject: [PATCH 38/39] 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 Date: Tue, 15 Apr 2025 15:44:22 +0000 Subject: [PATCH 39/39] 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; @@ -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 { - return this.get(`/${data.sender}/${data.receiver}/${data.class}`) + return this.get(`/${data.sender}/${data.receiver}/${data.class}`); } async create(data: TeacherInvitationData): Promise {