From c04b13c555b23df6efecc8dea42db81020cc41f8 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Tue, 20 May 2025 09:34:58 +0000 Subject: [PATCH 1/3] style: fix linting issues met Prettier --- frontend/src/components/QuestionBox.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/QuestionBox.vue b/frontend/src/components/QuestionBox.vue index ef021793..c582149d 100644 --- a/frontend/src/components/QuestionBox.vue +++ b/frontend/src/components/QuestionBox.vue @@ -2,7 +2,7 @@ import authService from "@/services/auth/auth-service.ts"; import { Language } from "@/data-objects/language.ts"; import { computed, type ComputedRef, ref } from "vue"; - import type { GroupDTOId } from "@dwengo-1/common/interfaces/group"; + import type { GroupDTOId } from "@dwengo-1/common/interfaces/group"; import type { QuestionData } from "@dwengo-1/common/interfaces/question"; import type { LearningObjectIdentifierDTO } from "@dwengo-1/interfaces/learning-content"; import { useCreateQuestionMutation } from "@/queries/questions.ts"; @@ -29,9 +29,7 @@ })); const createQuestionMutation = useCreateQuestionMutation(loID); - const showQuestionBox = computed( - () => authService.authState.activeRole === AccountType.Student && props.forGroup, - ); + const showQuestionBox = computed(() => authService.authState.activeRole === AccountType.Student && props.forGroup); function submitQuestion(): void { if (props.forGroup && questionInput.value !== "") { From dea99307053d236fa6608ae8c1bf1b03adc5d422 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Tue, 20 May 2025 13:13:23 +0200 Subject: [PATCH 2/3] fix: groupId -> forGroup --- backend/src/middleware/auth/checks/submission-checks.ts | 6 +++--- frontend/src/controllers/submissions.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/middleware/auth/checks/submission-checks.ts b/backend/src/middleware/auth/checks/submission-checks.ts index 9caae176..1b781773 100644 --- a/backend/src/middleware/auth/checks/submission-checks.ts +++ b/backend/src/middleware/auth/checks/submission-checks.ts @@ -34,15 +34,15 @@ export const onlyAllowIfHasAccessToSubmission = authorize(async (auth: Authentic }); export const onlyAllowIfHasAccessToSubmissionFromParams = authorize(async (auth: AuthenticationInfo, req: AuthenticatedRequest) => { - const { classId, assignmentId, groupId } = req.query; + const { classId, assignmentId, forGroup } = req.query; - requireFields({ classId, assignmentId, groupId }); + requireFields({ classId, assignmentId, forGroup }); if (auth.accountType === AccountType.Teacher) { const cls = await fetchClass(classId as string); return cls.teachers.map(mapToUsername).includes(auth.username); } - const group = await fetchGroup(classId as string, Number(assignmentId as string), Number(groupId as string)); + const group = await fetchGroup(classId as string, Number(assignmentId as string), Number(forGroup as string)); return group.members.map(mapToUsername).includes(auth.username); }); diff --git a/frontend/src/controllers/submissions.ts b/frontend/src/controllers/submissions.ts index 0be1c122..69204633 100644 --- a/frontend/src/controllers/submissions.ts +++ b/frontend/src/controllers/submissions.ts @@ -23,7 +23,7 @@ export class SubmissionController extends BaseController { groupId?: number, full = true, ): Promise { - return this.get(`/`, { language, version, classId, assignmentId, groupId, full }); + return this.get(`/`, { language, version, classId, assignmentId, forGroup: groupId, full }); } async getByNumber( @@ -39,7 +39,7 @@ export class SubmissionController extends BaseController { version, classId, assignmentId, - groupId, + forGroup: groupId, }); } From 4b5f2152466166152d00adfb992bdea0222dc3be Mon Sep 17 00:00:00 2001 From: Lint Action Date: Tue, 20 May 2025 11:16:13 +0000 Subject: [PATCH 3/3] style: fix linting issues met Prettier --- frontend/src/controllers/submissions.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/controllers/submissions.ts b/frontend/src/controllers/submissions.ts index 69204633..1ce639ee 100644 --- a/frontend/src/controllers/submissions.ts +++ b/frontend/src/controllers/submissions.ts @@ -23,7 +23,14 @@ export class SubmissionController extends BaseController { groupId?: number, full = true, ): Promise { - return this.get(`/`, { language, version, classId, assignmentId, forGroup: groupId, full }); + return this.get(`/`, { + language, + version, + classId, + assignmentId, + forGroup: groupId, + full, + }); } async getByNumber(