From 62711f323dc8a3ffbc0e21e83392f7fc1b83cc2a Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 30 Mar 2025 19:24:52 +0200 Subject: [PATCH 01/94] feat: assignment/questions endpoint toegevoegd --- backend/src/controllers/classes.ts | 4 +- backend/src/controllers/groups.ts | 1 + .../src/data/questions/question-repository.ts | 9 +++ backend/src/routes/groups.ts | 9 +-- backend/src/services/assignments.ts | 59 +++++++++++++------ backend/src/services/classes.ts | 29 ++++----- backend/src/services/groups.ts | 51 +++++----------- 7 files changed, 82 insertions(+), 80 deletions(-) diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts index 7526f7c4..ba11da8e 100644 --- a/backend/src/controllers/classes.ts +++ b/backend/src/controllers/classes.ts @@ -1,5 +1,5 @@ import { Request, Response } from 'express'; -import { createClass, getAllClasses, getClass, getClassStudents, getClassStudentsIds, getClassTeacherInvitations } from '../services/classes.js'; +import { createClass, getAllClasses, getClass, getClassStudents, getClassTeacherInvitations } from '../services/classes.js'; import { ClassDTO } from '../interfaces/class.js'; export async function getAllClassesHandler(req: Request, res: Response): Promise { @@ -47,7 +47,7 @@ export async function getClassStudentsHandler(req: Request, res: Response): Prom const classId = req.params.id; const full = req.query.full === 'true'; - const students = full ? await getClassStudents(classId) : await getClassStudentsIds(classId); + const students = getClassStudents(classId, full); res.json({ students: students, diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts index 38d5d5d0..58624186 100644 --- a/backend/src/controllers/groups.ts +++ b/backend/src/controllers/groups.ts @@ -12,6 +12,7 @@ interface GroupParams { export async function getGroupHandler(req: Request, res: Response): Promise { const classId = req.params.classid; const full = req.query.full === 'true'; + const assignmentId = +req.params.assignmentid; if (isNaN(assignmentId)) { diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts index 9207e1dd..3fc92df1 100644 --- a/backend/src/data/questions/question-repository.ts +++ b/backend/src/data/questions/question-repository.ts @@ -3,6 +3,7 @@ import { Question } from '../../entities/questions/question.entity.js'; import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js'; import { Student } from '../../entities/users/student.entity.js'; import { LearningObject } from '../../entities/content/learning-object.entity.js'; +import { Assignment } from '../../entities/assignments/assignment.entity.js'; export class QuestionRepository extends DwengoEntityRepository { public createQuestion(question: { loId: LearningObjectIdentifier; author: Student; content: string }): Promise { @@ -54,4 +55,12 @@ export class QuestionRepository extends DwengoEntityRepository { orderBy: { timestamp: 'ASC' }, }); } + + public findAllByAssignment(assignment: Assignment): Promise { + return this.find({ + author: assignment.groups.flatMap(group => group.members), + learningObjectHruid: assignment.learningPathHruid, + learningObjectLanguage: assignment.learningPathLanguage, + }); + } } diff --git a/backend/src/routes/groups.ts b/backend/src/routes/groups.ts index 0c9692b0..81532a90 100644 --- a/backend/src/routes/groups.ts +++ b/backend/src/routes/groups.ts @@ -11,13 +11,6 @@ router.post('/', createGroupHandler); // Information about a group (members, ... [TODO DOC]) router.get('/:groupid', getGroupHandler); -router.get('/:groupid', getGroupSubmissionsHandler); - -// The list of questions a group has made -router.get('/:id/questions', (req, res) => { - res.json({ - questions: ['0'], - }); -}); +router.get('/:groupid/submissions', getGroupSubmissionsHandler); export default router; diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts index a21a96fa..05e8099a 100644 --- a/backend/src/services/assignments.ts +++ b/backend/src/services/assignments.ts @@ -1,7 +1,23 @@ -import { getAssignmentRepository, getClassRepository, getGroupRepository, getSubmissionRepository } from '../data/repositories.js'; +import { getAssignmentRepository, getClassRepository, getGroupRepository, getQuestionRepository, getSubmissionRepository } from '../data/repositories.js'; +import { Assignment } from '../entities/assignments/assignment.entity.js'; import { AssignmentDTO, mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId } from '../interfaces/assignment.js'; +import { mapToQuestionDTO, mapToQuestionId, QuestionDTO, QuestionId } from '../interfaces/question.js'; import { mapToSubmissionDTO, mapToSubmissionDTOId, SubmissionDTO, SubmissionDTOId } from '../interfaces/submission.js'; +export async function fetchAssignment(classid: string, assignmentNumber: number): Promise { + const classRepository = getClassRepository(); + const cls = await classRepository.findById(classid); + + if (!cls) { + return null; + } + + const assignmentRepository = getAssignmentRepository(); + const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber); + + return assignment; +} + export async function getAllAssignments(classid: string, full: boolean): Promise { const classRepository = getClassRepository(); const cls = await classRepository.findById(classid); @@ -43,15 +59,7 @@ export async function createAssignment(classid: string, assignmentData: Assignme } export async function getAssignment(classid: string, id: number): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classid); - - if (!cls) { - return null; - } - - const assignmentRepository = getAssignmentRepository(); - const assignment = await assignmentRepository.findByClassAndId(cls, id); + const assignment = await fetchAssignment(classid, id); if (!assignment) { return null; @@ -65,15 +73,7 @@ export async function getAssignmentsSubmissions( assignmentNumber: number, full: boolean ): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classid); - - if (!cls) { - return []; - } - - const assignmentRepository = getAssignmentRepository(); - const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber); + const assignment = await fetchAssignment(classid, assignmentNumber); if (!assignment) { return []; @@ -91,3 +91,24 @@ export async function getAssignmentsSubmissions( return submissions.map(mapToSubmissionDTOId); } + +export async function getAssignmentsQuestions( + classid: string, + assignmentNumber: number, + full: boolean +): Promise { + const assignment = await fetchAssignment(classid, assignmentNumber); + + if (!assignment) { + return []; + } + + const questionRepository = getQuestionRepository(); + const questions = await questionRepository.findAllByAssignment(assignment); + + if (full) { + return questions.map(mapToQuestionDTO); + } + + return questions.map(mapToQuestionDTO).map(mapToQuestionId); // mapToQuestionId should be updated +} \ No newline at end of file diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index 5b1e3cfc..dbf6c63d 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -1,4 +1,5 @@ import { getClassRepository, getStudentRepository, getTeacherInvitationRepository, getTeacherRepository } from '../data/repositories.js'; +import { Class } from '../entities/classes/class.entity.js'; import { ClassDTO, mapToClassDTO } from '../interfaces/class.js'; import { mapToStudentDTO, StudentDTO } from '../interfaces/student.js'; import { mapToTeacherInvitationDTO, mapToTeacherInvitationDTOIds, TeacherInvitationDTO } from '../interfaces/teacher-invitation.js'; @@ -6,6 +7,13 @@ import { getLogger } from '../logging/initalize.js'; const logger = getLogger(); +async function fetchClass(classid: string): Promise { + const classRepository = getClassRepository(); + const cls = await classRepository.findById(classid); + + return cls; +} + export async function getAllClasses(full: boolean): Promise { const classRepository = getClassRepository(); const classes = await classRepository.find({}, { populate: ['students', 'teachers'] }); @@ -47,8 +55,7 @@ export async function createClass(classData: ClassDTO): Promise } export async function getClass(classId: string): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classId); + const cls = await fetchClass(classId); if (!cls) { return null; @@ -57,24 +64,18 @@ export async function getClass(classId: string): Promise { return mapToClassDTO(cls); } -async function fetchClassStudents(classId: string): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classId); +export async function getClassStudents(classId: string, full: boolean): Promise { + const cls = await fetchClass(classId); if (!cls) { return []; } - return cls.students.map(mapToStudentDTO); -} + if (full) { + return cls.students.map(mapToStudentDTO); + } -export async function getClassStudents(classId: string): Promise { - return await fetchClassStudents(classId); -} - -export async function getClassStudentsIds(classId: string): Promise { - const students: StudentDTO[] = await fetchClassStudents(classId); - return students.map((student) => student.username); + return cls.students.map((student) => student.username); } export async function getClassTeacherInvitations(classId: string, full: boolean): Promise { diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts index 4a1cbbf0..7c5afb82 100644 --- a/backend/src/services/groups.ts +++ b/backend/src/services/groups.ts @@ -1,24 +1,20 @@ +import { assign } from '@mikro-orm/core'; import { getAssignmentRepository, getClassRepository, getGroupRepository, + getQuestionRepository, getStudentRepository, getSubmissionRepository, } from '../data/repositories.js'; import { Group } from '../entities/assignments/group.entity.js'; import { GroupDTO, mapToGroupDTO, mapToGroupDTOId } from '../interfaces/group.js'; import { mapToSubmissionDTO, mapToSubmissionDTOId, SubmissionDTO, SubmissionDTOId } from '../interfaces/submission.js'; +import { fetchAssignment } from './assignments.js'; +import { mapToQuestionDTO, mapToQuestionId, QuestionDTO, QuestionId } from '../interfaces/question.js'; -export async function getGroup(classId: string, assignmentNumber: number, groupNumber: number, full: boolean): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classId); - - if (!cls) { - return null; - } - - const assignmentRepository = getAssignmentRepository(); - const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber); +async function fetchGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise { + const assignment = await fetchAssignment(classId, assignmentNumber); if (!assignment) { return null; @@ -27,6 +23,12 @@ export async function getGroup(classId: string, assignmentNumber: number, groupN const groupRepository = getGroupRepository(); const group = await groupRepository.findByAssignmentAndGroupNumber(assignment, groupNumber); + return group; +} + +export async function getGroup(classId: string, assignmentNumber: number, groupNumber: number, full: boolean): Promise { + const group = await fetchGroup(classId, assignmentNumber, groupNumber); + if (!group) { return null; } @@ -76,15 +78,7 @@ export async function createGroup(groupData: GroupDTO, classid: string, assignme } export async function getAllGroups(classId: string, assignmentNumber: number, full: boolean): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classId); - - if (!cls) { - return []; - } - - const assignmentRepository = getAssignmentRepository(); - const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber); + const assignment = await fetchAssignment(classId, assignmentNumber); if (!assignment) { return []; @@ -94,8 +88,6 @@ export async function getAllGroups(classId: string, assignmentNumber: number, fu const groups = await groupRepository.findAllGroupsForAssignment(assignment); if (full) { - console.log('full'); - console.log(groups); return groups.map(mapToGroupDTO); } @@ -108,22 +100,7 @@ export async function getGroupSubmissions( groupNumber: number, full: boolean ): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classId); - - if (!cls) { - return []; - } - - const assignmentRepository = getAssignmentRepository(); - const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber); - - if (!assignment) { - return []; - } - - const groupRepository = getGroupRepository(); - const group = await groupRepository.findByAssignmentAndGroupNumber(assignment, groupNumber); + const group = await fetchGroup(classId, assignmentNumber, groupNumber); if (!group) { return []; From 7ae2f1de0c187a6388f0c55fc1d1710f28b0391c Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Mon, 31 Mar 2025 12:39:22 +0200 Subject: [PATCH 02/94] feat: DELETE voor class geimplenteerd --- backend/src/services/classes.ts | 35 +++++++++++++++----------------- backend/src/services/teachers.ts | 20 +++++++----------- 2 files changed, 23 insertions(+), 32 deletions(-) diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index dbf6c63d..f2cb79e8 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -1,5 +1,6 @@ import { getClassRepository, getStudentRepository, getTeacherInvitationRepository, getTeacherRepository } from '../data/repositories.js'; import { Class } from '../entities/classes/class.entity.js'; +import { NotFoundException } from '../exceptions/not-found-exception.js'; import { ClassDTO, mapToClassDTO } from '../interfaces/class.js'; import { mapToStudentDTO, StudentDTO } from '../interfaces/student.js'; import { mapToTeacherInvitationDTO, mapToTeacherInvitationDTOIds, TeacherInvitationDTO } from '../interfaces/teacher-invitation.js'; @@ -7,10 +8,14 @@ import { getLogger } from '../logging/initalize.js'; const logger = getLogger(); -async function fetchClass(classid: string): Promise { +async function fetchClass(classid: string): Promise { const classRepository = getClassRepository(); const cls = await classRepository.findById(classid); + if (!cls) { + throw new NotFoundException("Class not found"); + } + return cls; } @@ -18,16 +23,18 @@ export async function getAllClasses(full: boolean): Promise cls.classId!); } +export async function getClass(classId: string): Promise { + const cls = await fetchClass(classId); + + return mapToClassDTO(cls); +} + export async function createClass(classData: ClassDTO): Promise { const teacherRepository = getTeacherRepository(); const teacherUsernames = classData.teachers || []; @@ -54,12 +61,11 @@ export async function createClass(classData: ClassDTO): Promise } } -export async function getClass(classId: string): Promise { +export async function deleteClass(classId: string): Promise { const cls = await fetchClass(classId); - if (!cls) { - return null; - } + const classRepository = getClassRepository(); + await classRepository.deleteById(classId); return mapToClassDTO(cls); } @@ -67,10 +73,6 @@ export async function getClass(classId: string): Promise { export async function getClassStudents(classId: string, full: boolean): Promise { const cls = await fetchClass(classId); - if (!cls) { - return []; - } - if (full) { return cls.students.map(mapToStudentDTO); } @@ -79,12 +81,7 @@ export async function getClassStudents(classId: string, full: boolean): Promise< } export async function getClassTeacherInvitations(classId: string, full: boolean): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classId); - - if (!cls) { - return []; - } + const cls = await fetchClass(classId); const teacherInvitationRepository = getTeacherInvitationRepository(); const invitations = await teacherInvitationRepository.findAllInvitationsForClass(cls); diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts index fced2b61..cf2743e9 100644 --- a/backend/src/services/teachers.ts +++ b/backend/src/services/teachers.ts @@ -76,28 +76,22 @@ export async function getClassesByTeacher(username: string, full: boolean): Prom return classes.map((cls) => cls.id); } -export async function fetchStudentsByTeacher(username: string): Promise { +export async function getStudentsByTeacher(username: string, full: boolean): Promise { const classes = (await getClassesByTeacher(username, false)) as string[]; if (!classes) { return null; } - return (await Promise.all(classes.map(async (id) => getClassStudents(id)))).flat(); -} - -export async function getStudentsByTeacher(username: string, full: boolean): Promise { - const students = await fetchStudentsByTeacher(username); - - if (!students) { - return null; - } - + // workaround + let students; if (full) { - return students; + students = (await Promise.all(classes.map(async (id) => await getClassStudents(id, full) as StudentDTO[]))).flat(); + } else { + students = (await Promise.all(classes.map(async (id) => await getClassStudents(id, full) as string[]))).flat(); } - return students.map((student) => student.username); + return students; } export async function fetchTeacherQuestions(username: string): Promise { From 6290d3dd9b3f469d598b24dd2b7e4771031d0fcf Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Tue, 1 Apr 2025 17:02:42 +0200 Subject: [PATCH 03/94] feat: get all submissions route toegevoegd --- backend/src/controllers/submissions.ts | 57 +++++++++++-------- .../data/assignments/submission-repository.ts | 8 +++ backend/src/routes/submissions.ts | 8 +-- backend/src/services/submissions.ts | 27 +++++---- 4 files changed, 59 insertions(+), 41 deletions(-) diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts index 512ac22e..5fa154b1 100644 --- a/backend/src/controllers/submissions.ts +++ b/backend/src/controllers/submissions.ts @@ -1,33 +1,41 @@ import { Request, Response } from 'express'; -import { createSubmission, deleteSubmission, getSubmission } from '../services/submissions.js'; +import { createSubmission, deleteSubmission, getAllSubmissions, getSubmission } from '../services/submissions.js'; import { Language, languageMap } from '../entities/content/language.js'; import { SubmissionDTO } from '../interfaces/submission'; +import { BadRequestException } from '../exceptions/bad-request-exception.js'; +import { NotFoundException } from '../exceptions/not-found-exception.js'; +import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js'; -interface SubmissionParams { - hruid: string; - id: number; -} -export async function getSubmissionHandler(req: Request, res: Response): Promise { - const lohruid = req.params.hruid; + +export async function getSubmissionHandler(req: Request, res: Response): Promise { const submissionNumber = +req.params.id; - + if (isNaN(submissionNumber)) { - res.status(400).json({ error: 'Submission number is not a number' }); - return; + throw new BadRequestException('Submission number must be a number'); } - + + const lohruid = req.params.hruid; const lang = languageMap[req.query.language as string] || Language.Dutch; const version = (req.query.version || 1) as number; - const submission = await getSubmission(lohruid, lang, version, submissionNumber); + const loId = new LearningObjectIdentifier(lohruid, lang, version); - if (!submission) { - res.status(404).json({ error: 'Submission not found' }); - return; - } + const submission = await getSubmission(loId, submissionNumber); - res.json(submission); + res.json({ submission }); +} + +export async function getAllSubmissionsHandler(req: Request, res: Response): Promise { + const lohruid = req.params.hruid; + const lang = languageMap[req.query.language as string] || Language.Dutch; + const version = (req.query.version || 1) as number; + + const loId = new LearningObjectIdentifier(lohruid, lang, version); + + const submissions = await getAllSubmissions(loId); + + res.json({ submissions }); } export async function createSubmissionHandler(req: Request, res: Response) { @@ -40,22 +48,23 @@ export async function createSubmissionHandler(req: Request, res: Response) { return; } - res.json(submission); + res.json({ submission }); } export async function deleteSubmissionHandler(req: Request, res: Response) { - const hruid = req.params.hruid; const submissionNumber = +req.params.id; - + + const hruid = req.params.hruid; const lang = languageMap[req.query.language as string] || Language.Dutch; const version = (req.query.version || 1) as number; - const submission = await deleteSubmission(hruid, lang, version, submissionNumber); + const loId = new LearningObjectIdentifier(hruid, lang, version); + + const submission = await deleteSubmission(loId, submissionNumber); if (!submission) { - res.status(404).json({ error: 'Submission not found' }); - return; + throw new NotFoundException('Could not delete submission'); } - res.json(submission); + res.json({ submission }); } diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts index 251823fa..25a66956 100644 --- a/backend/src/data/assignments/submission-repository.ts +++ b/backend/src/data/assignments/submission-repository.ts @@ -14,6 +14,14 @@ export class SubmissionRepository extends DwengoEntityRepository { }); } + public findByLearningObject(loId: LearningObjectIdentifier): Promise { + return this.find({ + learningObjectHruid: loId.hruid, + learningObjectLanguage: loId.language, + learningObjectVersion: loId.version, + }); + } + public findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise { return this.findOne( { diff --git a/backend/src/routes/submissions.ts b/backend/src/routes/submissions.ts index 4db93027..7c91de52 100644 --- a/backend/src/routes/submissions.ts +++ b/backend/src/routes/submissions.ts @@ -1,13 +1,9 @@ import express from 'express'; -import { createSubmissionHandler, deleteSubmissionHandler, getSubmissionHandler } from '../controllers/submissions.js'; +import { createSubmissionHandler, deleteSubmissionHandler, getAllSubmissionsHandler, getSubmissionHandler } from '../controllers/submissions.js'; const router = express.Router({ mergeParams: true }); // Root endpoint used to search objects -router.get('/', (req, res) => { - res.json({ - submissions: ['0', '1'], - }); -}); +router.get('/', getAllSubmissionsHandler); router.post('/:id', createSubmissionHandler); diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts index 0e1ad9ac..f9f42349 100644 --- a/backend/src/services/submissions.ts +++ b/backend/src/services/submissions.ts @@ -1,26 +1,32 @@ import { getGroupRepository, getSubmissionRepository } from '../data/repositories.js'; import { Language } from '../entities/content/language.js'; import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js'; +import { NotFoundException } from '../exceptions/not-found-exception.js'; import { mapToSubmission, mapToSubmissionDTO, SubmissionDTO } from '../interfaces/submission.js'; export async function getSubmission( - learningObjectHruid: string, - language: Language, - version: number, + loId: LearningObjectIdentifier, submissionNumber: number -): Promise { - const loId = new LearningObjectIdentifier(learningObjectHruid, language, version); - +): Promise { const submissionRepository = getSubmissionRepository(); const submission = await submissionRepository.findSubmissionByLearningObjectAndSubmissionNumber(loId, submissionNumber); if (!submission) { - return null; + throw new NotFoundException('Could not find submission'); } return mapToSubmissionDTO(submission); } +export async function getAllSubmissions( + loId: LearningObjectIdentifier, +): Promise { + const submissionRepository = getSubmissionRepository(); + const submissions = await submissionRepository.findByLearningObject(loId); + + return submissions.map(mapToSubmissionDTO); +} + export async function createSubmission(submissionDTO: SubmissionDTO) { const submissionRepository = getSubmissionRepository(); const submission = mapToSubmission(submissionDTO); @@ -35,16 +41,15 @@ export async function createSubmission(submissionDTO: SubmissionDTO) { return mapToSubmissionDTO(submission); } -export async function deleteSubmission(learningObjectHruid: string, language: Language, version: number, submissionNumber: number) { +export async function deleteSubmission(loId: LearningObjectIdentifier, submissionNumber: number) { const submissionRepository = getSubmissionRepository(); - const submission = getSubmission(learningObjectHruid, language, version, submissionNumber); + const submission = getSubmission(loId, submissionNumber); if (!submission) { - return null; + throw new NotFoundException('Could not delete submission because it does not exist'); } - const loId = new LearningObjectIdentifier(learningObjectHruid, language, version); await submissionRepository.deleteSubmissionByLearningObjectAndSubmissionNumber(loId, submissionNumber); return submission; From da5cb7d02d26142b563a88e820ed431cec9881db Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Tue, 1 Apr 2025 17:06:26 +0200 Subject: [PATCH 04/94] feat: delete op class geimplementeerd --- backend/src/controllers/classes.ts | 14 +++++++++++--- backend/src/routes/classes.ts | 3 ++- backend/src/services/classes.ts | 4 ++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts index ba11da8e..acf19476 100644 --- a/backend/src/controllers/classes.ts +++ b/backend/src/controllers/classes.ts @@ -1,6 +1,7 @@ import { Request, Response } from 'express'; -import { createClass, getAllClasses, getClass, getClassStudents, getClassTeacherInvitations } from '../services/classes.js'; +import { createClass, deleteClass, getAllClasses, getClass, getClassStudents, getClassTeacherInvitations } from '../services/classes.js'; import { ClassDTO } from '../interfaces/class.js'; +import { NotFoundException } from '../exceptions/not-found-exception.js'; export async function getAllClassesHandler(req: Request, res: Response): Promise { const full = req.query.full === 'true'; @@ -28,7 +29,7 @@ export async function createClassHandler(req: Request, res: Response): Promise { @@ -40,7 +41,14 @@ export async function getClassHandler(req: Request, res: Response): Promise { + const classId = req.params.id; + const cls = await deleteClass(classId); + + res.json({ cls }); } export async function getClassStudentsHandler(req: Request, res: Response): Promise { diff --git a/backend/src/routes/classes.ts b/backend/src/routes/classes.ts index e0972988..dc434fb0 100644 --- a/backend/src/routes/classes.ts +++ b/backend/src/routes/classes.ts @@ -15,9 +15,10 @@ router.get('/', getAllClassesHandler); router.post('/', createClassHandler); -// Information about an class with id 'id' router.get('/:id', getClassHandler); +router.delete('/:id', deleteClassHandler); + router.get('/:id/teacher-invitations', getTeacherInvitationsHandler); router.get('/:id/students', getClassStudentsHandler); diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index f2cb79e8..dcf6a432 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -64,6 +64,10 @@ export async function createClass(classData: ClassDTO): Promise export async function deleteClass(classId: string): Promise { const cls = await fetchClass(classId); + if (!cls) { + throw new NotFoundException('Could not delete class because it does not exist'); + } + const classRepository = getClassRepository(); await classRepository.deleteById(classId); From c79a295e683d6e84037a02bb08b477b0f44ddf02 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Tue, 1 Apr 2025 22:57:30 +0200 Subject: [PATCH 05/94] feat: werken aan delete voor assignment --- backend/src/controllers/assignments.ts | 14 ++++---------- backend/src/services/assignments.ts | 17 +++++++++-------- backend/src/services/classes.ts | 2 +- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts index 16dbb310..b104c27c 100644 --- a/backend/src/controllers/assignments.ts +++ b/backend/src/controllers/assignments.ts @@ -2,13 +2,7 @@ import { Request, Response } from 'express'; import { createAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions } from '../services/assignments.js'; import { AssignmentDTO } from '../interfaces/assignment.js'; -// Typescript is annoy with with parameter forwarding from class.ts -interface AssignmentParams { - classid: string; - id: string; -} - -export async function getAllAssignmentsHandler(req: Request, res: Response): Promise { +export async function getAllAssignmentsHandler(req: Request, res: Response): Promise { const classid = req.params.classid; const full = req.query.full === 'true'; @@ -19,7 +13,7 @@ export async function getAllAssignmentsHandler(req: Request, r }); } -export async function createAssignmentHandler(req: Request, res: Response): Promise { +export async function createAssignmentHandler(req: Request, res: Response): Promise { const classid = req.params.classid; const assignmentData = req.body as AssignmentDTO; @@ -40,7 +34,7 @@ export async function createAssignmentHandler(req: Request, re res.status(201).json(assignment); } -export async function getAssignmentHandler(req: Request, res: Response): Promise { +export async function getAssignmentHandler(req: Request, res: Response): Promise { const id = +req.params.id; const classid = req.params.classid; @@ -59,7 +53,7 @@ export async function getAssignmentHandler(req: Request, res: res.json(assignment); } -export async function getAssignmentsSubmissionsHandler(req: Request, res: Response): Promise { +export async function getAssignmentsSubmissionsHandler(req: Request, res: Response): Promise { const classid = req.params.classid; const assignmentNumber = +req.params.id; const full = req.query.full === 'true'; diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts index 05e8099a..f468b879 100644 --- a/backend/src/services/assignments.ts +++ b/backend/src/services/assignments.ts @@ -1,30 +1,31 @@ import { getAssignmentRepository, getClassRepository, getGroupRepository, getQuestionRepository, getSubmissionRepository } from '../data/repositories.js'; import { Assignment } from '../entities/assignments/assignment.entity.js'; +import { NotFoundException } from '../exceptions/not-found-exception.js'; import { AssignmentDTO, mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId } from '../interfaces/assignment.js'; import { mapToQuestionDTO, mapToQuestionId, QuestionDTO, QuestionId } from '../interfaces/question.js'; import { mapToSubmissionDTO, mapToSubmissionDTOId, SubmissionDTO, SubmissionDTOId } from '../interfaces/submission.js'; +import { fetchClass } from './classes.js'; -export async function fetchAssignment(classid: string, assignmentNumber: number): Promise { +export async function fetchAssignment(classid: string, assignmentNumber: number): Promise { const classRepository = getClassRepository(); const cls = await classRepository.findById(classid); if (!cls) { - return null; + throw new NotFoundException('Could not find assignment\'s class'); } const assignmentRepository = getAssignmentRepository(); const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber); + if (!assignment) { + throw new NotFoundException('Could not find assignment'); + } + return assignment; } export async function getAllAssignments(classid: string, full: boolean): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classid); - - if (!cls) { - return []; - } + const cls = await fetchClass(classid); const assignmentRepository = getAssignmentRepository(); const assignments = await assignmentRepository.findAllAssignmentsInClass(cls); diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index dcf6a432..7735b08d 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -8,7 +8,7 @@ import { getLogger } from '../logging/initalize.js'; const logger = getLogger(); -async function fetchClass(classid: string): Promise { +export async function fetchClass(classid: string): Promise { const classRepository = getClassRepository(); const cls = await classRepository.findById(classid); From 2c4bc644fd673689d8d5ca00f52bc8f74b22ba32 Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Sun, 6 Apr 2025 10:40:34 +0200 Subject: [PATCH 06/94] fix: assignment errors en return json --- backend/src/controllers/assignments.ts | 50 +++++++------------ backend/src/services/assignments.ts | 68 +++++++++----------------- 2 files changed, 43 insertions(+), 75 deletions(-) diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts index 1520fc10..2750e3d8 100644 --- a/backend/src/controllers/assignments.ts +++ b/backend/src/controllers/assignments.ts @@ -1,6 +1,8 @@ import { Request, Response } from 'express'; import { createAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions } from '../services/assignments.js'; import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; +import {requireFields} from "./error-helper"; +import {BadRequestException} from "../exceptions/bad-request-exception"; // Typescript is annoying with parameter forwarding from class.ts interface AssignmentParams { @@ -9,69 +11,55 @@ interface AssignmentParams { } export async function getAllAssignmentsHandler(req: Request, res: Response): Promise { - const classid = req.params.classid; + const classId = req.params.classid; const full = req.query.full === 'true'; + requireFields({ classId }); - const assignments = await getAllAssignments(classid, full); + const assignments = await getAllAssignments(classId, full); - res.json({ - assignments: assignments, - }); + res.json({ assignments }); } export async function createAssignmentHandler(req: Request, res: Response): Promise { const classid = req.params.classid; - const assignmentData = req.body as AssignmentDTO; + const description = req.body.description; + const language = req.body.language; + const learningPath = req.body.learningPath; + const title = req.body.title; - if (!assignmentData.description || !assignmentData.language || !assignmentData.learningPath || !assignmentData.title) { - res.status(400).json({ - error: 'Missing one or more required fields: title, description, learningPath, language', - }); - return; - } + requireFields({ description, language, learningPath, title }); + const assignmentData = req.body as AssignmentDTO; const assignment = await createAssignment(classid, assignmentData); - if (!assignment) { - res.status(500).json({ error: 'Could not create assignment ' }); - return; - } - - res.status(201).json(assignment); + res.json({ assignment }); } export async function getAssignmentHandler(req: Request, res: Response): Promise { const id = Number(req.params.id); const classid = req.params.classid; + requireFields({ id, classid }); if (isNaN(id)) { - res.status(400).json({ error: 'Assignment id must be a number' }); - return; + throw new BadRequestException("Assignment id should be a number") } const assignment = await getAssignment(classid, id); - if (!assignment) { - res.status(404).json({ error: 'Assignment not found' }); - return; - } - - res.json(assignment); + res.json({ assignment }); } export async function getAssignmentsSubmissionsHandler(req: Request, res: Response): Promise { const classid = req.params.classid; const assignmentNumber = Number(req.params.id); const full = req.query.full === 'true'; + requireFields({ assignmentNumber, classid }); if (isNaN(assignmentNumber)) { - res.status(400).json({ error: 'Assignment id must be a number' }); - return; + throw new BadRequestException("Assignment id should be a number") } const submissions = await getAssignmentsSubmissions(classid, assignmentNumber, full); - res.json({ - submissions: submissions, - }); + res.json({ submissions }); } diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts index e86b69b2..fa8e2380 100644 --- a/backend/src/services/assignments.ts +++ b/backend/src/services/assignments.ts @@ -3,15 +3,12 @@ import { mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId } from '../in import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submission.js'; import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission'; -import { getLogger } from '../logging/initalize.js'; +import {fetchClass} from "./classes"; +import {Assignment} from "../entities/assignments/assignment.entity"; +import {NotFoundException} from "../exceptions/not-found-exception"; export async function getAllAssignments(classid: string, full: boolean): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classid); - - if (!cls) { - return []; - } + const cls = await fetchClass(classid); const assignmentRepository = getAssignmentRepository(); const assignments = await assignmentRepository.findAllAssignmentsInClass(cls); @@ -23,43 +20,34 @@ export async function getAllAssignments(classid: string, full: boolean): Promise return assignments.map(mapToAssignmentDTOId); } -export async function createAssignment(classid: string, assignmentData: AssignmentDTO): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classid); - - if (!cls) { - return null; - } +export async function createAssignment(classid: string, assignmentData: AssignmentDTO): Promise { + const cls = await fetchClass(classid); const assignment = mapToAssignment(assignmentData, cls); const assignmentRepository = getAssignmentRepository(); - try { - const newAssignment = assignmentRepository.create(assignment); - await assignmentRepository.save(newAssignment); + const newAssignment = assignmentRepository.create(assignment); + await assignmentRepository.save(newAssignment, {preventOverwrite: true}); + + return mapToAssignmentDTO(newAssignment); - return mapToAssignmentDTO(newAssignment); - } catch (e) { - getLogger().error(e); - return null; - } } -export async function getAssignment(classid: string, id: number): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classid); - - if (!cls) { - return null; - } +export async function fetchAssignment(classid: string, id: number): Promise { + const cls = await fetchClass(classid); const assignmentRepository = getAssignmentRepository(); const assignment = await assignmentRepository.findByClassAndId(cls, id); - if (!assignment) { - return null; + if (!assignment){ + throw new NotFoundException('Assignment with id not found'); } + return assignment; +} + +export async function getAssignment(classid: string, id: number): Promise { + const assignment = await fetchAssignment(classid, id); return mapToAssignmentDTO(assignment); } @@ -68,23 +56,15 @@ export async function getAssignmentsSubmissions( assignmentNumber: number, full: boolean ): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classid); - - if (!cls) { - return []; - } - - const assignmentRepository = getAssignmentRepository(); - const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber); - - if (!assignment) { - return []; - } + const assignment = await fetchAssignment(classid, assignmentNumber); const groupRepository = getGroupRepository(); const groups = await groupRepository.findAllGroupsForAssignment(assignment); + if (groups.length === 0){ + throw new NotFoundException('No groups for assignment found'); + } + const submissionRepository = getSubmissionRepository(); const submissions = (await Promise.all(groups.map(async (group) => submissionRepository.findAllSubmissionsForGroup(group)))).flat(); From 29824c549ed90da314a8f1c29b985e3f3fd0b021 Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Sun, 6 Apr 2025 16:26:28 +0200 Subject: [PATCH 07/94] fix: classes error handeling en return json --- backend/src/controllers/classes.ts | 61 +++++++++++----------- backend/src/services/classes.ts | 82 ++++++++++-------------------- 2 files changed, 59 insertions(+), 84 deletions(-) diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts index a041bf22..8e9efdcb 100644 --- a/backend/src/controllers/classes.ts +++ b/backend/src/controllers/classes.ts @@ -1,44 +1,37 @@ import { Request, Response } from 'express'; -import { createClass, getAllClasses, getClass, getClassStudents, getClassStudentsIds, getClassTeacherInvitations } from '../services/classes.js'; +import { + createClass, + getAllClasses, + getClass, + getClassStudents, + getClassTeacherInvitations, + getClassTeachers +} from '../services/classes.js'; import { ClassDTO } from '@dwengo-1/common/interfaces/class'; +import {requireFields} from "./error-helper"; export async function getAllClassesHandler(req: Request, res: Response): Promise { const full = req.query.full === 'true'; const classes = await getAllClasses(full); - res.json({ - classes: classes, - }); + res.json({ classes }); } export async function createClassHandler(req: Request, res: Response): Promise { + const displayName= req.body.displayName; + requireFields({ displayName }); + const classData = req.body as ClassDTO; - - if (!classData.displayName) { - res.status(400).json({ - error: 'Missing one or more required fields: displayName', - }); - return; - } - const cls = await createClass(classData); - if (!cls) { - res.status(500).json({ error: 'Something went wrong while creating class' }); - return; - } - - res.status(201).json(cls); + res.json({ cls }); } export async function getClassHandler(req: Request, res: Response): Promise { const classId = req.params.id; - const cls = await getClass(classId); + requireFields({ classId }); - if (!cls) { - res.status(404).json({ error: 'Class not found' }); - return; - } + const cls = await getClass(classId); res.json(cls); } @@ -46,21 +39,29 @@ export async function getClassHandler(req: Request, res: Response): Promise { const classId = req.params.id; const full = req.query.full === 'true'; + requireFields({ classId }); - const students = full ? await getClassStudents(classId) : await getClassStudentsIds(classId); + const students = await getClassStudents(classId, full); - res.json({ - students: students, - }); + res.json({ students }); +} + +export async function getClassTeachersHandler(req: Request, res: Response): Promise { + const classId = req.params.id; + const full = req.query.full === 'true'; + requireFields({ classId }); + + const teachers = await getClassTeachers(classId, full); + + res.json({ teachers }); } export async function getTeacherInvitationsHandler(req: Request, res: Response): Promise { const classId = req.params.id; const full = req.query.full === 'true'; + requireFields({ classId }); const invitations = await getClassTeacherInvitations(classId, full); - res.json({ - invitations: invitations, - }); + res.json({ invitations }); } diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index 754277cf..d4e4defa 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -8,8 +8,10 @@ import { Class } from '../entities/classes/class.entity.js'; import { ClassDTO } from '@dwengo-1/common/interfaces/class'; import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation'; import { StudentDTO } from '@dwengo-1/common/interfaces/student'; - -const logger = getLogger(); +import {fetchTeacher} from "./teachers"; +import {fetchStudent} from "./students"; +import {TeacherDTO} from "@dwengo-1/common/interfaces/teacher"; +import {mapToTeacherDTO} from "../interfaces/teacher"; export async function fetchClass(classId: string): Promise { const classRepository = getClassRepository(); @@ -26,84 +28,56 @@ export async function getAllClasses(full: boolean): Promise cls.classId!); } -export async function createClass(classData: ClassDTO): Promise { - const teacherRepository = getTeacherRepository(); +export async function createClass(classData: ClassDTO): Promise { const teacherUsernames = classData.teachers || []; - const teachers = (await Promise.all(teacherUsernames.map(async (id) => teacherRepository.findByUsername(id)))).filter( - (teacher) => teacher !== null - ); + const teachers = (await Promise.all(teacherUsernames.map(async (id) => fetchTeacher(id) ))); - const studentRepository = getStudentRepository(); const studentUsernames = classData.students || []; - const students = (await Promise.all(studentUsernames.map(async (id) => studentRepository.findByUsername(id)))).filter( - (student) => student !== null - ); + const students = (await Promise.all(studentUsernames.map(async (id) => fetchStudent(id) ))); const classRepository = getClassRepository(); - try { - const newClass = classRepository.create({ - displayName: classData.displayName, - teachers: teachers, - students: students, - }); - await classRepository.save(newClass); + const newClass = classRepository.create({ + displayName: classData.displayName, + teachers: teachers, + students: students, + }); + await classRepository.save(newClass, {preventOverwrite: true}); - return mapToClassDTO(newClass); - } catch (e) { - logger.error(e); - return null; - } + return mapToClassDTO(newClass); } -export async function getClass(classId: string): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classId); - - if (!cls) { - return null; - } - +export async function getClass(classId: string): Promise { + const cls = await fetchClass(classId); return mapToClassDTO(cls); } -async function fetchClassStudents(classId: string): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classId); +export async function getClassStudents(classId: string, full: boolean): Promise { + const cls = await fetchClass(classId); - if (!cls) { - return []; + if (full){ + return cls.students.map(mapToStudentDTO); } - - return cls.students.map(mapToStudentDTO); + return cls.students.map((student) => student.username); } -export async function getClassStudents(classId: string): Promise { - return await fetchClassStudents(classId); -} +export async function getClassTeachers(classId: string, full: boolean): Promise { + const cls = await fetchClass(classId); -export async function getClassStudentsIds(classId: string): Promise { - const students: StudentDTO[] = await fetchClassStudents(classId); - return students.map((student) => student.username); + if (full){ + return cls.teachers.map(mapToTeacherDTO); + } + return cls.teachers.map((student) => student.username); } export async function getClassTeacherInvitations(classId: string, full: boolean): Promise { - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classId); - - if (!cls) { - return []; - } + const cls = await fetchClass(classId); const teacherInvitationRepository = getTeacherInvitationRepository(); const invitations = await teacherInvitationRepository.findAllInvitationsForClass(cls); From db3c531038dc6a5dba67d76db943b9a195b8d683 Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Sun, 6 Apr 2025 16:26:52 +0200 Subject: [PATCH 08/94] feat: get teachers van class --- backend/src/routes/classes.ts | 4 +++- frontend/src/controllers/classes.ts | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/backend/src/routes/classes.ts b/backend/src/routes/classes.ts index e0972988..6b6d4f5d 100644 --- a/backend/src/routes/classes.ts +++ b/backend/src/routes/classes.ts @@ -3,7 +3,7 @@ import { createClassHandler, getAllClassesHandler, getClassHandler, - getClassStudentsHandler, + getClassStudentsHandler, getClassTeachersHandler, getTeacherInvitationsHandler, } from '../controllers/classes.js'; import assignmentRouter from './assignments.js'; @@ -22,6 +22,8 @@ router.get('/:id/teacher-invitations', getTeacherInvitationsHandler); router.get('/:id/students', getClassStudentsHandler); +router.get('/:id/teachers', getClassTeachersHandler); + router.use('/:classid/assignments', assignmentRouter); export default router; diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts index dadf6dec..9c8a667f 100644 --- a/frontend/src/controllers/classes.ts +++ b/frontend/src/controllers/classes.ts @@ -3,6 +3,7 @@ import type { ClassDTO } from "@dwengo-1/common/interfaces/class"; import type { StudentsResponse } from "./students"; import type { AssignmentsResponse } from "./assignments"; import type { TeacherInvitationDTO } from "@dwengo-1/common/interfaces/teacher-invitation"; +import type {TeachersResponse} from "@/controllers/teachers.ts"; export interface ClassesResponse { classes: ClassDTO[] | string[]; @@ -45,6 +46,10 @@ export class ClassController extends BaseController { return this.get(`/${id}/students`, { full }); } + async getTeachers(id: string, full = true): Promise { + return this.get(`/${id}/teachers`, { full }); + } + // TODO async getTeacherInvitations(id: string, full = true): Promise { return this.get(`/${id}/teacher-invitations`, { full }); From 6c3dbc99bb1afb79fa867505e52656c49bada1b6 Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Sun, 6 Apr 2025 17:18:13 +0200 Subject: [PATCH 09/94] refactor: joinrequests uit classdto --- backend/src/interfaces/class.ts | 1 - backend/src/services/classes.ts | 5 +++++ backend/src/services/teachers.ts | 4 ++-- common/src/interfaces/class.ts | 1 - 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/backend/src/interfaces/class.ts b/backend/src/interfaces/class.ts index 7b07fcf2..76fa5fd5 100644 --- a/backend/src/interfaces/class.ts +++ b/backend/src/interfaces/class.ts @@ -10,7 +10,6 @@ export function mapToClassDTO(cls: Class): ClassDTO { displayName: cls.displayName, teachers: cls.teachers.map((teacher) => teacher.username), students: cls.students.map((student) => student.username), - joinRequests: [], // TODO }; } diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index d4e4defa..826c0f16 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -67,6 +67,11 @@ export async function getClassStudents(classId: string, full: boolean): Promise< return cls.students.map((student) => student.username); } +export async function getClassStudentsDTO(classId: string): Promise { + const cls = await fetchClass(classId); + return cls.students.map(mapToStudentDTO); +} + export async function getClassTeachers(classId: string, full: boolean): Promise { const cls = await fetchClass(classId); diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts index 1b7643fb..6449f16f 100644 --- a/backend/src/services/teachers.ts +++ b/backend/src/services/teachers.ts @@ -22,7 +22,7 @@ import { Question } from '../entities/questions/question.entity.js'; import { ClassJoinRequestRepository } from '../data/classes/class-join-request-repository.js'; import { Student } from '../entities/users/student.entity.js'; import { NotFoundException } from '../exceptions/not-found-exception.js'; -import { getClassStudents } from './classes.js'; +import {getClassStudents, getClassStudentsDTO} from './classes.js'; import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher'; import { ClassDTO } from '@dwengo-1/common/interfaces/class'; import { StudentDTO } from '@dwengo-1/common/interfaces/student'; @@ -99,7 +99,7 @@ export async function getStudentsByTeacher(username: string, full: boolean): Pro const classIds: string[] = classes.map((cls) => cls.id); - const students: StudentDTO[] = (await Promise.all(classIds.map(async (id) => getClassStudents(id)))).flat(); + const students: StudentDTO[] = (await Promise.all(classIds.map(async (id) => await getClassStudentsDTO(id)))).flat(); if (full) { return students; } diff --git a/common/src/interfaces/class.ts b/common/src/interfaces/class.ts index c35c2dfc..d71e15e6 100644 --- a/common/src/interfaces/class.ts +++ b/common/src/interfaces/class.ts @@ -3,5 +3,4 @@ export interface ClassDTO { displayName: string; teachers: string[]; students: string[]; - joinRequests: string[]; } From 7e250e26494ff8ca1a7fd414e4038b51bd4df98b Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 17:55:01 +0200 Subject: [PATCH 10/94] fix: fixed merge errors --- backend/src/data/assignments/submission-repository.ts | 4 ---- backend/src/data/questions/question-repository.ts | 6 +++--- backend/src/routes/groups.ts | 10 ---------- backend/src/routes/submissions.ts | 8 -------- 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts index d904e77f..371dd4ef 100644 --- a/backend/src/data/assignments/submission-repository.ts +++ b/backend/src/data/assignments/submission-repository.ts @@ -17,7 +17,6 @@ export class SubmissionRepository extends DwengoEntityRepository { }); } -<<<<<<< HEAD public findByLearningObject(loId: LearningObjectIdentifier): Promise { return this.find({ learningObjectHruid: loId.hruid, @@ -27,9 +26,6 @@ export class SubmissionRepository extends DwengoEntityRepository { } public findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise { -======= - public async findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise { ->>>>>>> 6c3dbc99bb1afb79fa867505e52656c49bada1b6 return this.findOne( { learningObjectHruid: loId.hruid, diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts index 0055ac78..246b0484 100644 --- a/backend/src/data/questions/question-repository.ts +++ b/backend/src/data/questions/question-repository.ts @@ -56,18 +56,18 @@ export class QuestionRepository extends DwengoEntityRepository { }); } -<<<<<<< HEAD public findAllByAssignment(assignment: Assignment): Promise { return this.find({ author: assignment.groups.flatMap(group => group.members), learningObjectHruid: assignment.learningPathHruid, learningObjectLanguage: assignment.learningPathLanguage, -======= + }); + } + public async findAllByAuthor(author: Student): Promise { return this.findAll({ where: { author }, orderBy: { timestamp: 'DESC' }, // New to old ->>>>>>> 6c3dbc99bb1afb79fa867505e52656c49bada1b6 }); } } diff --git a/backend/src/routes/groups.ts b/backend/src/routes/groups.ts index 231dec2e..81532a90 100644 --- a/backend/src/routes/groups.ts +++ b/backend/src/routes/groups.ts @@ -12,15 +12,5 @@ router.post('/', createGroupHandler); router.get('/:groupid', getGroupHandler); router.get('/:groupid/submissions', getGroupSubmissionsHandler); -<<<<<<< HEAD -======= - -// The list of questions a group has made -router.get('/:id/questions', (_req, res) => { - res.json({ - questions: ['0'], - }); -}); ->>>>>>> 6c3dbc99bb1afb79fa867505e52656c49bada1b6 export default router; diff --git a/backend/src/routes/submissions.ts b/backend/src/routes/submissions.ts index fac0b834..7c91de52 100644 --- a/backend/src/routes/submissions.ts +++ b/backend/src/routes/submissions.ts @@ -3,15 +3,7 @@ import { createSubmissionHandler, deleteSubmissionHandler, getAllSubmissionsHand const router = express.Router({ mergeParams: true }); // Root endpoint used to search objects -<<<<<<< HEAD router.get('/', getAllSubmissionsHandler); -======= -router.get('/', (_req, res) => { - res.json({ - submissions: ['0', '1'], - }); -}); ->>>>>>> 6c3dbc99bb1afb79fa867505e52656c49bada1b6 router.post('/:id', createSubmissionHandler); From 8d99b4f7059a48e95d26b57debfdcfc4c9af0dc3 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 17:59:38 +0200 Subject: [PATCH 11/94] fix: missende import in routes/classes.ts gefixt --- backend/src/routes/classes.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/routes/classes.ts b/backend/src/routes/classes.ts index ace7085b..4ca8b0b9 100644 --- a/backend/src/routes/classes.ts +++ b/backend/src/routes/classes.ts @@ -1,6 +1,7 @@ import express from 'express'; import { createClassHandler, + deleteClassHandler, getAllClassesHandler, getClassHandler, getClassStudentsHandler, getClassTeachersHandler, From d2f5219b696723ac6e10efa6e751812f5ef79589 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 18:17:17 +0200 Subject: [PATCH 12/94] fix: foute benaming in res.json gefixt --- backend/src/controllers/classes.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts index 743ed001..a0ceff17 100644 --- a/backend/src/controllers/classes.ts +++ b/backend/src/controllers/classes.ts @@ -25,7 +25,7 @@ export async function createClassHandler(req: Request, res: Response): Promise { @@ -34,14 +34,14 @@ export async function getClassHandler(req: Request, res: Response): Promise { const classId = req.params.id; const cls = await deleteClass(classId); - res.json({ cls }); + res.json({ class: cls }); } export async function getClassStudentsHandler(req: Request, res: Response): Promise { From c52bcde3ae10768880205f733a02a2e622e10a3b Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 18:21:37 +0200 Subject: [PATCH 13/94] feat: requirefields in backend controllers (class, assignment, submission, group) --- backend/src/controllers/assignments.ts | 2 +- backend/src/controllers/groups.ts | 66 ++++++++++---------------- backend/src/controllers/submissions.ts | 33 +++++-------- 3 files changed, 38 insertions(+), 63 deletions(-) diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts index 7c94e2a7..42c822f0 100644 --- a/backend/src/controllers/assignments.ts +++ b/backend/src/controllers/assignments.ts @@ -22,8 +22,8 @@ export async function createAssignmentHandler(req: Request, res: Response): Prom const title = req.body.title; requireFields({ description, language, learningPath, title }); - const assignmentData = req.body as AssignmentDTO; + const assignmentData = req.body as AssignmentDTO; const assignment = await createAssignment(classid, assignmentData); res.json({ assignment }); diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts index 989066a6..3faf4ff0 100644 --- a/backend/src/controllers/groups.ts +++ b/backend/src/controllers/groups.ts @@ -1,29 +1,22 @@ import { Request, Response } from 'express'; import { createGroup, getAllGroups, getGroup, getGroupSubmissions } from '../services/groups.js'; import { GroupDTO } from '@dwengo-1/common/interfaces/group'; +import { requireFields } from './error-helper.js'; +import { BadRequestException } from '../exceptions/bad-request-exception.js'; -// Typescript is annoywith with parameter forwarding from class.ts -interface GroupParams { - classid: string; - assignmentid: string; - groupid?: string; -} - -export async function getGroupHandler(req: Request, res: Response): Promise { +export async function getGroupHandler(req: Request, res: Response): Promise { const classId = req.params.classid; + const assignmentId = parseInt(req.params.assignmentid); + const groupId = parseInt(req.params.groupid); const full = req.query.full === 'true'; - const assignmentId = Number(req.params.assignmentid); + requireFields({ classId, assignmentId, groupId }); if (isNaN(assignmentId)) { - res.status(400).json({ error: 'Assignment id must be a number' }); - return; + throw new BadRequestException('Assignment id must be a number'); } - const groupId = Number(req.params.groupid!); // Can't be undefined - if (isNaN(groupId)) { - res.status(400).json({ error: 'Group id must be a number' }); - return; + throw new BadRequestException('Group id must be a number'); } const group = await getGroup(classId, assignmentId, groupId, full); @@ -33,68 +26,57 @@ export async function getGroupHandler(req: Request, res: Response): return; } - res.json(group); + res.json({ group }); } export async function getAllGroupsHandler(req: Request, res: Response): Promise { const classId = req.params.classid; - const full = req.query.full === 'true'; - const assignmentId = Number(req.params.assignmentid); + const full = req.query.full === 'true'; + requireFields({ classId, assignmentId }); if (isNaN(assignmentId)) { - res.status(400).json({ error: 'Assignment id must be a number' }); - return; + throw new BadRequestException('Assignment id must be a number'); } const groups = await getAllGroups(classId, assignmentId, full); - res.json({ - groups: groups, - }); + res.json({ groups }); } export async function createGroupHandler(req: Request, res: Response): Promise { const classid = req.params.classid; const assignmentId = Number(req.params.assignmentid); + requireFields({ classid, assignmentId }); + if (isNaN(assignmentId)) { - res.status(400).json({ error: 'Assignment id must be a number' }); - return; + throw new BadRequestException('Assignment id must be a number'); } const groupData = req.body as GroupDTO; const group = await createGroup(groupData, classid, assignmentId); - if (!group) { - res.status(500).json({ error: 'Something went wrong while creating group' }); - return; - } - - res.status(201).json(group); + res.status(201).json({ group }); } export async function getGroupSubmissionsHandler(req: Request, res: Response): Promise { const classId = req.params.classid; - const full = req.query.full === 'true'; - const assignmentId = Number(req.params.assignmentid); + const groupId = Number(req.params.groupid); + const full = req.query.full === 'true'; + + requireFields({ classId, assignmentId, groupId }); if (isNaN(assignmentId)) { - res.status(400).json({ error: 'Assignment id must be a number' }); - return; + throw new BadRequestException('Assignment id must be a number'); } - const groupId = Number(req.params.groupid); // Can't be undefined - if (isNaN(groupId)) { - res.status(400).json({ error: 'Group id must be a number' }); - return; + throw new BadRequestException('Group id must be a number'); } const submissions = await getGroupSubmissions(classId, assignmentId, groupId, full); - res.json({ - submissions: submissions, - }); + res.json({ submissions }); } diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts index 499cbacc..a49992bb 100644 --- a/backend/src/controllers/submissions.ts +++ b/backend/src/controllers/submissions.ts @@ -5,22 +5,22 @@ import { NotFoundException } from '../exceptions/not-found-exception.js'; import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js'; import { Language, languageMap } from '@dwengo-1/common/util/language'; import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission'; +import { requireFields } from './error-helper.js'; export async function getSubmissionHandler(req: Request, res: Response): Promise { - const submissionNumber = +req.params.id; + const lohruid = req.params.hruid; + const lang = languageMap[req.query.language as string] || Language.Dutch; + const version = (req.query.version || 1) as number; + const submissionNumber = Number(req.params.id); + requireFields({ lohruid, submissionNumber }); if (isNaN(submissionNumber)) { throw new BadRequestException('Submission number must be a number'); } - const lohruid = req.params.hruid; - const lang = languageMap[req.query.language as string] || Language.Dutch; - const version = (req.query.version || 1) as number; - const loId = new LearningObjectIdentifier(lohruid, lang, version); - const submission = await getSubmission(loId, submissionNumber); res.json({ submission }); @@ -30,9 +30,9 @@ export async function getAllSubmissionsHandler(req: Request, res: Response): Pro const lohruid = req.params.hruid; const lang = languageMap[req.query.language as string] || Language.Dutch; const version = (req.query.version || 1) as number; + requireFields({ lohruid }); const loId = new LearningObjectIdentifier(lohruid, lang, version); - const submissions = await getAllSubmissions(loId); res.json({ submissions }); @@ -40,31 +40,24 @@ export async function getAllSubmissionsHandler(req: Request, res: Response): Pro export async function createSubmissionHandler(req: Request, res: Response): Promise { const submissionDTO = req.body as SubmissionDTO; - const submission = await createSubmission(submissionDTO); - if (!submission) { - res.status(400).json({ error: 'Failed to create submission' }); - return; - } - res.json({ submission }); } export async function deleteSubmissionHandler(req: Request, res: Response): Promise { const hruid = req.params.hruid; - const submissionNumber = Number(req.params.id); - const lang = languageMap[req.query.language as string] || Language.Dutch; const version = (req.query.version || 1) as number; + const submissionNumber = Number(req.params.id); + requireFields({ hruid, submissionNumber }); + + if (isNaN(submissionNumber)) { + throw new BadRequestException('Submission number must be a number'); + } const loId = new LearningObjectIdentifier(hruid, lang, version); - const submission = await deleteSubmission(loId, submissionNumber); - if (!submission) { - throw new NotFoundException('Could not delete submission'); - } - res.json({ submission }); } From e562fad385cc745eb7d29718a716d8482fbfbbc1 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 18:32:54 +0200 Subject: [PATCH 14/94] fix: return types enz gefixt services/assignments.ts --- backend/src/services/assignments.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts index 49cc4819..05ebb1d1 100644 --- a/backend/src/services/assignments.ts +++ b/backend/src/services/assignments.ts @@ -44,13 +44,12 @@ export async function createAssignment(classid: string, assignmentData: Assignme const cls = await fetchClass(classid); const assignment = mapToAssignment(assignmentData, cls); + const assignmentRepository = getAssignmentRepository(); - const newAssignment = assignmentRepository.create(assignment); await assignmentRepository.save(newAssignment, {preventOverwrite: true}); return mapToAssignmentDTO(newAssignment); - } export async function getAssignment(classid: string, id: number): Promise { @@ -68,12 +67,10 @@ export async function getAssignmentsSubmissions( const groupRepository = getGroupRepository(); const groups = await groupRepository.findAllGroupsForAssignment(assignment); - if (groups.length === 0){ - throw new NotFoundException('No groups for assignment found'); - } - const submissionRepository = getSubmissionRepository(); - const submissions = (await Promise.all(groups.map(async (group) => submissionRepository.findAllSubmissionsForGroup(group)))).flat(); + const submissions = (await Promise.all( + groups.map(async (group) => submissionRepository.findAllSubmissionsForGroup(group)) + )).flat(); if (full) { return submissions.map(mapToSubmissionDTO); @@ -96,5 +93,5 @@ export async function getAssignmentsQuestions( return questions.map(mapToQuestionDTO); } - return questions.map(mapToQuestionDTO); // mapToQuestionId should be updated + return questions.map(mapToQuestionDTO); } \ No newline at end of file From dde672befd15a2e0517be056728f0ceb637ee63c Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 19:17:04 +0200 Subject: [PATCH 15/94] feat: submission full backend stack opgekuist --- backend/src/controllers/groups.ts | 5 +- backend/src/interfaces/group.ts | 5 +- backend/src/interfaces/submission.ts | 28 +++++----- backend/src/services/classes.ts | 8 ++- backend/src/services/groups.ts | 78 ++++++++++------------------ backend/src/services/submissions.ts | 43 ++++++++------- common/src/interfaces/group.ts | 2 + 7 files changed, 74 insertions(+), 95 deletions(-) diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts index 3faf4ff0..446a6a7e 100644 --- a/backend/src/controllers/groups.ts +++ b/backend/src/controllers/groups.ts @@ -8,7 +8,6 @@ export async function getGroupHandler(req: Request, res: Response): Promise member.username), diff --git a/backend/src/interfaces/submission.ts b/backend/src/interfaces/submission.ts index b4ed4a2b..91882c35 100644 --- a/backend/src/interfaces/submission.ts +++ b/backend/src/interfaces/submission.ts @@ -1,6 +1,9 @@ +import { getSubmissionRepository } from '../data/repositories.js'; +import { Group } from '../entities/assignments/group.entity.js'; import { Submission } from '../entities/assignments/submission.entity.js'; +import { Student } from '../entities/users/student.entity.js'; import { mapToGroupDTO } from './group.js'; -import { mapToStudent, mapToStudentDTO } from './student.js'; +import { mapToStudentDTO } from './student.js'; import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission'; export function mapToSubmissionDTO(submission: Submission): SubmissionDTO { @@ -29,17 +32,14 @@ export function mapToSubmissionDTOId(submission: Submission): SubmissionDTOId { }; } -export function mapToSubmission(submissionDTO: SubmissionDTO): Submission { - const submission = new Submission(); - submission.learningObjectHruid = submissionDTO.learningObjectIdentifier.hruid; - submission.learningObjectLanguage = submissionDTO.learningObjectIdentifier.language; - submission.learningObjectVersion = submissionDTO.learningObjectIdentifier.version!; - // Submission.submissionNumber = submissionDTO.submissionNumber; - submission.submitter = mapToStudent(submissionDTO.submitter); - // Submission.submissionTime = submissionDTO.time; - // Submission.onBehalfOf = submissionDTO.group!; - // TODO fix group - submission.content = submissionDTO.content; - - return submission; +export function mapToSubmission(submissionDTO: SubmissionDTO, submitter: Student, onBehalfOf: Group | undefined): Submission { + return getSubmissionRepository().create({ + learningObjectHruid: submissionDTO.learningObjectIdentifier.hruid, + learningObjectLanguage: submissionDTO.learningObjectIdentifier.language, + learningObjectVersion: submissionDTO.learningObjectIdentifier.version || 1, + submitter: submitter, + submissionTime: new Date(), + content: submissionDTO.content, + onBehalfOf: onBehalfOf, + }); } diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index 92fd158d..4c8d4caf 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -26,7 +26,7 @@ export async function fetchClass(classid: string): Promise { export async function getAllClasses(full: boolean): Promise { const classRepository = getClassRepository(); - const classes = await classRepository.find({}, { populate: ['students', 'teachers'] }); + const classes = await classRepository.findAll({ populate: ['students', 'teachers'] }); if (full) { return classes.map(mapToClassDTO); @@ -34,13 +34,12 @@ export async function getAllClasses(full: boolean): Promise cls.classId!); } -export async function getClass(classId: string): Promise { +export async function getClass(classId: string): Promise { const cls = await fetchClass(classId); - return mapToClassDTO(cls); } -export async function createClass(classData: ClassDTO): Promise { +export async function createClass(classData: ClassDTO): Promise { const teacherUsernames = classData.teachers || []; const teachers = (await Promise.all(teacherUsernames.map(async (id) => fetchTeacher(id) ))); @@ -48,7 +47,6 @@ export async function createClass(classData: ClassDTO): Promise const students = (await Promise.all(studentUsernames.map(async (id) => fetchStudent(id) ))); const classRepository = getClassRepository(); - const newClass = classRepository.create({ displayName: classData.displayName, teachers: teachers, diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts index 9dfb1596..94f96d54 100644 --- a/backend/src/services/groups.ts +++ b/backend/src/services/groups.ts @@ -14,80 +14,58 @@ import { GroupDTO } from '@dwengo-1/common/interfaces/group'; import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission'; import { getLogger } from '../logging/initalize.js'; import { fetchAssignment } from './assignments.js'; +import { NotFoundException } from '../exceptions/not-found-exception.js'; +import { fetchClass } from './classes.js'; -async function fetchGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise { +export async function fetchGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise { const assignment = await fetchAssignment(classId, assignmentNumber); - if (!assignment) { - return null; - } - const groupRepository = getGroupRepository(); const group = await groupRepository.findByAssignmentAndGroupNumber(assignment, groupNumber); + if (!group) { + throw new NotFoundException('Could not find group'); + } + return group; } -export async function getGroup(classId: string, assignmentNumber: number, groupNumber: number, full: boolean): Promise { +export async function getGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise { const group = await fetchGroup(classId, assignmentNumber, groupNumber); - - if (!group) { - return null; - } - - if (full) { - return mapToGroupDTO(group); - } - - return mapToGroupDTOId(group); + return mapToGroupDTO(group); } -export async function createGroup(groupData: GroupDTO, classid: string, assignmentNumber: number): Promise { +export async function getExistingGroupFromGroupDTO(groupData: GroupDTO) { + const classId = typeof(groupData.class) === 'string' ? groupData.class : groupData.class.id; + const assignmentNumber = typeof(groupData.assignment) === 'number' ? groupData.assignment : groupData.assignment.id; + const groupNumber = groupData.groupNumber; + + return await fetchGroup(classId, assignmentNumber, groupNumber); +} + +export async function createGroup(groupData: GroupDTO, classid: string, assignmentNumber: number): Promise { const studentRepository = getStudentRepository(); - const memberUsernames = (groupData.members as string[]) || []; // TODO check if groupdata.members is a list + const memberUsernames = (groupData.members as string[]) || []; const members = (await Promise.all([...memberUsernames].map(async (id) => studentRepository.findByUsername(id)))).filter( (student) => student !== null ); - getLogger().debug(members); - - const classRepository = getClassRepository(); - const cls = await classRepository.findById(classid); - - if (!cls) { - return null; - } - - const assignmentRepository = getAssignmentRepository(); - const assignment = await assignmentRepository.findByClassAndId(cls, assignmentNumber); - - if (!assignment) { - return null; - } + const assignment = await fetchAssignment(classid, assignmentNumber); const groupRepository = getGroupRepository(); - try { - const newGroup = groupRepository.create({ - assignment: assignment, - members: members, - }); - await groupRepository.save(newGroup); + const newGroup = groupRepository.create({ + assignment: assignment, + members: members, + }); + await groupRepository.save(newGroup); - return newGroup; - } catch (e) { - getLogger().error(e); - return null; - } + return mapToGroupDTO(newGroup); } export async function getAllGroups(classId: string, assignmentNumber: number, full: boolean): Promise { const assignment = await fetchAssignment(classId, assignmentNumber); - if (!assignment) { - return []; - } - const groupRepository = getGroupRepository(); const groups = await groupRepository.findAllGroupsForAssignment(assignment); @@ -106,10 +84,6 @@ export async function getGroupSubmissions( ): Promise { const group = await fetchGroup(classId, assignmentNumber, groupNumber); - if (!group) { - return []; - } - const submissionRepository = getSubmissionRepository(); const submissions = await submissionRepository.findAllSubmissionsForGroup(group); diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts index e80b53ee..f3ee0f10 100644 --- a/backend/src/services/submissions.ts +++ b/backend/src/services/submissions.ts @@ -4,11 +4,14 @@ import { NotFoundException } from '../exceptions/not-found-exception.js'; import { mapToSubmission, mapToSubmissionDTO } from '../interfaces/submission.js'; import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission'; import { Language } from '@dwengo-1/common/util/language'; +import { fetchStudent } from './students.js'; +import { fetchGroup, getExistingGroupFromGroupDTO } from './groups.js'; +import { Submission } from '../entities/assignments/submission.entity.js'; -export async function getSubmission( +export async function fetchSubmission( loId: LearningObjectIdentifier, - submissionNumber: number -): Promise { + submissionNumber: number, +): Promise { const submissionRepository = getSubmissionRepository(); const submission = await submissionRepository.findSubmissionByLearningObjectAndSubmissionNumber(loId, submissionNumber); @@ -16,6 +19,14 @@ export async function getSubmission( throw new NotFoundException('Could not find submission'); } + return submission; +} + +export async function getSubmission( + loId: LearningObjectIdentifier, + submissionNumber: number +): Promise { + const submission = await fetchSubmission(loId, submissionNumber); return mapToSubmissionDTO(submission); } @@ -28,30 +39,22 @@ export async function getAllSubmissions( return submissions.map(mapToSubmissionDTO); } -export async function createSubmission(submissionDTO: SubmissionDTO): Promise { - const submissionRepository = getSubmissionRepository(); - const submission = mapToSubmission(submissionDTO); +export async function createSubmission(submissionDTO: SubmissionDTO): Promise { + const submitter = await fetchStudent(submissionDTO.submitter.username); + const group = submissionDTO.group ? await getExistingGroupFromGroupDTO(submissionDTO.group) : undefined; - try { - const newSubmission = submissionRepository.create(submission); - await submissionRepository.save(newSubmission); - } catch (_) { - return null; - } + const submissionRepository = getSubmissionRepository(); + const submission = mapToSubmission(submissionDTO, submitter, group); + await submissionRepository.save(submission); return mapToSubmissionDTO(submission); } export async function deleteSubmission(loId: LearningObjectIdentifier, submissionNumber: number): Promise { + const submission = await fetchSubmission(loId, submissionNumber); + const submissionRepository = getSubmissionRepository(); - - const submission = await getSubmission(loId, submissionNumber); - - if (!submission) { - throw new NotFoundException('Could not delete submission because it does not exist'); - } - await submissionRepository.deleteSubmissionByLearningObjectAndSubmissionNumber(loId, submissionNumber); - return submission; + return mapToSubmissionDTO(submission); } diff --git a/common/src/interfaces/group.ts b/common/src/interfaces/group.ts index ca95770a..742f2c75 100644 --- a/common/src/interfaces/group.ts +++ b/common/src/interfaces/group.ts @@ -1,7 +1,9 @@ import { AssignmentDTO } from './assignment'; +import { ClassDTO } from './class'; import { StudentDTO } from './student'; export interface GroupDTO { + class: string | ClassDTO; assignment: number | AssignmentDTO; groupNumber: number; members: string[] | StudentDTO[]; From 441b77b8cdf84b51933b38a3e610135294bc07db Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 19:29:08 +0200 Subject: [PATCH 16/94] fix: requireFields toegevoegd op plaatsen --- backend/src/controllers/assignments.ts | 1 - backend/src/controllers/groups.ts | 1 + backend/src/controllers/submissions.ts | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts index 42c822f0..a284360d 100644 --- a/backend/src/controllers/assignments.ts +++ b/backend/src/controllers/assignments.ts @@ -7,7 +7,6 @@ import {BadRequestException} from "../exceptions/bad-request-exception"; export async function getAllAssignmentsHandler(req: Request, res: Response): Promise { const classId = req.params.classid; const full = req.query.full === 'true'; - requireFields({ classId }); const assignments = await getAllAssignments(classId, full); diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts index 446a6a7e..b5f32d37 100644 --- a/backend/src/controllers/groups.ts +++ b/backend/src/controllers/groups.ts @@ -3,6 +3,7 @@ import { createGroup, getAllGroups, getGroup, getGroupSubmissions } from '../ser import { GroupDTO } from '@dwengo-1/common/interfaces/group'; import { requireFields } from './error-helper.js'; import { BadRequestException } from '../exceptions/bad-request-exception.js'; +import { getLogger } from '../logging/initalize.js'; export async function getGroupHandler(req: Request, res: Response): Promise { const classId = req.params.classid; diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts index a49992bb..3e10b0f2 100644 --- a/backend/src/controllers/submissions.ts +++ b/backend/src/controllers/submissions.ts @@ -38,6 +38,7 @@ export async function getAllSubmissionsHandler(req: Request, res: Response): Pro res.json({ submissions }); } +// TODO: gerald moet nog dingen toevoegen aan de databank voor dat dit gefinaliseerd kan worden export async function createSubmissionHandler(req: Request, res: Response): Promise { const submissionDTO = req.body as SubmissionDTO; const submission = await createSubmission(submissionDTO); From d65bb1f4a6034698a81878b9d84e28f94c0f2f68 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 19:52:00 +0200 Subject: [PATCH 17/94] feat: post en delete toegevoegd voor class students en teachers --- backend/src/controllers/classes.ts | 44 ++++++++++++++++++++++++++++++ backend/src/routes/classes.ts | 12 ++++++++ backend/src/services/classes.ts | 38 ++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts index a0ceff17..4e0095af 100644 --- a/backend/src/controllers/classes.ts +++ b/backend/src/controllers/classes.ts @@ -1,7 +1,11 @@ import { Request, Response } from 'express'; import { + addClassStudent, + addClassTeacher, createClass, deleteClass, + deleteClassStudent, + deleteClassTeacher, getAllClasses, getClass, getClassStudents, @@ -73,3 +77,43 @@ export async function getTeacherInvitationsHandler(req: Request, res: Response): res.json({ invitations }); } + +export async function deleteClassStudentHandler(req: Request, res: Response): Promise { + const classId = req.params.id; + const username = req.params.username; + requireFields({ classId, username }); + + const cls = await deleteClassStudent(classId, username); + + res.json({ class: cls }); +} + +export async function deleteClassTeacherHandler(req: Request, res: Response): Promise { + const classId = req.params.id; + const username = req.params.username; + requireFields({ classId, username }); + + const cls = await deleteClassTeacher(classId, username); + + res.json({ class: cls }); +} + +export async function addClassStudentHandler(req: Request, res: Response): Promise { + const classId = req.params.id; + const username = req.body.username; + requireFields({ classId, username }); + + const cls = await addClassStudent(classId, username); + + res.json({ class: cls }); +} + +export async function addClassTeacherHandler(req: Request, res: Response): Promise { + const classId = req.params.id; + const username = req.body.username; + requireFields({ classId, username }); + + const cls = await addClassTeacher(classId, username); + + res.json({ class: cls }); +} diff --git a/backend/src/routes/classes.ts b/backend/src/routes/classes.ts index 4ca8b0b9..aaf95567 100644 --- a/backend/src/routes/classes.ts +++ b/backend/src/routes/classes.ts @@ -1,7 +1,11 @@ import express from 'express'; import { + addClassStudentHandler, + addClassTeacherHandler, createClassHandler, deleteClassHandler, + deleteClassStudentHandler, + deleteClassTeacherHandler, getAllClassesHandler, getClassHandler, getClassStudentsHandler, getClassTeachersHandler, @@ -24,8 +28,16 @@ router.get('/:id/teacher-invitations', getTeacherInvitationsHandler); router.get('/:id/students', getClassStudentsHandler); +router.post('/:id/students', addClassStudentHandler); + +router.delete('/:id/students/:username', deleteClassStudentHandler); + router.get('/:id/teachers', getClassTeachersHandler); +router.post('/:id/teachers', addClassTeacherHandler); + +router.delete('/:id/teachers/:username', deleteClassTeacherHandler); + router.use('/:classid/assignments', assignmentRouter); export default router; diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index 4c8d4caf..9b74397b 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -101,3 +101,41 @@ export async function getClassTeacherInvitations(classId: string, full: boolean) return invitations.map(mapToTeacherInvitationDTOIds); } + +export async function deleteClassStudent(classId: string, username: string): Promise { + const cls = await fetchClass(classId); + + const classRepository = getClassRepository(); + classRepository.assign(cls, { students: cls.students.filter((student) => student.username !== username) }); + + return mapToClassDTO(cls); +} + +export async function deleteClassTeacher(classId: string, username: string): Promise { + const cls = await fetchClass(classId); + + const classRepository = getClassRepository(); + classRepository.assign(cls, { teachers: cls.teachers.filter((teacher) => teacher.username !== username) }); + + return mapToClassDTO(cls); +} + +export async function addClassStudent(classId: string, username: string): Promise { + const cls = await fetchClass(classId); + const newStudent = await fetchStudent(username); + + const classRepository = getClassRepository(); + classRepository.assign(cls, { students: [...cls.students, newStudent] }); + + return mapToClassDTO(cls); +} + +export async function addClassTeacher(classId: string, username: string): Promise { + const cls = await fetchClass(classId); + const newTeacher = await fetchTeacher(username); + + const classRepository = getClassRepository(); + classRepository.assign(cls, { teachers: [...cls.teachers, newTeacher] }); + + return mapToClassDTO(cls); +} From 2ec5e02061f30e387c23776278795afa392da9e7 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 19:57:16 +0200 Subject: [PATCH 18/94] feat: DELETE op assignment geimplementeerd --- backend/src/controllers/assignments.ts | 14 +++++++++++++- backend/src/routes/assignments.ts | 5 +++-- backend/src/services/assignments.ts | 10 ++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts index a284360d..86e3217e 100644 --- a/backend/src/controllers/assignments.ts +++ b/backend/src/controllers/assignments.ts @@ -1,5 +1,5 @@ import { Request, Response } from 'express'; -import { createAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions } from '../services/assignments.js'; +import { createAssignment, deleteAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions } from '../services/assignments.js'; import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; import {requireFields} from "./error-helper"; import {BadRequestException} from "../exceptions/bad-request-exception"; @@ -42,6 +42,18 @@ export async function getAssignmentHandler(req: Request, res: Response): Promise res.json({ assignment }); } +export async function deleteAssignmentHandler(req: Request, res: Response): Promise { + const id = Number(req.params.id); + const classid = req.params.classid; + requireFields({ id, classid }); + + if (isNaN(id)) { + throw new BadRequestException("Assignment id should be a number"); + } + + const assignment = await deleteAssignment(classid, id); +} + export async function getAssignmentsSubmissionsHandler(req: Request, res: Response): Promise { const classid = req.params.classid; const assignmentNumber = Number(req.params.id); diff --git a/backend/src/routes/assignments.ts b/backend/src/routes/assignments.ts index 3652dcc6..054de407 100644 --- a/backend/src/routes/assignments.ts +++ b/backend/src/routes/assignments.ts @@ -1,6 +1,7 @@ import express from 'express'; import { createAssignmentHandler, + deleteAssignmentHandler, getAllAssignmentsHandler, getAssignmentHandler, getAssignmentsSubmissionsHandler, @@ -9,14 +10,14 @@ import groupRouter from './groups.js'; const router = express.Router({ mergeParams: true }); -// Root endpoint used to search objects router.get('/', getAllAssignmentsHandler); router.post('/', createAssignmentHandler); -// Information about an assignment with id 'id' router.get('/:id', getAssignmentHandler); +router.delete('/:id', deleteAssignmentHandler); + router.get('/:id/submissions', getAssignmentsSubmissionsHandler); router.get('/:id/questions', (_req, res) => { diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts index 05ebb1d1..a2892bed 100644 --- a/backend/src/services/assignments.ts +++ b/backend/src/services/assignments.ts @@ -57,6 +57,16 @@ export async function getAssignment(classid: string, id: number): Promise { + const assignment = await fetchAssignment(classid, id); + const cls = await fetchClass(classid); + + const assignmentRepository = getAssignmentRepository(); + await assignmentRepository.deleteByClassAndId(cls, id); + + return mapToAssignmentDTO(assignment); +} + export async function getAssignmentsSubmissions( classid: string, assignmentNumber: number, From 709d5f019ad041215337cd91dbe126b571b38b58 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 20:03:46 +0200 Subject: [PATCH 19/94] feat: DELETE voor group geimplementeerd --- backend/src/controllers/groups.ts | 28 +++++++++++++++++++--------- backend/src/routes/groups.ts | 5 +++-- backend/src/services/groups.ts | 10 ++++++++++ 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts index b5f32d37..781cd4fd 100644 --- a/backend/src/controllers/groups.ts +++ b/backend/src/controllers/groups.ts @@ -1,14 +1,11 @@ import { Request, Response } from 'express'; -import { createGroup, getAllGroups, getGroup, getGroupSubmissions } from '../services/groups.js'; +import { createGroup, deleteGroup, getAllGroups, getGroup, getGroupSubmissions } from '../services/groups.js'; import { GroupDTO } from '@dwengo-1/common/interfaces/group'; import { requireFields } from './error-helper.js'; import { BadRequestException } from '../exceptions/bad-request-exception.js'; import { getLogger } from '../logging/initalize.js'; -export async function getGroupHandler(req: Request, res: Response): Promise { - const classId = req.params.classid; - const assignmentId = parseInt(req.params.assignmentid); - const groupId = parseInt(req.params.groupid); +function checkGroupFields(classId: any, assignmentId: any, groupId: any) { requireFields({ classId, assignmentId, groupId }); if (isNaN(assignmentId)) { @@ -18,13 +15,26 @@ export async function getGroupHandler(req: Request, res: Response): Promise { + const classId = req.params.classid; + const assignmentId = parseInt(req.params.assignmentid); + const groupId = parseInt(req.params.groupid); + checkGroupFields(classId, assignmentId, groupId); const group = await getGroup(classId, assignmentId, groupId); - if (!group) { - res.status(404).json({ error: 'Group not found' }); - return; - } + res.json({ group }); +} + +export async function deleteGroupHandler(req: Request, res: Response): Promise { + const classId = req.params.classid; + const assignmentId = parseInt(req.params.assignmentid); + const groupId = parseInt(req.params.groupid); + checkGroupFields(classId, assignmentId, groupId); + + const group = await deleteGroup(classId, assignmentId, groupId); res.json({ group }); } diff --git a/backend/src/routes/groups.ts b/backend/src/routes/groups.ts index 81532a90..4a7d6b10 100644 --- a/backend/src/routes/groups.ts +++ b/backend/src/routes/groups.ts @@ -1,5 +1,5 @@ import express from 'express'; -import { createGroupHandler, getAllGroupsHandler, getGroupHandler, getGroupSubmissionsHandler } from '../controllers/groups.js'; +import { createGroupHandler, deleteGroupHandler, getAllGroupsHandler, getGroupHandler, getGroupSubmissionsHandler } from '../controllers/groups.js'; const router = express.Router({ mergeParams: true }); @@ -8,9 +8,10 @@ router.get('/', getAllGroupsHandler); router.post('/', createGroupHandler); -// Information about a group (members, ... [TODO DOC]) router.get('/:groupid', getGroupHandler); +router.delete('/:groupid', deleteGroupHandler); + router.get('/:groupid/submissions', getGroupSubmissionsHandler); export default router; diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts index 94f96d54..68784177 100644 --- a/backend/src/services/groups.ts +++ b/backend/src/services/groups.ts @@ -35,6 +35,16 @@ export async function getGroup(classId: string, assignmentNumber: number, groupN return mapToGroupDTO(group); } +export async function deleteGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise { + const group = await fetchGroup(classId, assignmentNumber, groupNumber); + const assignment = await fetchAssignment(classId, assignmentNumber); + + const groupRepository = getGroupRepository(); + await groupRepository.deleteByAssignmentAndGroupNumber(assignment, groupNumber); + + return mapToGroupDTO(group); +} + export async function getExistingGroupFromGroupDTO(groupData: GroupDTO) { const classId = typeof(groupData.class) === 'string' ? groupData.class : groupData.class.id; const assignmentNumber = typeof(groupData.assignment) === 'number' ? groupData.assignment : groupData.assignment.id; From 800d52257ca33756e79c747ec5cfca65c5b6dd41 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 22:02:27 +0200 Subject: [PATCH 20/94] feat: PUT request op assignment geimplementeerd --- backend/src/controllers/assignments.ts | 1 + backend/src/controllers/classes.ts | 13 ++++++++++++- backend/src/interfaces/assignment.ts | 8 ++++---- backend/src/routes/classes.ts | 3 +++ backend/src/services/assignments.ts | 1 + backend/src/services/classes.ts | 17 ++++++++++++++++- 6 files changed, 37 insertions(+), 6 deletions(-) diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts index 86e3217e..e04dc801 100644 --- a/backend/src/controllers/assignments.ts +++ b/backend/src/controllers/assignments.ts @@ -3,6 +3,7 @@ import { createAssignment, deleteAssignment, getAllAssignments, getAssignment, g import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; import {requireFields} from "./error-helper"; import {BadRequestException} from "../exceptions/bad-request-exception"; +import { getLogger } from '../logging/initalize.js'; export async function getAllAssignmentsHandler(req: Request, res: Response): Promise { const classId = req.params.classid; diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts index 4e0095af..c6b71ad2 100644 --- a/backend/src/controllers/classes.ts +++ b/backend/src/controllers/classes.ts @@ -10,7 +10,8 @@ import { getClass, getClassStudents, getClassTeacherInvitations, - getClassTeachers + getClassTeachers, + putClass } from '../services/classes.js'; import { ClassDTO } from '@dwengo-1/common/interfaces/class'; import {requireFields} from "./error-helper"; @@ -41,6 +42,16 @@ export async function getClassHandler(req: Request, res: Response): Promise { + const classId = req.params.id; + requireFields({ classId }); + + const newData = req.body as Partial; + const cls = await putClass(classId, newData); + + res.json({ class: cls }); +} + export async function deleteClassHandler(req: Request, res: Response): Promise { const classId = req.params.id; const cls = await deleteClass(classId); diff --git a/backend/src/interfaces/assignment.ts b/backend/src/interfaces/assignment.ts index d48a9083..09e12dd0 100644 --- a/backend/src/interfaces/assignment.ts +++ b/backend/src/interfaces/assignment.ts @@ -4,28 +4,28 @@ import { Assignment } from '../entities/assignments/assignment.entity.js'; import { Class } from '../entities/classes/class.entity.js'; import { getLogger } from '../logging/initalize.js'; import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; +import { mapToGroupDTO } from './group.js'; export function mapToAssignmentDTOId(assignment: Assignment): AssignmentDTO { return { id: assignment.id!, - class: assignment.within.classId!, + within: assignment.within.classId!, title: assignment.title, description: assignment.description, learningPath: assignment.learningPathHruid, language: assignment.learningPathLanguage, - // Groups: assignment.groups.map(group => group.groupNumber), }; } export function mapToAssignmentDTO(assignment: Assignment): AssignmentDTO { return { id: assignment.id!, - class: assignment.within.classId!, + within: assignment.within.classId!, title: assignment.title, description: assignment.description, learningPath: assignment.learningPathHruid, language: assignment.learningPathLanguage, - // Groups: assignment.groups.map(mapToGroupDTO), + // groups: assignment.groups.map(mapToGroupDTO), }; } diff --git a/backend/src/routes/classes.ts b/backend/src/routes/classes.ts index aaf95567..aa2a4814 100644 --- a/backend/src/routes/classes.ts +++ b/backend/src/routes/classes.ts @@ -10,6 +10,7 @@ import { getClassHandler, getClassStudentsHandler, getClassTeachersHandler, getTeacherInvitationsHandler, + putClassHandler, } from '../controllers/classes.js'; import assignmentRouter from './assignments.js'; @@ -22,6 +23,8 @@ router.post('/', createClassHandler); router.get('/:id', getClassHandler); +router.put('/:id', putClassHandler); + router.delete('/:id', deleteClassHandler); router.get('/:id/teacher-invitations', getTeacherInvitationsHandler); diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts index a2892bed..8ab58070 100644 --- a/backend/src/services/assignments.ts +++ b/backend/src/services/assignments.ts @@ -8,6 +8,7 @@ import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submissi import { fetchClass } from './classes.js'; import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission'; +import { getLogger } from '../logging/initalize.js'; export async function fetchAssignment(classid: string, assignmentNumber: number): Promise { const classRepository = getClassRepository(); diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index 9b74397b..f3209c0d 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -9,9 +9,10 @@ import { ClassDTO } from '@dwengo-1/common/interfaces/class'; import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation'; import { StudentDTO } from '@dwengo-1/common/interfaces/student'; import {fetchTeacher} from "./teachers"; -import {fetchStudent} from "./students"; +import {fetchStudent, getStudent} from "./students"; import {TeacherDTO} from "@dwengo-1/common/interfaces/teacher"; import {mapToTeacherDTO} from "../interfaces/teacher"; +import { EntityDTO } from '@mikro-orm/core'; export async function fetchClass(classid: string): Promise { const classRepository = getClassRepository(); @@ -57,6 +58,16 @@ export async function createClass(classData: ClassDTO): Promise { return mapToClassDTO(newClass); } +export async function putClass(classId: string, classData: Partial): Promise { + const cls = await fetchClass(classId); + + const classRepository = getClassRepository(); + classRepository.assign(cls, classData as Partial>); + await classRepository.getEntityManager().flush(); + + return mapToClassDTO(cls); +} + export async function deleteClass(classId: string): Promise { const cls = await fetchClass(classId); @@ -107,6 +118,7 @@ export async function deleteClassStudent(classId: string, username: string): Pro const classRepository = getClassRepository(); classRepository.assign(cls, { students: cls.students.filter((student) => student.username !== username) }); + await classRepository.getEntityManager().flush(); return mapToClassDTO(cls); } @@ -116,6 +128,7 @@ export async function deleteClassTeacher(classId: string, username: string): Pro const classRepository = getClassRepository(); classRepository.assign(cls, { teachers: cls.teachers.filter((teacher) => teacher.username !== username) }); + await classRepository.getEntityManager().flush(); return mapToClassDTO(cls); } @@ -126,6 +139,7 @@ export async function addClassStudent(classId: string, username: string): Promis const classRepository = getClassRepository(); classRepository.assign(cls, { students: [...cls.students, newStudent] }); + await classRepository.getEntityManager().flush(); return mapToClassDTO(cls); } @@ -136,6 +150,7 @@ export async function addClassTeacher(classId: string, username: string): Promis const classRepository = getClassRepository(); classRepository.assign(cls, { teachers: [...cls.teachers, newTeacher] }); + await classRepository.getEntityManager().flush(); return mapToClassDTO(cls); } From 541e8ab2d534ddc958bb491ad2b440c7933f10f7 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 22:19:15 +0200 Subject: [PATCH 21/94] feat: PUT request geabstraheerd naar service-helper.ts --- backend/src/controllers/assignments.ts | 14 +++++++++++++ backend/src/services/assignments.ts | 11 ++++++++++ backend/src/services/classes.ts | 29 +++++++++++--------------- backend/src/services/service-helper.ts | 20 ++++++++++++++++++ 4 files changed, 57 insertions(+), 17 deletions(-) create mode 100644 backend/src/services/service-helper.ts diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts index e04dc801..f70ae4a9 100644 --- a/backend/src/controllers/assignments.ts +++ b/backend/src/controllers/assignments.ts @@ -43,6 +43,20 @@ export async function getAssignmentHandler(req: Request, res: Response): Promise res.json({ assignment }); } +export async function putAssignmentHandler(req: Request, res: Response): Promise { + const id = Number(req.params.id); + const classid = req.params.classid; + requireFields({ id, classid }); + + if (isNaN(id)) { + throw new BadRequestException("Assignment id should be a number") + } + + const assignment = await putAssignment(classid, id); + + res.json({ assignment }); +} + export async function deleteAssignmentHandler(req: Request, res: Response): Promise { const id = Number(req.params.id); const classid = req.params.classid; diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts index 8ab58070..9f5d9183 100644 --- a/backend/src/services/assignments.ts +++ b/backend/src/services/assignments.ts @@ -9,6 +9,9 @@ import { fetchClass } from './classes.js'; import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission'; import { getLogger } from '../logging/initalize.js'; +import { EntityData, EntityDTO, FromEntityType } from '@mikro-orm/core'; +import { DwengoEntityRepository } from '../data/dwengo-entity-repository.js'; +import { putObject } from './service-helper.js'; export async function fetchAssignment(classid: string, assignmentNumber: number): Promise { const classRepository = getClassRepository(); @@ -58,6 +61,14 @@ export async function getAssignment(classid: string, id: number): Promise>): Promise { + const assignment = await fetchAssignment(classid, id); + + await putObject(assignment, assignmentData, getAssignmentRepository()); + + return mapToAssignmentDTO(assignment); +} + export async function deleteAssignment(classid: string, id: number): Promise { const assignment = await fetchAssignment(classid, id); const cls = await fetchClass(classid); diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index f3209c0d..128cdec8 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -13,6 +13,7 @@ import {fetchStudent, getStudent} from "./students"; import {TeacherDTO} from "@dwengo-1/common/interfaces/teacher"; import {mapToTeacherDTO} from "../interfaces/teacher"; import { EntityDTO } from '@mikro-orm/core'; +import { putObject } from './service-helper.js'; export async function fetchClass(classid: string): Promise { const classRepository = getClassRepository(); @@ -58,12 +59,10 @@ export async function createClass(classData: ClassDTO): Promise { return mapToClassDTO(newClass); } -export async function putClass(classId: string, classData: Partial): Promise { +export async function putClass(classId: string, classData: Partial>): Promise { const cls = await fetchClass(classId); - const classRepository = getClassRepository(); - classRepository.assign(cls, classData as Partial>); - await classRepository.getEntityManager().flush(); + await putObject(cls, classData, getClassRepository()); return mapToClassDTO(cls); } @@ -116,9 +115,8 @@ export async function getClassTeacherInvitations(classId: string, full: boolean) export async function deleteClassStudent(classId: string, username: string): Promise { const cls = await fetchClass(classId); - const classRepository = getClassRepository(); - classRepository.assign(cls, { students: cls.students.filter((student) => student.username !== username) }); - await classRepository.getEntityManager().flush(); + const newStudents = { students: cls.students.filter((student) => student.username !== username) }; + await putObject(cls, newStudents, getClassRepository()); return mapToClassDTO(cls); } @@ -126,9 +124,8 @@ export async function deleteClassStudent(classId: string, username: string): Pro export async function deleteClassTeacher(classId: string, username: string): Promise { const cls = await fetchClass(classId); - const classRepository = getClassRepository(); - classRepository.assign(cls, { teachers: cls.teachers.filter((teacher) => teacher.username !== username) }); - await classRepository.getEntityManager().flush(); + const newTeachers = { teachers: cls.teachers.filter((teacher) => teacher.username !== username) }; + await putObject(cls, newTeachers, getClassRepository()); return mapToClassDTO(cls); } @@ -137,10 +134,9 @@ export async function addClassStudent(classId: string, username: string): Promis const cls = await fetchClass(classId); const newStudent = await fetchStudent(username); - const classRepository = getClassRepository(); - classRepository.assign(cls, { students: [...cls.students, newStudent] }); - await classRepository.getEntityManager().flush(); - + const newStudents = { students: [...cls.students, newStudent] } + await putObject(cls, newStudents, getClassRepository()); + return mapToClassDTO(cls); } @@ -148,9 +144,8 @@ export async function addClassTeacher(classId: string, username: string): Promis const cls = await fetchClass(classId); const newTeacher = await fetchTeacher(username); - const classRepository = getClassRepository(); - classRepository.assign(cls, { teachers: [...cls.teachers, newTeacher] }); - await classRepository.getEntityManager().flush(); + const newTeachers = { teachers: [...cls.teachers, newTeacher] }; + await putObject(cls, newTeachers, getClassRepository()); return mapToClassDTO(cls); } diff --git a/backend/src/services/service-helper.ts b/backend/src/services/service-helper.ts new file mode 100644 index 00000000..28ff0eb0 --- /dev/null +++ b/backend/src/services/service-helper.ts @@ -0,0 +1,20 @@ +import { EntityDTO, FromEntityType } from "@mikro-orm/core"; +import { DwengoEntityRepository } from "../data/dwengo-entity-repository"; + +/** + * Utility function to perform an PUT on an object. + * + * @param object The object that needs to be changed + * @param data The datafields and their values that will be updated + * @param repo The repository on which this action needs to be performed + * + * @returns Nothing. + */ +export async function putObject( + object: T, + data: Partial>>, + repo: DwengoEntityRepository +): Promise { + repo.assign(object, data); + await repo.getEntityManager().flush(); +} \ No newline at end of file From 8eb468eef03504570be44e47958162635cd302a1 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 22:21:07 +0200 Subject: [PATCH 22/94] fix: errors in vorige commit gefixt --- backend/src/controllers/assignments.ts | 7 +++++-- backend/src/routes/assignments.ts | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts index f70ae4a9..42534b3e 100644 --- a/backend/src/controllers/assignments.ts +++ b/backend/src/controllers/assignments.ts @@ -1,9 +1,11 @@ import { Request, Response } from 'express'; -import { createAssignment, deleteAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions } from '../services/assignments.js'; +import { createAssignment, deleteAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions, putAssignment } from '../services/assignments.js'; import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; import {requireFields} from "./error-helper"; import {BadRequestException} from "../exceptions/bad-request-exception"; import { getLogger } from '../logging/initalize.js'; +import { Assignment } from '../entities/assignments/assignment.entity.js'; +import { EntityDTO } from '@mikro-orm/core'; export async function getAllAssignmentsHandler(req: Request, res: Response): Promise { const classId = req.params.classid; @@ -52,7 +54,8 @@ export async function putAssignmentHandler(req: Request, res: Response): Promise throw new BadRequestException("Assignment id should be a number") } - const assignment = await putAssignment(classid, id); + const assignmentData = req.body as Partial>; + const assignment = await putAssignment(classid, id, assignmentData); res.json({ assignment }); } diff --git a/backend/src/routes/assignments.ts b/backend/src/routes/assignments.ts index 054de407..083ee586 100644 --- a/backend/src/routes/assignments.ts +++ b/backend/src/routes/assignments.ts @@ -5,6 +5,7 @@ import { getAllAssignmentsHandler, getAssignmentHandler, getAssignmentsSubmissionsHandler, + putAssignmentHandler, } from '../controllers/assignments.js'; import groupRouter from './groups.js'; @@ -16,6 +17,8 @@ router.post('/', createAssignmentHandler); router.get('/:id', getAssignmentHandler); +router.put('/:id', putAssignmentHandler); + router.delete('/:id', deleteAssignmentHandler); router.get('/:id/submissions', getAssignmentsSubmissionsHandler); From 7968d49c5ed3bbdce1c68d12ca4b709e27055bbb Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 22:21:20 +0200 Subject: [PATCH 23/94] fix: errors in vorige commit gefixt --- common/src/interfaces/assignment.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/interfaces/assignment.ts b/common/src/interfaces/assignment.ts index 8ad1649b..5cb8feff 100644 --- a/common/src/interfaces/assignment.ts +++ b/common/src/interfaces/assignment.ts @@ -2,7 +2,7 @@ import { GroupDTO } from './group'; export interface AssignmentDTO { id: number; - class: string; // Id of class 'within' + within: string; title: string; description: string; learningPath: string; From 4e6f7ccb3d19a32c32ae035382be0b9b24eb0678 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 22:21:53 +0200 Subject: [PATCH 24/94] fix: errors in vorige commit gefixt --- backend/src/controllers/classes.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts index c6b71ad2..269259aa 100644 --- a/backend/src/controllers/classes.ts +++ b/backend/src/controllers/classes.ts @@ -15,6 +15,8 @@ import { } from '../services/classes.js'; import { ClassDTO } from '@dwengo-1/common/interfaces/class'; import {requireFields} from "./error-helper"; +import { EntityDTO } from '@mikro-orm/core'; +import { Class } from '../entities/classes/class.entity.js'; export async function getAllClassesHandler(req: Request, res: Response): Promise { const full = req.query.full === 'true'; @@ -46,7 +48,7 @@ export async function putClassHandler(req: Request, res: Response): Promise; + const newData = req.body as Partial>; const cls = await putClass(classId, newData); res.json({ class: cls }); From 33f785ebc03185669f9705e47b82020171f6e35a Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 22:27:02 +0200 Subject: [PATCH 25/94] feat: PUT op group geimplementeerd --- backend/src/controllers/groups.ts | 15 ++++++++++++++- backend/src/routes/groups.ts | 4 +++- backend/src/services/assignments.ts | 2 +- backend/src/services/classes.ts | 10 +++++----- backend/src/services/groups.ts | 16 +++++++++++++++- backend/src/services/service-helper.ts | 2 +- 6 files changed, 39 insertions(+), 10 deletions(-) diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts index 781cd4fd..85b0809c 100644 --- a/backend/src/controllers/groups.ts +++ b/backend/src/controllers/groups.ts @@ -1,9 +1,11 @@ import { Request, Response } from 'express'; -import { createGroup, deleteGroup, getAllGroups, getGroup, getGroupSubmissions } from '../services/groups.js'; +import { createGroup, deleteGroup, getAllGroups, getGroup, getGroupSubmissions, putGroup } from '../services/groups.js'; import { GroupDTO } from '@dwengo-1/common/interfaces/group'; import { requireFields } from './error-helper.js'; import { BadRequestException } from '../exceptions/bad-request-exception.js'; import { getLogger } from '../logging/initalize.js'; +import { EntityDTO } from '@mikro-orm/core'; +import { Group } from '../entities/assignments/group.entity.js'; function checkGroupFields(classId: any, assignmentId: any, groupId: any) { requireFields({ classId, assignmentId, groupId }); @@ -28,6 +30,17 @@ export async function getGroupHandler(req: Request, res: Response): Promise { + const classId = req.params.classid; + const assignmentId = parseInt(req.params.assignmentid); + const groupId = parseInt(req.params.groupid); + checkGroupFields(classId, assignmentId, groupId); + + const group = await putGroup(classId, assignmentId, groupId, req.body as Partial>); + + res.json({ group }); +} + export async function deleteGroupHandler(req: Request, res: Response): Promise { const classId = req.params.classid; const assignmentId = parseInt(req.params.assignmentid); diff --git a/backend/src/routes/groups.ts b/backend/src/routes/groups.ts index 4a7d6b10..54c32462 100644 --- a/backend/src/routes/groups.ts +++ b/backend/src/routes/groups.ts @@ -1,5 +1,5 @@ import express from 'express'; -import { createGroupHandler, deleteGroupHandler, getAllGroupsHandler, getGroupHandler, getGroupSubmissionsHandler } from '../controllers/groups.js'; +import { createGroupHandler, deleteGroupHandler, getAllGroupsHandler, getGroupHandler, getGroupSubmissionsHandler, putGroupHandler } from '../controllers/groups.js'; const router = express.Router({ mergeParams: true }); @@ -10,6 +10,8 @@ router.post('/', createGroupHandler); router.get('/:groupid', getGroupHandler); +router.put('/:groupid', putGroupHandler); + router.delete('/:groupid', deleteGroupHandler); router.get('/:groupid/submissions', getGroupSubmissionsHandler); diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts index 9f5d9183..7b5baaf8 100644 --- a/backend/src/services/assignments.ts +++ b/backend/src/services/assignments.ts @@ -64,7 +64,7 @@ export async function getAssignment(classid: string, id: number): Promise>): Promise { const assignment = await fetchAssignment(classid, id); - await putObject(assignment, assignmentData, getAssignmentRepository()); + await putObject(assignment, assignmentData, getAssignmentRepository()); return mapToAssignmentDTO(assignment); } diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index 128cdec8..dfb12aa2 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -62,7 +62,7 @@ export async function createClass(classData: ClassDTO): Promise { export async function putClass(classId: string, classData: Partial>): Promise { const cls = await fetchClass(classId); - await putObject(cls, classData, getClassRepository()); + await putObject(cls, classData, getClassRepository()); return mapToClassDTO(cls); } @@ -116,7 +116,7 @@ export async function deleteClassStudent(classId: string, username: string): Pro const cls = await fetchClass(classId); const newStudents = { students: cls.students.filter((student) => student.username !== username) }; - await putObject(cls, newStudents, getClassRepository()); + await putObject(cls, newStudents, getClassRepository()); return mapToClassDTO(cls); } @@ -125,7 +125,7 @@ export async function deleteClassTeacher(classId: string, username: string): Pro const cls = await fetchClass(classId); const newTeachers = { teachers: cls.teachers.filter((teacher) => teacher.username !== username) }; - await putObject(cls, newTeachers, getClassRepository()); + await putObject(cls, newTeachers, getClassRepository()); return mapToClassDTO(cls); } @@ -135,7 +135,7 @@ export async function addClassStudent(classId: string, username: string): Promis const newStudent = await fetchStudent(username); const newStudents = { students: [...cls.students, newStudent] } - await putObject(cls, newStudents, getClassRepository()); + await putObject(cls, newStudents, getClassRepository()); return mapToClassDTO(cls); } @@ -145,7 +145,7 @@ export async function addClassTeacher(classId: string, username: string): Promis const newTeacher = await fetchTeacher(username); const newTeachers = { teachers: [...cls.teachers, newTeacher] }; - await putObject(cls, newTeachers, getClassRepository()); + await putObject(cls, newTeachers, getClassRepository()); return mapToClassDTO(cls); } diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts index 68784177..442c1aec 100644 --- a/backend/src/services/groups.ts +++ b/backend/src/services/groups.ts @@ -1,4 +1,4 @@ -import { assign } from '@mikro-orm/core'; +import { assign, EntityDTO } from '@mikro-orm/core'; import { getAssignmentRepository, getClassRepository, @@ -16,6 +16,7 @@ import { getLogger } from '../logging/initalize.js'; import { fetchAssignment } from './assignments.js'; import { NotFoundException } from '../exceptions/not-found-exception.js'; import { fetchClass } from './classes.js'; +import { putObject } from './service-helper.js'; export async function fetchGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise { const assignment = await fetchAssignment(classId, assignmentNumber); @@ -35,6 +36,19 @@ export async function getGroup(classId: string, assignmentNumber: number, groupN return mapToGroupDTO(group); } +export async function putGroup( + classId: string, + assignmentNumber: number, + groupNumber: number, + groupData: Partial> +): Promise { + const group = await fetchGroup(classId, assignmentNumber, groupNumber); + + await putObject(group, groupData, getGroupRepository()); + + return mapToGroupDTO(group); +} + export async function deleteGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise { const group = await fetchGroup(classId, assignmentNumber, groupNumber); const assignment = await fetchAssignment(classId, assignmentNumber); diff --git a/backend/src/services/service-helper.ts b/backend/src/services/service-helper.ts index 28ff0eb0..427ff5dd 100644 --- a/backend/src/services/service-helper.ts +++ b/backend/src/services/service-helper.ts @@ -10,7 +10,7 @@ import { DwengoEntityRepository } from "../data/dwengo-entity-repository"; * * @returns Nothing. */ -export async function putObject( +export async function putObject( object: T, data: Partial>>, repo: DwengoEntityRepository From b963101f629e5f77cba54c86eef99b51a43e2356 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Sun, 6 Apr 2025 20:32:08 +0000 Subject: [PATCH 26/94] style: fix linting issues met ESLint --- backend/src/data/assignments/submission-repository.ts | 4 ++-- backend/src/data/questions/question-repository.ts | 2 +- backend/src/interfaces/assignment.ts | 2 +- backend/src/services/service-helper.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts index 371dd4ef..2e673210 100644 --- a/backend/src/data/assignments/submission-repository.ts +++ b/backend/src/data/assignments/submission-repository.ts @@ -17,7 +17,7 @@ export class SubmissionRepository extends DwengoEntityRepository { }); } - public findByLearningObject(loId: LearningObjectIdentifier): Promise { + public async findByLearningObject(loId: LearningObjectIdentifier): Promise { return this.find({ learningObjectHruid: loId.hruid, learningObjectLanguage: loId.language, @@ -25,7 +25,7 @@ export class SubmissionRepository extends DwengoEntityRepository { }); } - public findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise { + public async findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise { return this.findOne( { learningObjectHruid: loId.hruid, diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts index 246b0484..eb145fa9 100644 --- a/backend/src/data/questions/question-repository.ts +++ b/backend/src/data/questions/question-repository.ts @@ -56,7 +56,7 @@ export class QuestionRepository extends DwengoEntityRepository { }); } - public findAllByAssignment(assignment: Assignment): Promise { + public async findAllByAssignment(assignment: Assignment): Promise { return this.find({ author: assignment.groups.flatMap(group => group.members), learningObjectHruid: assignment.learningPathHruid, diff --git a/backend/src/interfaces/assignment.ts b/backend/src/interfaces/assignment.ts index 09e12dd0..2e591797 100644 --- a/backend/src/interfaces/assignment.ts +++ b/backend/src/interfaces/assignment.ts @@ -25,7 +25,7 @@ export function mapToAssignmentDTO(assignment: Assignment): AssignmentDTO { description: assignment.description, learningPath: assignment.learningPathHruid, language: assignment.learningPathLanguage, - // groups: assignment.groups.map(mapToGroupDTO), + // Groups: assignment.groups.map(mapToGroupDTO), }; } diff --git a/backend/src/services/service-helper.ts b/backend/src/services/service-helper.ts index 28ff0eb0..3f8c897e 100644 --- a/backend/src/services/service-helper.ts +++ b/backend/src/services/service-helper.ts @@ -10,7 +10,7 @@ import { DwengoEntityRepository } from "../data/dwengo-entity-repository"; * * @returns Nothing. */ -export async function putObject( +export async function putObject( object: T, data: Partial>>, repo: DwengoEntityRepository From 34facfe7c8c58aed35ef2209e426312dd3d60294 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Sun, 6 Apr 2025 20:32:13 +0000 Subject: [PATCH 27/94] style: fix linting issues met Prettier --- backend/src/controllers/assignments.ts | 23 +++++++++------ backend/src/controllers/classes.ts | 4 +-- backend/src/controllers/submissions.ts | 8 ++---- .../src/data/questions/question-repository.ts | 4 +-- backend/src/routes/classes.ts | 3 +- backend/src/services/assignments.ts | 28 +++++++++---------- backend/src/services/classes.ts | 28 +++++++++---------- backend/src/services/groups.ts | 8 +++--- backend/src/services/service-helper.ts | 12 ++++---- backend/src/services/submissions.ts | 16 +++-------- backend/src/services/teachers.ts | 6 ++-- frontend/src/controllers/classes.ts | 2 +- 12 files changed, 70 insertions(+), 72 deletions(-) diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts index 42534b3e..c262057c 100644 --- a/backend/src/controllers/assignments.ts +++ b/backend/src/controllers/assignments.ts @@ -1,8 +1,15 @@ import { Request, Response } from 'express'; -import { createAssignment, deleteAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions, putAssignment } from '../services/assignments.js'; +import { + createAssignment, + deleteAssignment, + getAllAssignments, + getAssignment, + getAssignmentsSubmissions, + putAssignment, +} from '../services/assignments.js'; import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; -import {requireFields} from "./error-helper"; -import {BadRequestException} from "../exceptions/bad-request-exception"; +import { requireFields } from './error-helper'; +import { BadRequestException } from '../exceptions/bad-request-exception'; import { getLogger } from '../logging/initalize.js'; import { Assignment } from '../entities/assignments/assignment.entity.js'; import { EntityDTO } from '@mikro-orm/core'; @@ -37,7 +44,7 @@ export async function getAssignmentHandler(req: Request, res: Response): Promise requireFields({ id, classid }); if (isNaN(id)) { - throw new BadRequestException("Assignment id should be a number") + throw new BadRequestException('Assignment id should be a number'); } const assignment = await getAssignment(classid, id); @@ -51,7 +58,7 @@ export async function putAssignmentHandler(req: Request, res: Response): Promise requireFields({ id, classid }); if (isNaN(id)) { - throw new BadRequestException("Assignment id should be a number") + throw new BadRequestException('Assignment id should be a number'); } const assignmentData = req.body as Partial>; @@ -66,10 +73,10 @@ export async function deleteAssignmentHandler(req: Request, res: Response): Prom requireFields({ id, classid }); if (isNaN(id)) { - throw new BadRequestException("Assignment id should be a number"); + throw new BadRequestException('Assignment id should be a number'); } - const assignment = await deleteAssignment(classid, id); + const assignment = await deleteAssignment(classid, id); } export async function getAssignmentsSubmissionsHandler(req: Request, res: Response): Promise { @@ -79,7 +86,7 @@ export async function getAssignmentsSubmissionsHandler(req: Request, res: Respon requireFields({ assignmentNumber, classid }); if (isNaN(assignmentNumber)) { - throw new BadRequestException("Assignment id should be a number") + throw new BadRequestException('Assignment id should be a number'); } const submissions = await getAssignmentsSubmissions(classid, assignmentNumber, full); diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts index 269259aa..6252c714 100644 --- a/backend/src/controllers/classes.ts +++ b/backend/src/controllers/classes.ts @@ -11,10 +11,10 @@ import { getClassStudents, getClassTeacherInvitations, getClassTeachers, - putClass + putClass, } from '../services/classes.js'; import { ClassDTO } from '@dwengo-1/common/interfaces/class'; -import {requireFields} from "./error-helper"; +import { requireFields } from './error-helper'; import { EntityDTO } from '@mikro-orm/core'; import { Class } from '../entities/classes/class.entity.js'; diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts index 3e10b0f2..a742685f 100644 --- a/backend/src/controllers/submissions.ts +++ b/backend/src/controllers/submissions.ts @@ -7,19 +7,17 @@ import { Language, languageMap } from '@dwengo-1/common/util/language'; import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission'; import { requireFields } from './error-helper.js'; - - export async function getSubmissionHandler(req: Request, res: Response): Promise { const lohruid = req.params.hruid; const lang = languageMap[req.query.language as string] || Language.Dutch; const version = (req.query.version || 1) as number; const submissionNumber = Number(req.params.id); requireFields({ lohruid, submissionNumber }); - + if (isNaN(submissionNumber)) { throw new BadRequestException('Submission number must be a number'); } - + const loId = new LearningObjectIdentifier(lohruid, lang, version); const submission = await getSubmission(loId, submissionNumber); @@ -54,7 +52,7 @@ export async function deleteSubmissionHandler(req: Request, res: Response): Prom requireFields({ hruid, submissionNumber }); if (isNaN(submissionNumber)) { - throw new BadRequestException('Submission number must be a number'); + throw new BadRequestException('Submission number must be a number'); } const loId = new LearningObjectIdentifier(hruid, lang, version); diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts index eb145fa9..af1e0a17 100644 --- a/backend/src/data/questions/question-repository.ts +++ b/backend/src/data/questions/question-repository.ts @@ -58,12 +58,12 @@ export class QuestionRepository extends DwengoEntityRepository { public async findAllByAssignment(assignment: Assignment): Promise { return this.find({ - author: assignment.groups.flatMap(group => group.members), + author: assignment.groups.flatMap((group) => group.members), learningObjectHruid: assignment.learningPathHruid, learningObjectLanguage: assignment.learningPathLanguage, }); } - + public async findAllByAuthor(author: Student): Promise { return this.findAll({ where: { author }, diff --git a/backend/src/routes/classes.ts b/backend/src/routes/classes.ts index aa2a4814..cef6fd72 100644 --- a/backend/src/routes/classes.ts +++ b/backend/src/routes/classes.ts @@ -8,7 +8,8 @@ import { deleteClassTeacherHandler, getAllClassesHandler, getClassHandler, - getClassStudentsHandler, getClassTeachersHandler, + getClassStudentsHandler, + getClassTeachersHandler, getTeacherInvitationsHandler, putClassHandler, } from '../controllers/classes.js'; diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts index 9f5d9183..3f1de240 100644 --- a/backend/src/services/assignments.ts +++ b/backend/src/services/assignments.ts @@ -1,5 +1,11 @@ import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; -import { getAssignmentRepository, getClassRepository, getGroupRepository, getQuestionRepository, getSubmissionRepository } from '../data/repositories.js'; +import { + getAssignmentRepository, + getClassRepository, + getGroupRepository, + getQuestionRepository, + getSubmissionRepository, +} from '../data/repositories.js'; import { Assignment } from '../entities/assignments/assignment.entity.js'; import { NotFoundException } from '../exceptions/not-found-exception.js'; import { mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId } from '../interfaces/assignment.js'; @@ -18,7 +24,7 @@ export async function fetchAssignment(classid: string, assignmentNumber: number) const cls = await classRepository.findById(classid); if (!cls) { - throw new NotFoundException('Could not find assignment\'s class'); + throw new NotFoundException("Could not find assignment's class"); } const assignmentRepository = getAssignmentRepository(); @@ -48,10 +54,10 @@ export async function createAssignment(classid: string, assignmentData: Assignme const cls = await fetchClass(classid); const assignment = mapToAssignment(assignmentData, cls); - + const assignmentRepository = getAssignmentRepository(); const newAssignment = assignmentRepository.create(assignment); - await assignmentRepository.save(newAssignment, {preventOverwrite: true}); + await assignmentRepository.save(newAssignment, { preventOverwrite: true }); return mapToAssignmentDTO(newAssignment); } @@ -63,7 +69,7 @@ export async function getAssignment(classid: string, id: number): Promise>): Promise { const assignment = await fetchAssignment(classid, id); - + await putObject(assignment, assignmentData, getAssignmentRepository()); return mapToAssignmentDTO(assignment); @@ -90,9 +96,7 @@ export async function getAssignmentsSubmissions( const groups = await groupRepository.findAllGroupsForAssignment(assignment); const submissionRepository = getSubmissionRepository(); - const submissions = (await Promise.all( - groups.map(async (group) => submissionRepository.findAllSubmissionsForGroup(group)) - )).flat(); + const submissions = (await Promise.all(groups.map(async (group) => submissionRepository.findAllSubmissionsForGroup(group)))).flat(); if (full) { return submissions.map(mapToSubmissionDTO); @@ -101,11 +105,7 @@ export async function getAssignmentsSubmissions( return submissions.map(mapToSubmissionDTOId); } -export async function getAssignmentsQuestions( - classid: string, - assignmentNumber: number, - full: boolean -): Promise { +export async function getAssignmentsQuestions(classid: string, assignmentNumber: number, full: boolean): Promise { const assignment = await fetchAssignment(classid, assignmentNumber); const questionRepository = getQuestionRepository(); @@ -116,4 +116,4 @@ export async function getAssignmentsQuestions( } return questions.map(mapToQuestionDTO); -} \ No newline at end of file +} diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index 128cdec8..b6b4b04e 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -8,10 +8,10 @@ import { Class } from '../entities/classes/class.entity.js'; import { ClassDTO } from '@dwengo-1/common/interfaces/class'; import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation'; import { StudentDTO } from '@dwengo-1/common/interfaces/student'; -import {fetchTeacher} from "./teachers"; -import {fetchStudent, getStudent} from "./students"; -import {TeacherDTO} from "@dwengo-1/common/interfaces/teacher"; -import {mapToTeacherDTO} from "../interfaces/teacher"; +import { fetchTeacher } from './teachers'; +import { fetchStudent, getStudent } from './students'; +import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher'; +import { mapToTeacherDTO } from '../interfaces/teacher'; import { EntityDTO } from '@mikro-orm/core'; import { putObject } from './service-helper.js'; @@ -20,7 +20,7 @@ export async function fetchClass(classid: string): Promise { const cls = await classRepository.findById(classid); if (!cls) { - throw new NotFoundException("Class not found"); + throw new NotFoundException('Class not found'); } return cls; @@ -43,10 +43,10 @@ export async function getClass(classId: string): Promise { export async function createClass(classData: ClassDTO): Promise { const teacherUsernames = classData.teachers || []; - const teachers = (await Promise.all(teacherUsernames.map(async (id) => fetchTeacher(id) ))); + const teachers = await Promise.all(teacherUsernames.map(async (id) => fetchTeacher(id))); const studentUsernames = classData.students || []; - const students = (await Promise.all(studentUsernames.map(async (id) => fetchStudent(id) ))); + const students = await Promise.all(studentUsernames.map(async (id) => fetchStudent(id))); const classRepository = getClassRepository(); const newClass = classRepository.create({ @@ -54,7 +54,7 @@ export async function createClass(classData: ClassDTO): Promise { teachers: teachers, students: students, }); - await classRepository.save(newClass, {preventOverwrite: true}); + await classRepository.save(newClass, { preventOverwrite: true }); return mapToClassDTO(newClass); } @@ -93,7 +93,7 @@ export async function getClassStudentsDTO(classId: string): Promise { const cls = await fetchClass(classId); - if (full){ + if (full) { return cls.teachers.map(mapToTeacherDTO); } return cls.teachers.map((student) => student.username); @@ -114,7 +114,7 @@ export async function getClassTeacherInvitations(classId: string, full: boolean) export async function deleteClassStudent(classId: string, username: string): Promise { const cls = await fetchClass(classId); - + const newStudents = { students: cls.students.filter((student) => student.username !== username) }; await putObject(cls, newStudents, getClassRepository()); @@ -123,7 +123,7 @@ export async function deleteClassStudent(classId: string, username: string): Pro export async function deleteClassTeacher(classId: string, username: string): Promise { const cls = await fetchClass(classId); - + const newTeachers = { teachers: cls.teachers.filter((teacher) => teacher.username !== username) }; await putObject(cls, newTeachers, getClassRepository()); @@ -134,9 +134,9 @@ export async function addClassStudent(classId: string, username: string): Promis const cls = await fetchClass(classId); const newStudent = await fetchStudent(username); - const newStudents = { students: [...cls.students, newStudent] } + const newStudents = { students: [...cls.students, newStudent] }; await putObject(cls, newStudents, getClassRepository()); - + return mapToClassDTO(cls); } @@ -145,7 +145,7 @@ export async function addClassTeacher(classId: string, username: string): Promis const newTeacher = await fetchTeacher(username); const newTeachers = { teachers: [...cls.teachers, newTeacher] }; - await putObject(cls, newTeachers, getClassRepository()); + await putObject(cls, newTeachers, getClassRepository()); return mapToClassDTO(cls); } diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts index 68784177..711cc11f 100644 --- a/backend/src/services/groups.ts +++ b/backend/src/services/groups.ts @@ -27,7 +27,7 @@ export async function fetchGroup(classId: string, assignmentNumber: number, grou throw new NotFoundException('Could not find group'); } - return group; + return group; } export async function getGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise { @@ -38,7 +38,7 @@ export async function getGroup(classId: string, assignmentNumber: number, groupN export async function deleteGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise { const group = await fetchGroup(classId, assignmentNumber, groupNumber); const assignment = await fetchAssignment(classId, assignmentNumber); - + const groupRepository = getGroupRepository(); await groupRepository.deleteByAssignmentAndGroupNumber(assignment, groupNumber); @@ -46,8 +46,8 @@ export async function deleteGroup(classId: string, assignmentNumber: number, gro } export async function getExistingGroupFromGroupDTO(groupData: GroupDTO) { - const classId = typeof(groupData.class) === 'string' ? groupData.class : groupData.class.id; - const assignmentNumber = typeof(groupData.assignment) === 'number' ? groupData.assignment : groupData.assignment.id; + const classId = typeof groupData.class === 'string' ? groupData.class : groupData.class.id; + const assignmentNumber = typeof groupData.assignment === 'number' ? groupData.assignment : groupData.assignment.id; const groupNumber = groupData.groupNumber; return await fetchGroup(classId, assignmentNumber, groupNumber); diff --git a/backend/src/services/service-helper.ts b/backend/src/services/service-helper.ts index 3f8c897e..215564f3 100644 --- a/backend/src/services/service-helper.ts +++ b/backend/src/services/service-helper.ts @@ -1,5 +1,5 @@ -import { EntityDTO, FromEntityType } from "@mikro-orm/core"; -import { DwengoEntityRepository } from "../data/dwengo-entity-repository"; +import { EntityDTO, FromEntityType } from '@mikro-orm/core'; +import { DwengoEntityRepository } from '../data/dwengo-entity-repository'; /** * Utility function to perform an PUT on an object. @@ -7,14 +7,14 @@ import { DwengoEntityRepository } from "../data/dwengo-entity-repository"; * @param object The object that needs to be changed * @param data The datafields and their values that will be updated * @param repo The repository on which this action needs to be performed - * + * * @returns Nothing. */ export async function putObject( - object: T, - data: Partial>>, + object: T, + data: Partial>>, repo: DwengoEntityRepository ): Promise { repo.assign(object, data); await repo.getEntityManager().flush(); -} \ No newline at end of file +} diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts index f3ee0f10..25f6e7f0 100644 --- a/backend/src/services/submissions.ts +++ b/backend/src/services/submissions.ts @@ -8,10 +8,7 @@ import { fetchStudent } from './students.js'; import { fetchGroup, getExistingGroupFromGroupDTO } from './groups.js'; import { Submission } from '../entities/assignments/submission.entity.js'; -export async function fetchSubmission( - loId: LearningObjectIdentifier, - submissionNumber: number, -): Promise { +export async function fetchSubmission(loId: LearningObjectIdentifier, submissionNumber: number): Promise { const submissionRepository = getSubmissionRepository(); const submission = await submissionRepository.findSubmissionByLearningObjectAndSubmissionNumber(loId, submissionNumber); @@ -22,17 +19,12 @@ export async function fetchSubmission( return submission; } -export async function getSubmission( - loId: LearningObjectIdentifier, - submissionNumber: number -): Promise { +export async function getSubmission(loId: LearningObjectIdentifier, submissionNumber: number): Promise { const submission = await fetchSubmission(loId, submissionNumber); return mapToSubmissionDTO(submission); } -export async function getAllSubmissions( - loId: LearningObjectIdentifier, -): Promise { +export async function getAllSubmissions(loId: LearningObjectIdentifier): Promise { const submissionRepository = getSubmissionRepository(); const submissions = await submissionRepository.findByLearningObject(loId); @@ -52,7 +44,7 @@ export async function createSubmission(submissionDTO: SubmissionDTO): Promise { const submission = await fetchSubmission(loId, submissionNumber); - + const submissionRepository = getSubmissionRepository(); await submissionRepository.deleteSubmissionByLearningObjectAndSubmissionNumber(loId, submissionNumber); diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts index 487e42be..3ebc6609 100644 --- a/backend/src/services/teachers.ts +++ b/backend/src/services/teachers.ts @@ -22,7 +22,7 @@ import { Question } from '../entities/questions/question.entity.js'; import { ClassJoinRequestRepository } from '../data/classes/class-join-request-repository.js'; import { Student } from '../entities/users/student.entity.js'; import { NotFoundException } from '../exceptions/not-found-exception.js'; -import {getClassStudents, getClassStudentsDTO} from './classes.js'; +import { getClassStudents, getClassStudentsDTO } from './classes.js'; import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher'; import { ClassDTO } from '@dwengo-1/common/interfaces/class'; import { StudentDTO } from '@dwengo-1/common/interfaces/student'; @@ -102,9 +102,9 @@ export async function getStudentsByTeacher(username: string, full: boolean): Pro const students: StudentDTO[] = (await Promise.all(classIds.map(async (username) => await getClassStudentsDTO(username)))).flat(); if (full) { - return students + return students; } - + return students.map((student) => student.username); } diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts index 9c8a667f..d8e93eca 100644 --- a/frontend/src/controllers/classes.ts +++ b/frontend/src/controllers/classes.ts @@ -3,7 +3,7 @@ import type { ClassDTO } from "@dwengo-1/common/interfaces/class"; import type { StudentsResponse } from "./students"; import type { AssignmentsResponse } from "./assignments"; import type { TeacherInvitationDTO } from "@dwengo-1/common/interfaces/teacher-invitation"; -import type {TeachersResponse} from "@/controllers/teachers.ts"; +import type { TeachersResponse } from "@/controllers/teachers.ts"; export interface ClassesResponse { classes: ClassDTO[] | string[]; From 81da765a74bc50922392e726b32e926ca276db87 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sun, 6 Apr 2025 22:40:09 +0200 Subject: [PATCH 28/94] fix: linter run --- backend/src/data/assignments/submission-repository.ts | 4 ++-- backend/src/data/questions/question-repository.ts | 2 +- backend/src/interfaces/assignment.ts | 2 +- backend/src/services/service-helper.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts index 371dd4ef..2e673210 100644 --- a/backend/src/data/assignments/submission-repository.ts +++ b/backend/src/data/assignments/submission-repository.ts @@ -17,7 +17,7 @@ export class SubmissionRepository extends DwengoEntityRepository { }); } - public findByLearningObject(loId: LearningObjectIdentifier): Promise { + public async findByLearningObject(loId: LearningObjectIdentifier): Promise { return this.find({ learningObjectHruid: loId.hruid, learningObjectLanguage: loId.language, @@ -25,7 +25,7 @@ export class SubmissionRepository extends DwengoEntityRepository { }); } - public findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise { + public async findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise { return this.findOne( { learningObjectHruid: loId.hruid, diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts index 246b0484..eb145fa9 100644 --- a/backend/src/data/questions/question-repository.ts +++ b/backend/src/data/questions/question-repository.ts @@ -56,7 +56,7 @@ export class QuestionRepository extends DwengoEntityRepository { }); } - public findAllByAssignment(assignment: Assignment): Promise { + public async findAllByAssignment(assignment: Assignment): Promise { return this.find({ author: assignment.groups.flatMap(group => group.members), learningObjectHruid: assignment.learningPathHruid, diff --git a/backend/src/interfaces/assignment.ts b/backend/src/interfaces/assignment.ts index 09e12dd0..2e591797 100644 --- a/backend/src/interfaces/assignment.ts +++ b/backend/src/interfaces/assignment.ts @@ -25,7 +25,7 @@ export function mapToAssignmentDTO(assignment: Assignment): AssignmentDTO { description: assignment.description, learningPath: assignment.learningPathHruid, language: assignment.learningPathLanguage, - // groups: assignment.groups.map(mapToGroupDTO), + // Groups: assignment.groups.map(mapToGroupDTO), }; } diff --git a/backend/src/services/service-helper.ts b/backend/src/services/service-helper.ts index 427ff5dd..1b7c23fb 100644 --- a/backend/src/services/service-helper.ts +++ b/backend/src/services/service-helper.ts @@ -10,7 +10,7 @@ import { DwengoEntityRepository } from "../data/dwengo-entity-repository"; * * @returns Nothing. */ -export async function putObject( +export async function putObject( object: T, data: Partial>>, repo: DwengoEntityRepository From aa2d4242ae8d8d15434167a47242fded08155a08 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Sun, 6 Apr 2025 20:44:06 +0000 Subject: [PATCH 29/94] style: fix linting issues met Prettier --- backend/src/routes/groups.ts | 9 ++++++++- backend/src/services/assignments.ts | 2 +- backend/src/services/classes.ts | 6 +++--- backend/src/services/groups.ts | 6 +++--- backend/src/services/service-helper.ts | 4 ++-- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/backend/src/routes/groups.ts b/backend/src/routes/groups.ts index 54c32462..7f973972 100644 --- a/backend/src/routes/groups.ts +++ b/backend/src/routes/groups.ts @@ -1,5 +1,12 @@ import express from 'express'; -import { createGroupHandler, deleteGroupHandler, getAllGroupsHandler, getGroupHandler, getGroupSubmissionsHandler, putGroupHandler } from '../controllers/groups.js'; +import { + createGroupHandler, + deleteGroupHandler, + getAllGroupsHandler, + getGroupHandler, + getGroupSubmissionsHandler, + putGroupHandler, +} from '../controllers/groups.js'; const router = express.Router({ mergeParams: true }); diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts index d703e7f4..55f4947c 100644 --- a/backend/src/services/assignments.ts +++ b/backend/src/services/assignments.ts @@ -69,7 +69,7 @@ export async function getAssignment(classid: string, id: number): Promise>): Promise { const assignment = await fetchAssignment(classid, id); - + await putObject(assignment, assignmentData, getAssignmentRepository()); return mapToAssignmentDTO(assignment); diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index c9d44730..4abe18af 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -134,9 +134,9 @@ export async function addClassStudent(classId: string, username: string): Promis const cls = await fetchClass(classId); const newStudent = await fetchStudent(username); - const newStudents = { students: [...cls.students, newStudent] } + const newStudents = { students: [...cls.students, newStudent] }; await putObject(cls, newStudents, getClassRepository()); - + return mapToClassDTO(cls); } @@ -145,7 +145,7 @@ export async function addClassTeacher(classId: string, username: string): Promis const newTeacher = await fetchTeacher(username); const newTeachers = { teachers: [...cls.teachers, newTeacher] }; - await putObject(cls, newTeachers, getClassRepository()); + await putObject(cls, newTeachers, getClassRepository()); return mapToClassDTO(cls); } diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts index 40bad732..9b9903ed 100644 --- a/backend/src/services/groups.ts +++ b/backend/src/services/groups.ts @@ -37,9 +37,9 @@ export async function getGroup(classId: string, assignmentNumber: number, groupN } export async function putGroup( - classId: string, - assignmentNumber: number, - groupNumber: number, + classId: string, + assignmentNumber: number, + groupNumber: number, groupData: Partial> ): Promise { const group = await fetchGroup(classId, assignmentNumber, groupNumber); diff --git a/backend/src/services/service-helper.ts b/backend/src/services/service-helper.ts index 47c4b757..641fada4 100644 --- a/backend/src/services/service-helper.ts +++ b/backend/src/services/service-helper.ts @@ -11,8 +11,8 @@ import { DwengoEntityRepository } from '../data/dwengo-entity-repository'; * @returns Nothing. */ export async function putObject( - object: T, - data: Partial>>, + object: T, + data: Partial>>, repo: DwengoEntityRepository ): Promise { repo.assign(object, data); From d59c61e2e2b3d0118e33295ce7cafa1d7dc8077d Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Mon, 7 Apr 2025 17:33:03 +0200 Subject: [PATCH 30/94] feat: frontend controller endpoints voor add en delete teacher en student van een klas --- frontend/src/controllers/classes.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts index 6a5f489c..c6c80af0 100644 --- a/frontend/src/controllers/classes.ts +++ b/frontend/src/controllers/classes.ts @@ -46,10 +46,26 @@ export class ClassController extends BaseController { return this.get(`/${id}/students`, { full }); } + async addStudent(id: string, username: string): Promise { + return this.post(`/${id}/students`, { username }); + } + + async deleteStudent(id: string, username: string): Promise { + return this.delete(`/${id}/students/${ username }`); + } + async getTeachers(id: string, full = true): Promise { return this.get(`/${id}/teachers`, { full }); } + async addTeacher(id: string, username: string): Promise { + return this.post(`/${id}/teachers`, { username }); + } + + async deleteTeacher(id: string, username: string): Promise { + return this.delete(`/${id}/teachers/${ username }`); + } + async getTeacherInvitations(id: string, full = true): Promise { return this.get(`/${id}/teacher-invitations`, { full }); } From 048bba5c7e5c3a0c44d9caf6e1435d3813e34768 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Mon, 7 Apr 2025 17:35:20 +0200 Subject: [PATCH 31/94] feat: PUT in frontend controller voor assignment --- frontend/src/controllers/assignments.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/controllers/assignments.ts b/frontend/src/controllers/assignments.ts index 59ea2428..a66f8e84 100644 --- a/frontend/src/controllers/assignments.ts +++ b/frontend/src/controllers/assignments.ts @@ -33,6 +33,10 @@ export class AssignmentController extends BaseController { return this.delete(`/${num}`); } + async updateAssignment(num: number, data: Partial): Promise { + return this.put(`/${num}`, data); + } + async getSubmissions(assignmentNumber: number, full = true): Promise { return this.get(`/${assignmentNumber}/submissions`, { full }); } From 6a1f5ac4e8cecfdccfa3828ce771a740e9a99d1b Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Mon, 7 Apr 2025 17:36:09 +0200 Subject: [PATCH 32/94] feat: PUT voor frontend controller groups toegevoegd --- frontend/src/controllers/groups.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/controllers/groups.ts b/frontend/src/controllers/groups.ts index 05192636..de6592b5 100644 --- a/frontend/src/controllers/groups.ts +++ b/frontend/src/controllers/groups.ts @@ -32,6 +32,10 @@ export class GroupController extends BaseController { return this.delete(`/${num}`); } + async updateGroup(num: number, data: Partial): Promise { + return this.put(`/${num}`, data); + } + async getSubmissions(groupNumber: number, full = true): Promise { return this.get(`/${groupNumber}/submissions`, { full }); } From aea0c3c7c92f7d90d88ced0dbc1d27491d681b5c Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Mon, 7 Apr 2025 17:37:23 +0200 Subject: [PATCH 33/94] feat: PUT voor frontend controller classes toegevoegd --- frontend/src/controllers/classes.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts index c6c80af0..4a349e85 100644 --- a/frontend/src/controllers/classes.ts +++ b/frontend/src/controllers/classes.ts @@ -42,6 +42,10 @@ export class ClassController extends BaseController { return this.delete(`/${id}`); } + async updateClass(id: string, data: Partial): Promise { + return this.put(`/${id}`, data); + } + async getStudents(id: string, full = true): Promise { return this.get(`/${id}/students`, { full }); } From 3f74c3491fe5187c57470ccbb66afaf1c777fdf9 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Mon, 7 Apr 2025 15:40:04 +0000 Subject: [PATCH 34/94] style: fix linting issues met Prettier --- frontend/src/controllers/classes.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts index 4a349e85..03e3f560 100644 --- a/frontend/src/controllers/classes.ts +++ b/frontend/src/controllers/classes.ts @@ -55,7 +55,7 @@ export class ClassController extends BaseController { } async deleteStudent(id: string, username: string): Promise { - return this.delete(`/${id}/students/${ username }`); + return this.delete(`/${id}/students/${username}`); } async getTeachers(id: string, full = true): Promise { @@ -67,7 +67,7 @@ export class ClassController extends BaseController { } async deleteTeacher(id: string, username: string): Promise { - return this.delete(`/${id}/teachers/${ username }`); + return this.delete(`/${id}/teachers/${username}`); } async getTeacherInvitations(id: string, full = true): Promise { From 12d21f3c49c59b9207956f361ef0a541215d1b1f Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Mon, 7 Apr 2025 23:48:35 +0200 Subject: [PATCH 35/94] fix: check student in klas, conflict error --- backend/src/services/students.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/services/students.ts b/backend/src/services/students.ts index dc40e468..a8300db5 100644 --- a/backend/src/services/students.ts +++ b/backend/src/services/students.ts @@ -23,6 +23,8 @@ import { GroupDTO } from '@dwengo-1/common/interfaces/group'; import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission'; import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request'; +import {BadRequestException} from "../exceptions/bad-request-exception"; +import {ConflictException} from "../exceptions/conflict-exception"; export async function getAllStudents(full: boolean): Promise { const studentRepository = getStudentRepository(); @@ -135,6 +137,10 @@ export async function createClassJoinRequest(username: string, classId: string): const student = await fetchStudent(username); // Throws error if student not found const cls = await fetchClass(classId); + if (cls.students.contains(student)) { + throw new ConflictException("Student already in this class"); + } + const request = mapToStudentRequest(student, cls); await requestRepo.save(request, { preventOverwrite: true }); return mapToStudentRequestDTO(request); From 7887a5aec42bb8cea6c356838148d38a79339bfd Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Mon, 7 Apr 2025 23:49:15 +0200 Subject: [PATCH 36/94] fix: voeg student toe aan klas indien leeraar accept --- backend/src/services/teachers.ts | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts index 3ebc6609..4e67d27d 100644 --- a/backend/src/services/teachers.ts +++ b/backend/src/services/teachers.ts @@ -22,13 +22,15 @@ import { Question } from '../entities/questions/question.entity.js'; import { ClassJoinRequestRepository } from '../data/classes/class-join-request-repository.js'; import { Student } from '../entities/users/student.entity.js'; import { NotFoundException } from '../exceptions/not-found-exception.js'; -import { getClassStudents, getClassStudentsDTO } from './classes.js'; +import {addClassStudent, fetchClass, getClassStudents, getClassStudentsDTO} from './classes.js'; import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher'; import { ClassDTO } from '@dwengo-1/common/interfaces/class'; import { StudentDTO } from '@dwengo-1/common/interfaces/student'; import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request'; import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request'; +import {BadRequestException} from "../exceptions/bad-request-exception"; +import {ConflictException} from "../exceptions/conflict-exception"; export async function getAllTeachers(full: boolean): Promise { const teacherRepository: TeacherRepository = getTeacherRepository(); @@ -145,13 +147,12 @@ export async function getJoinRequestsByClass(classId: string): Promise { const requestRepo: ClassJoinRequestRepository = getClassJoinRequestRepository(); - const classRepo: ClassRepository = getClassRepository(); const student: Student = await fetchStudent(studentUsername); - const cls: Class | null = await classRepo.findById(classId); + const cls = await fetchClass(classId); - if (!cls) { - throw new NotFoundException('Class not found'); + if (cls.students.contains(student)) { + throw new ConflictException("Student already in this class"); } const request: ClassJoinRequest | null = await requestRepo.findByStudentAndClass(student, cls); @@ -160,8 +161,14 @@ export async function updateClassJoinRequestStatus(studentUsername: string, clas throw new NotFoundException('Join request not found'); } - request.status = accepted ? ClassJoinRequestStatus.Accepted : ClassJoinRequestStatus.Declined; + request.status = ClassJoinRequestStatus.Declined; + + if (accepted){ + request.status = ClassJoinRequestStatus.Accepted; + await addClassStudent(classId, studentUsername); + } await requestRepo.save(request); + return mapToStudentRequestDTO(request); } From 65bce19fcf48b46c4b1ec5da145e65b4b5af18d1 Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Mon, 7 Apr 2025 23:49:35 +0200 Subject: [PATCH 37/94] fix: query naar param --- backend/src/controllers/teachers.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/controllers/teachers.ts b/backend/src/controllers/teachers.ts index 9275ca92..c8063f80 100644 --- a/backend/src/controllers/teachers.ts +++ b/backend/src/controllers/teachers.ts @@ -81,16 +81,15 @@ export async function getTeacherQuestionHandler(req: Request, res: Response): Pr } export async function getStudentJoinRequestHandler(req: Request, res: Response): Promise { - const username = req.query.username as string; const classId = req.params.classId; - requireFields({ username, classId }); + requireFields({ classId }); const joinRequests = await getJoinRequestsByClass(classId); res.json({ joinRequests }); } export async function updateStudentJoinRequestHandler(req: Request, res: Response): Promise { - const studentUsername = req.query.studentUsername as string; + const studentUsername = req.params.studentUsername; const classId = req.params.classId; const accepted = req.body.accepted !== 'false'; // Default = true requireFields({ studentUsername, classId }); From c7155fb438d0a88e5bb252f37ced08158c8a82cd Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Mon, 7 Apr 2025 23:50:27 +0200 Subject: [PATCH 38/94] feat: extra tests op nieuwe func student en teacher --- backend/tests/controllers/students.test.ts | 35 +++++++++++++--------- backend/tests/controllers/teachers.test.ts | 13 ++++++-- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/backend/tests/controllers/students.test.ts b/backend/tests/controllers/students.test.ts index 93f35c48..7bb07f8c 100644 --- a/backend/tests/controllers/students.test.ts +++ b/backend/tests/controllers/students.test.ts @@ -198,15 +198,34 @@ describe('Student controllers', () => { ); }); - it('Create join request', async () => { + it('Create and delete join request', async () => { req = { - params: { username: 'Noordkaap' }, + params: { username: 'TheDoors' }, body: { classId: 'id02' }, }; await createStudentRequestHandler(req as Request, res as Response); expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ request: expect.anything() })); + + req = { + params: { username: 'TheDoors', classId: 'id02' }, + }; + + await deleteClassJoinRequestHandler(req as Request, res as Response); + + expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ request: expect.anything() })); + + await expect(async () => deleteClassJoinRequestHandler(req as Request, res as Response)).rejects.toThrow(NotFoundException); + }); + + it('Create join request student already in class error', async () => { + req = { + params: { username: 'Noordkaap' }, + body: { classId: 'id02' }, + }; + + await expect(async () => createStudentRequestHandler(req as Request, res as Response)).rejects.toThrow(ConflictException); }); it('Create join request duplicate', async () => { @@ -217,16 +236,4 @@ describe('Student controllers', () => { await expect(async () => createStudentRequestHandler(req as Request, res as Response)).rejects.toThrow(ConflictException); }); - - it('Delete join request', async () => { - req = { - params: { username: 'Noordkaap', classId: 'id02' }, - }; - - await deleteClassJoinRequestHandler(req as Request, res as Response); - - expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ request: expect.anything() })); - - await expect(async () => deleteClassJoinRequestHandler(req as Request, res as Response)).rejects.toThrow(NotFoundException); - }); }); diff --git a/backend/tests/controllers/teachers.test.ts b/backend/tests/controllers/teachers.test.ts index bee23987..21533876 100644 --- a/backend/tests/controllers/teachers.test.ts +++ b/backend/tests/controllers/teachers.test.ts @@ -16,6 +16,7 @@ import { BadRequestException } from '../../src/exceptions/bad-request-exception. import { EntityAlreadyExistsException } from '../../src/exceptions/entity-already-exists-exception.js'; import { getStudentRequestsHandler } from '../../src/controllers/students.js'; import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher'; +import {getClassHandler} from "../../src/controllers/classes"; describe('Teacher controllers', () => { let req: Partial; @@ -168,7 +169,6 @@ describe('Teacher controllers', () => { it('Get join requests by class', async () => { req = { - query: { username: 'LimpBizkit' }, params: { classId: 'id02' }, }; @@ -183,8 +183,7 @@ describe('Teacher controllers', () => { it('Update join request status', async () => { req = { - query: { username: 'LimpBizkit', studentUsername: 'PinkFloyd' }, - params: { classId: 'id02' }, + params: { classId: 'id02', studentUsername: 'PinkFloyd'}, body: { accepted: 'true' }, }; @@ -200,5 +199,13 @@ describe('Teacher controllers', () => { const status: boolean = jsonMock.mock.lastCall?.[0].requests[0].status; expect(status).toBeTruthy(); + + req = { + params: { id: 'id02' } + } + + await getClassHandler(req as Request, res as Response); + const students: string[] = jsonMock.mock.lastCall?.[0].class.students; + expect(students).contains("PinkFloyd"); }); }); From 1dce9c65c64cc97c9b8db608cd3a4e33ff4b18e9 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Mon, 7 Apr 2025 22:00:34 +0000 Subject: [PATCH 39/94] style: fix linting issues met Prettier --- backend/src/services/students.ts | 6 +++--- backend/src/services/teachers.ts | 10 +++++----- backend/tests/controllers/teachers.test.ts | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/src/services/students.ts b/backend/src/services/students.ts index a8300db5..5fc3427f 100644 --- a/backend/src/services/students.ts +++ b/backend/src/services/students.ts @@ -23,8 +23,8 @@ import { GroupDTO } from '@dwengo-1/common/interfaces/group'; import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission'; import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request'; -import {BadRequestException} from "../exceptions/bad-request-exception"; -import {ConflictException} from "../exceptions/conflict-exception"; +import { BadRequestException } from '../exceptions/bad-request-exception'; +import { ConflictException } from '../exceptions/conflict-exception'; export async function getAllStudents(full: boolean): Promise { const studentRepository = getStudentRepository(); @@ -138,7 +138,7 @@ export async function createClassJoinRequest(username: string, classId: string): const cls = await fetchClass(classId); if (cls.students.contains(student)) { - throw new ConflictException("Student already in this class"); + throw new ConflictException('Student already in this class'); } const request = mapToStudentRequest(student, cls); diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts index 4e67d27d..4973ce81 100644 --- a/backend/src/services/teachers.ts +++ b/backend/src/services/teachers.ts @@ -22,15 +22,15 @@ import { Question } from '../entities/questions/question.entity.js'; import { ClassJoinRequestRepository } from '../data/classes/class-join-request-repository.js'; import { Student } from '../entities/users/student.entity.js'; import { NotFoundException } from '../exceptions/not-found-exception.js'; -import {addClassStudent, fetchClass, getClassStudents, getClassStudentsDTO} from './classes.js'; +import { addClassStudent, fetchClass, getClassStudents, getClassStudentsDTO } from './classes.js'; import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher'; import { ClassDTO } from '@dwengo-1/common/interfaces/class'; import { StudentDTO } from '@dwengo-1/common/interfaces/student'; import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request'; import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request'; -import {BadRequestException} from "../exceptions/bad-request-exception"; -import {ConflictException} from "../exceptions/conflict-exception"; +import { BadRequestException } from '../exceptions/bad-request-exception'; +import { ConflictException } from '../exceptions/conflict-exception'; export async function getAllTeachers(full: boolean): Promise { const teacherRepository: TeacherRepository = getTeacherRepository(); @@ -152,7 +152,7 @@ export async function updateClassJoinRequestStatus(studentUsername: string, clas const cls = await fetchClass(classId); if (cls.students.contains(student)) { - throw new ConflictException("Student already in this class"); + throw new ConflictException('Student already in this class'); } const request: ClassJoinRequest | null = await requestRepo.findByStudentAndClass(student, cls); @@ -163,7 +163,7 @@ export async function updateClassJoinRequestStatus(studentUsername: string, clas request.status = ClassJoinRequestStatus.Declined; - if (accepted){ + if (accepted) { request.status = ClassJoinRequestStatus.Accepted; await addClassStudent(classId, studentUsername); } diff --git a/backend/tests/controllers/teachers.test.ts b/backend/tests/controllers/teachers.test.ts index 21533876..c29ecbb3 100644 --- a/backend/tests/controllers/teachers.test.ts +++ b/backend/tests/controllers/teachers.test.ts @@ -16,7 +16,7 @@ import { BadRequestException } from '../../src/exceptions/bad-request-exception. import { EntityAlreadyExistsException } from '../../src/exceptions/entity-already-exists-exception.js'; import { getStudentRequestsHandler } from '../../src/controllers/students.js'; import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher'; -import {getClassHandler} from "../../src/controllers/classes"; +import { getClassHandler } from '../../src/controllers/classes'; describe('Teacher controllers', () => { let req: Partial; @@ -183,7 +183,7 @@ describe('Teacher controllers', () => { it('Update join request status', async () => { req = { - params: { classId: 'id02', studentUsername: 'PinkFloyd'}, + params: { classId: 'id02', studentUsername: 'PinkFloyd' }, body: { accepted: 'true' }, }; @@ -201,11 +201,11 @@ describe('Teacher controllers', () => { expect(status).toBeTruthy(); req = { - params: { id: 'id02' } - } + params: { id: 'id02' }, + }; await getClassHandler(req as Request, res as Response); const students: string[] = jsonMock.mock.lastCall?.[0].class.students; - expect(students).contains("PinkFloyd"); + expect(students).contains('PinkFloyd'); }); }); From 095609d35719c34d77b6b2111efc0ea0095830d8 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Tue, 8 Apr 2025 18:08:35 +0200 Subject: [PATCH 40/94] fix: .js toevoegen aan imports --- backend/src/entities/questions/question.entity.ts | 2 +- backend/src/interfaces/group.ts | 4 ++-- backend/src/interfaces/question.ts | 2 +- backend/src/services/questions.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/entities/questions/question.entity.ts b/backend/src/entities/questions/question.entity.ts index 44ff3e32..44ccfbd3 100644 --- a/backend/src/entities/questions/question.entity.ts +++ b/backend/src/entities/questions/question.entity.ts @@ -2,7 +2,7 @@ import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; import { Student } from '../users/student.entity.js'; import { QuestionRepository } from '../../data/questions/question-repository.js'; import { Language } from '@dwengo-1/common/util/language'; -import { Group } from '../assignments/group.entity'; +import { Group } from '../assignments/group.entity.js'; @Entity({ repository: () => QuestionRepository }) export class Question { diff --git a/backend/src/interfaces/group.ts b/backend/src/interfaces/group.ts index 295c7e0f..abbd97de 100644 --- a/backend/src/interfaces/group.ts +++ b/backend/src/interfaces/group.ts @@ -2,9 +2,9 @@ import { Group } from '../entities/assignments/group.entity.js'; import { mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId } from './assignment.js'; import { mapToStudent, mapToStudentDTO } from './student.js'; import { GroupDTO } from '@dwengo-1/common/interfaces/group'; -import { getGroupRepository } from '../data/repositories'; +import { getGroupRepository } from '../data/repositories.js'; import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; -import { Class } from '../entities/classes/class.entity'; +import { Class } from '../entities/classes/class.entity.js'; import { StudentDTO } from '@dwengo-1/common/interfaces/student'; export function mapToGroup(groupDto: GroupDTO, clazz: Class): Group { diff --git a/backend/src/interfaces/question.ts b/backend/src/interfaces/question.ts index a9347047..08887aba 100644 --- a/backend/src/interfaces/question.ts +++ b/backend/src/interfaces/question.ts @@ -2,7 +2,7 @@ import { Question } from '../entities/questions/question.entity.js'; import { mapToStudentDTO } from './student.js'; import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content'; -import { mapToGroupDTOId } from './group'; +import { mapToGroupDTOId } from './group.js'; function getLearningObjectIdentifier(question: Question): LearningObjectIdentifier { return { diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts index aa3e1298..4794a3dc 100644 --- a/backend/src/services/questions.ts +++ b/backend/src/services/questions.ts @@ -9,7 +9,7 @@ import { mapToStudent } from '../interfaces/student.js'; import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer'; import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; -import { mapToAssignment } from '../interfaces/assignment'; +import { mapToAssignment } from '../interfaces/assignment.js'; export async function getQuestionsAboutLearningObjectInAssignment( loId: LearningObjectIdentifier, From 7155d7d8939184f50eb64c60a7085586cce8cd48 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Wed, 9 Apr 2025 10:42:57 +0200 Subject: [PATCH 41/94] fix: .js toevoegen aan imports --- backend/src/controllers/assignments.ts | 5 ++--- backend/src/controllers/classes.ts | 2 +- backend/src/services/classes.ts | 9 ++++----- backend/src/services/students.ts | 3 +-- backend/src/services/teachers.ts | 5 ++--- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts index c262057c..296de160 100644 --- a/backend/src/controllers/assignments.ts +++ b/backend/src/controllers/assignments.ts @@ -8,9 +8,8 @@ import { putAssignment, } from '../services/assignments.js'; import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; -import { requireFields } from './error-helper'; -import { BadRequestException } from '../exceptions/bad-request-exception'; -import { getLogger } from '../logging/initalize.js'; +import { requireFields } from './error-helper.js'; +import { BadRequestException } from '../exceptions/bad-request-exception.js'; import { Assignment } from '../entities/assignments/assignment.entity.js'; import { EntityDTO } from '@mikro-orm/core'; diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts index 6252c714..6f253547 100644 --- a/backend/src/controllers/classes.ts +++ b/backend/src/controllers/classes.ts @@ -14,7 +14,7 @@ import { putClass, } from '../services/classes.js'; import { ClassDTO } from '@dwengo-1/common/interfaces/class'; -import { requireFields } from './error-helper'; +import { requireFields } from './error-helper.js'; import { EntityDTO } from '@mikro-orm/core'; import { Class } from '../entities/classes/class.entity.js'; diff --git a/backend/src/services/classes.ts b/backend/src/services/classes.ts index 4abe18af..1f197b2a 100644 --- a/backend/src/services/classes.ts +++ b/backend/src/services/classes.ts @@ -1,17 +1,16 @@ -import { getClassRepository, getStudentRepository, getTeacherInvitationRepository, getTeacherRepository } from '../data/repositories.js'; +import { getClassRepository, getTeacherInvitationRepository } from '../data/repositories.js'; import { mapToClassDTO } from '../interfaces/class.js'; import { mapToStudentDTO } from '../interfaces/student.js'; import { mapToTeacherInvitationDTO, mapToTeacherInvitationDTOIds } from '../interfaces/teacher-invitation.js'; -import { getLogger } from '../logging/initalize.js'; import { NotFoundException } from '../exceptions/not-found-exception.js'; import { Class } from '../entities/classes/class.entity.js'; import { ClassDTO } from '@dwengo-1/common/interfaces/class'; import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation'; import { StudentDTO } from '@dwengo-1/common/interfaces/student'; -import { fetchTeacher } from './teachers'; -import { fetchStudent, getStudent } from './students'; +import { fetchTeacher } from './teachers.js'; +import { fetchStudent } from './students.js'; import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher'; -import { mapToTeacherDTO } from '../interfaces/teacher'; +import { mapToTeacherDTO } from '../interfaces/teacher.js'; import { EntityDTO } from '@mikro-orm/core'; import { putObject } from './service-helper.js'; diff --git a/backend/src/services/students.ts b/backend/src/services/students.ts index 5fc3427f..6cfbbd5b 100644 --- a/backend/src/services/students.ts +++ b/backend/src/services/students.ts @@ -23,8 +23,7 @@ import { GroupDTO } from '@dwengo-1/common/interfaces/group'; import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission'; import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request'; -import { BadRequestException } from '../exceptions/bad-request-exception'; -import { ConflictException } from '../exceptions/conflict-exception'; +import { ConflictException } from '../exceptions/conflict-exception.js'; export async function getAllStudents(full: boolean): Promise { const studentRepository = getStudentRepository(); diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts index 4973ce81..e6596f9e 100644 --- a/backend/src/services/teachers.ts +++ b/backend/src/services/teachers.ts @@ -22,15 +22,14 @@ import { Question } from '../entities/questions/question.entity.js'; import { ClassJoinRequestRepository } from '../data/classes/class-join-request-repository.js'; import { Student } from '../entities/users/student.entity.js'; import { NotFoundException } from '../exceptions/not-found-exception.js'; -import { addClassStudent, fetchClass, getClassStudents, getClassStudentsDTO } from './classes.js'; +import { addClassStudent, fetchClass, getClassStudentsDTO } from './classes.js'; import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher'; import { ClassDTO } from '@dwengo-1/common/interfaces/class'; import { StudentDTO } from '@dwengo-1/common/interfaces/student'; import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request'; import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request'; -import { BadRequestException } from '../exceptions/bad-request-exception'; -import { ConflictException } from '../exceptions/conflict-exception'; +import { ConflictException } from '../exceptions/conflict-exception.js'; export async function getAllTeachers(full: boolean): Promise { const teacherRepository: TeacherRepository = getTeacherRepository(); From 4928c08f62d081755974fe9dc2261564c37f10c8 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Wed, 9 Apr 2025 10:49:14 +0200 Subject: [PATCH 42/94] refactor(backend): Linting --- backend/src/controllers/assignments.ts | 4 ++-- backend/src/controllers/groups.ts | 3 +-- backend/src/controllers/submissions.ts | 1 - backend/src/interfaces/assignment.ts | 1 - backend/src/services/assignments.ts | 8 +++----- backend/src/services/groups.ts | 21 ++++++--------------- backend/src/services/submissions.ts | 3 +-- 7 files changed, 13 insertions(+), 28 deletions(-) diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts index 296de160..2ecb35cb 100644 --- a/backend/src/controllers/assignments.ts +++ b/backend/src/controllers/assignments.ts @@ -66,7 +66,7 @@ export async function putAssignmentHandler(req: Request, res: Response): Promise res.json({ assignment }); } -export async function deleteAssignmentHandler(req: Request, res: Response): Promise { +export async function deleteAssignmentHandler(req: Request, _res: Response): Promise { const id = Number(req.params.id); const classid = req.params.classid; requireFields({ id, classid }); @@ -75,7 +75,7 @@ export async function deleteAssignmentHandler(req: Request, res: Response): Prom throw new BadRequestException('Assignment id should be a number'); } - const assignment = await deleteAssignment(classid, id); + await deleteAssignment(classid, id); } export async function getAssignmentsSubmissionsHandler(req: Request, res: Response): Promise { diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts index 85b0809c..ec177dcc 100644 --- a/backend/src/controllers/groups.ts +++ b/backend/src/controllers/groups.ts @@ -3,11 +3,10 @@ import { createGroup, deleteGroup, getAllGroups, getGroup, getGroupSubmissions, import { GroupDTO } from '@dwengo-1/common/interfaces/group'; import { requireFields } from './error-helper.js'; import { BadRequestException } from '../exceptions/bad-request-exception.js'; -import { getLogger } from '../logging/initalize.js'; import { EntityDTO } from '@mikro-orm/core'; import { Group } from '../entities/assignments/group.entity.js'; -function checkGroupFields(classId: any, assignmentId: any, groupId: any) { +function checkGroupFields(classId: string, assignmentId: number, groupId: number): void { requireFields({ classId, assignmentId, groupId }); if (isNaN(assignmentId)) { diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts index a742685f..fb681656 100644 --- a/backend/src/controllers/submissions.ts +++ b/backend/src/controllers/submissions.ts @@ -1,7 +1,6 @@ import { Request, Response } from 'express'; import { createSubmission, deleteSubmission, getAllSubmissions, getSubmission } from '../services/submissions.js'; import { BadRequestException } from '../exceptions/bad-request-exception.js'; -import { NotFoundException } from '../exceptions/not-found-exception.js'; import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js'; import { Language, languageMap } from '@dwengo-1/common/util/language'; import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission'; diff --git a/backend/src/interfaces/assignment.ts b/backend/src/interfaces/assignment.ts index 2e591797..7abb3d3c 100644 --- a/backend/src/interfaces/assignment.ts +++ b/backend/src/interfaces/assignment.ts @@ -4,7 +4,6 @@ import { Assignment } from '../entities/assignments/assignment.entity.js'; import { Class } from '../entities/classes/class.entity.js'; import { getLogger } from '../logging/initalize.js'; import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; -import { mapToGroupDTO } from './group.js'; export function mapToAssignmentDTOId(assignment: Assignment): AssignmentDTO { return { diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts index 55f4947c..1b8fc9f1 100644 --- a/backend/src/services/assignments.ts +++ b/backend/src/services/assignments.ts @@ -14,9 +14,7 @@ import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submissi import { fetchClass } from './classes.js'; import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission'; -import { getLogger } from '../logging/initalize.js'; -import { EntityData, EntityDTO, FromEntityType } from '@mikro-orm/core'; -import { DwengoEntityRepository } from '../data/dwengo-entity-repository.js'; +import { EntityDTO } from '@mikro-orm/core'; import { putObject } from './service-helper.js'; export async function fetchAssignment(classid: string, assignmentNumber: number): Promise { @@ -24,7 +22,7 @@ export async function fetchAssignment(classid: string, assignmentNumber: number) const cls = await classRepository.findById(classid); if (!cls) { - throw new NotFoundException("Could not find assignment's class"); + throw new NotFoundException('Could not find assignment\'s class'); } const assignmentRepository = getAssignmentRepository(); @@ -88,7 +86,7 @@ export async function deleteAssignment(classid: string, id: number): Promise { const assignment = await fetchAssignment(classid, assignmentNumber); diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts index 9b9903ed..f52fff29 100644 --- a/backend/src/services/groups.ts +++ b/backend/src/services/groups.ts @@ -1,21 +1,12 @@ -import { assign, EntityDTO } from '@mikro-orm/core'; -import { - getAssignmentRepository, - getClassRepository, - getGroupRepository, - getQuestionRepository, - getStudentRepository, - getSubmissionRepository, -} from '../data/repositories.js'; +import { EntityDTO } from '@mikro-orm/core'; +import { getGroupRepository, getStudentRepository, getSubmissionRepository } from '../data/repositories.js'; import { Group } from '../entities/assignments/group.entity.js'; import { mapToGroupDTO, mapToGroupDTOId } from '../interfaces/group.js'; import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submission.js'; import { GroupDTO } from '@dwengo-1/common/interfaces/group'; import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission'; -import { getLogger } from '../logging/initalize.js'; import { fetchAssignment } from './assignments.js'; import { NotFoundException } from '../exceptions/not-found-exception.js'; -import { fetchClass } from './classes.js'; import { putObject } from './service-helper.js'; export async function fetchGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise { @@ -40,7 +31,7 @@ export async function putGroup( classId: string, assignmentNumber: number, groupNumber: number, - groupData: Partial> + groupData: Partial>, ): Promise { const group = await fetchGroup(classId, assignmentNumber, groupNumber); @@ -59,7 +50,7 @@ export async function deleteGroup(classId: string, assignmentNumber: number, gro return mapToGroupDTO(group); } -export async function getExistingGroupFromGroupDTO(groupData: GroupDTO) { +export async function getExistingGroupFromGroupDTO(groupData: GroupDTO): Promise { const classId = typeof groupData.class === 'string' ? groupData.class : groupData.class.id; const assignmentNumber = typeof groupData.assignment === 'number' ? groupData.assignment : groupData.assignment.id; const groupNumber = groupData.groupNumber; @@ -72,7 +63,7 @@ export async function createGroup(groupData: GroupDTO, classid: string, assignme const memberUsernames = (groupData.members as string[]) || []; const members = (await Promise.all([...memberUsernames].map(async (id) => studentRepository.findByUsername(id)))).filter( - (student) => student !== null + (student) => student !== null, ); const assignment = await fetchAssignment(classid, assignmentNumber); @@ -104,7 +95,7 @@ export async function getGroupSubmissions( classId: string, assignmentNumber: number, groupNumber: number, - full: boolean + full: boolean, ): Promise { const group = await fetchGroup(classId, assignmentNumber, groupNumber); diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts index 25f6e7f0..c7daff74 100644 --- a/backend/src/services/submissions.ts +++ b/backend/src/services/submissions.ts @@ -3,9 +3,8 @@ import { LearningObjectIdentifier } from '../entities/content/learning-object-id import { NotFoundException } from '../exceptions/not-found-exception.js'; import { mapToSubmission, mapToSubmissionDTO } from '../interfaces/submission.js'; import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission'; -import { Language } from '@dwengo-1/common/util/language'; import { fetchStudent } from './students.js'; -import { fetchGroup, getExistingGroupFromGroupDTO } from './groups.js'; +import { getExistingGroupFromGroupDTO } from './groups.js'; import { Submission } from '../entities/assignments/submission.entity.js'; export async function fetchSubmission(loId: LearningObjectIdentifier, submissionNumber: number): Promise { From 6a86539cc9728777f9ae49ba421b2925fa67474f Mon Sep 17 00:00:00 2001 From: Lint Action Date: Wed, 9 Apr 2025 08:50:43 +0000 Subject: [PATCH 43/94] style: fix linting issues met Prettier --- backend/src/services/assignments.ts | 4 ++-- backend/src/services/groups.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/services/assignments.ts b/backend/src/services/assignments.ts index 1b8fc9f1..5fd8f67f 100644 --- a/backend/src/services/assignments.ts +++ b/backend/src/services/assignments.ts @@ -22,7 +22,7 @@ export async function fetchAssignment(classid: string, assignmentNumber: number) const cls = await classRepository.findById(classid); if (!cls) { - throw new NotFoundException('Could not find assignment\'s class'); + throw new NotFoundException("Could not find assignment's class"); } const assignmentRepository = getAssignmentRepository(); @@ -86,7 +86,7 @@ export async function deleteAssignment(classid: string, id: number): Promise { const assignment = await fetchAssignment(classid, assignmentNumber); diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts index f52fff29..95b1b7d4 100644 --- a/backend/src/services/groups.ts +++ b/backend/src/services/groups.ts @@ -31,7 +31,7 @@ export async function putGroup( classId: string, assignmentNumber: number, groupNumber: number, - groupData: Partial>, + groupData: Partial> ): Promise { const group = await fetchGroup(classId, assignmentNumber, groupNumber); @@ -63,7 +63,7 @@ export async function createGroup(groupData: GroupDTO, classid: string, assignme const memberUsernames = (groupData.members as string[]) || []; const members = (await Promise.all([...memberUsernames].map(async (id) => studentRepository.findByUsername(id)))).filter( - (student) => student !== null, + (student) => student !== null ); const assignment = await fetchAssignment(classid, assignmentNumber); @@ -95,7 +95,7 @@ export async function getGroupSubmissions( classId: string, assignmentNumber: number, groupNumber: number, - full: boolean, + full: boolean ): Promise { const group = await fetchGroup(classId, assignmentNumber, groupNumber); From 41b36f430e6d27a0b96e58aaaa17abb6a2b701f5 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Wed, 9 Apr 2025 11:56:02 +0200 Subject: [PATCH 44/94] chore: Maak linting warnings -> errors Closes #180 --- eslint.config.ts | 70 ++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/eslint.config.ts b/eslint.config.ts index fb19e5c4..30e8fe2f 100644 --- a/eslint.config.ts +++ b/eslint.config.ts @@ -44,16 +44,16 @@ export default [ // All @typescript-eslint configuration options are listed. // If the rules are commented, they are configured by the inherited configurations. - '@typescript-eslint/adjacent-overload-signatures': 'warn', - '@typescript-eslint/array-type': 'warn', + '@typescript-eslint/adjacent-overload-signatures': 'error', + '@typescript-eslint/array-type': 'error', '@typescript-eslint/await-thenable': 'error', '@typescript-eslint/ban-ts-comment': ['error', { minimumDescriptionLength: 10 }], '@typescript-eslint/ban-tslint-comment': 'error', camelcase: 'off', - '@typescript-eslint/class-literal-property-style': 'warn', + '@typescript-eslint/class-literal-property-style': 'error', 'class-methods-use-this': 'off', '@typescript-eslint/class-methods-use-this': ['error', { ignoreOverrideMethods: true }], - '@typescript-eslint/consistent-generic-constructors': 'warn', + '@typescript-eslint/consistent-generic-constructors': 'error', '@typescript-eslint/consistent-indexed-object-style': 'error', 'consistent-return': 'off', '@typescript-eslint/consistent-return': 'off', @@ -64,18 +64,18 @@ export default [ 'default-param-last': 'off', '@typescript-eslint/default-param-last': 'error', 'dot-notation': 'off', - '@typescript-eslint/dot-notation': 'warn', - '@typescript-eslint/explicit-function-return-type': 'warn', + '@typescript-eslint/dot-notation': 'error', + '@typescript-eslint/explicit-function-return-type': 'error', '@typescript-eslint/explicit-member-accessibility': 'off', - '@typescript-eslint/explicit-module-boundary-types': 'warn', + '@typescript-eslint/explicit-module-boundary-types': 'error', 'init-declarations': 'off', '@typescript-eslint/init-declarations': 'off', 'max-params': 'off', '@typescript-eslint/max-params': ['error', { max: 6 }], - '@typescript-eslint/member-ordering': 'warn', + '@typescript-eslint/member-ordering': 'error', '@typescript-eslint/method-signature-style': 'off', // Don't care about TypeScript strict mode. '@typescript-eslint/naming-convention': [ - 'warn', + 'error', { // Enforce that all variables, functions and properties are camelCase selector: 'variableLike', @@ -113,7 +113,7 @@ export default [ '@typescript-eslint/no-empty-function': 'error', '@typescript-eslint/no-empty-interface': 'off', '@typescript-eslint/no-empty-object-type': 'error', - '@typescript-eslint/no-explicit-any': 'warn', // Once in production, this should be an error. + '@typescript-eslint/no-explicit-any': 'error', // Once in production, this should be an error. '@typescript-eslint/no-extra-non-null-assertion': 'error', '@typescript-eslint/no-extraneous-class': 'error', '@typescript-eslint/no-floating-promises': 'error', @@ -121,7 +121,7 @@ export default [ 'no-implied-eval': 'off', '@typescript-eslint/no-implied-eval': 'error', '@typescript-eslint/no-import-type-side-effects': 'error', - '@typescript-eslint/no-inferrable-types': 'warn', + '@typescript-eslint/no-inferrable-types': 'error', 'no-invalid-this': 'off', '@typescript-eslint/no-invalid-this': 'off', '@typescript-eslint/no-invalid-void-type': 'error', @@ -146,10 +146,10 @@ export default [ '@typescript-eslint/no-unsafe-function-type': 'error', 'no-unused-expressions': 'off', - '@typescript-eslint/no-unused-expressions': 'warn', + '@typescript-eslint/no-unused-expressions': 'error', 'no-unused-vars': 'off', '@typescript-eslint/no-unused-vars': [ - 'warn', + 'error', { args: 'all', argsIgnorePattern: '^_', @@ -164,53 +164,53 @@ export default [ '@typescript-eslint/parameter-properties': 'off', - '@typescript-eslint/prefer-find': 'warn', + '@typescript-eslint/prefer-find': 'error', '@typescript-eslint/prefer-function-type': 'error', '@typescript-eslint/prefer-readonly-parameter-types': 'off', '@typescript-eslint/prefer-reduce-type-parameter': 'error', - '@typescript-eslint/promise-function-async': 'warn', + '@typescript-eslint/promise-function-async': 'error', - '@typescript-eslint/require-array-sort-compare': 'warn', + '@typescript-eslint/require-array-sort-compare': 'error', - 'no-await-in-loop': 'warn', + 'no-await-in-loop': 'error', 'no-constructor-return': 'error', 'no-inner-declarations': 'error', 'no-self-compare': 'error', 'no-template-curly-in-string': 'error', - 'no-unmodified-loop-condition': 'warn', - 'no-unreachable-loop': 'warn', + 'no-unmodified-loop-condition': 'error', + 'no-unreachable-loop': 'error', 'no-useless-assignment': 'error', - 'arrow-body-style': ['warn', 'as-needed'], - 'block-scoped-var': 'warn', - 'capitalized-comments': 'warn', + 'arrow-body-style': ['error', 'as-needed'], + 'block-scoped-var': 'error', + 'capitalized-comments': 'error', 'consistent-this': 'error', curly: 'error', 'default-case': 'error', 'default-case-last': 'error', eqeqeq: 'error', - 'func-names': 'warn', - 'func-style': ['warn', 'declaration'], - 'grouped-accessor-pairs': ['warn', 'getBeforeSet'], - 'guard-for-in': 'warn', - 'logical-assignment-operators': 'warn', - 'max-classes-per-file': 'warn', + 'func-names': 'error', + 'func-style': ['error', 'declaration'], + 'grouped-accessor-pairs': ['error', 'getBeforeSet'], + 'guard-for-in': 'error', + 'logical-assignment-operators': 'error', + 'max-classes-per-file': 'error', 'no-alert': 'error', - 'no-bitwise': 'warn', - 'no-console': 'warn', - 'no-continue': 'warn', - 'no-else-return': 'warn', + 'no-bitwise': 'error', + 'no-console': 'error', + 'no-continue': 'error', + 'no-else-return': 'error', 'no-eq-null': 'error', 'no-eval': 'error', 'no-extend-native': 'error', 'no-extra-label': 'error', - 'no-implicit-coercion': 'warn', + 'no-implicit-coercion': 'error', 'no-iterator': 'error', - 'no-label-var': 'warn', - 'no-labels': 'warn', + 'no-label-var': 'error', + 'no-labels': 'error', 'no-multi-assign': 'error', 'no-nested-ternary': 'error', 'no-object-constructor': 'error', From 6ab9f8d8a1e002ba72df829b3fa5d4617812b533 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Wed, 9 Apr 2025 12:00:44 +0200 Subject: [PATCH 45/94] chore(docs): Staging server toevoegen --- docs/api/generate.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/api/generate.ts b/docs/api/generate.ts index 24d3a6cb..2221cb53 100644 --- a/docs/api/generate.ts +++ b/docs/api/generate.ts @@ -15,6 +15,10 @@ const doc = { url: 'http://localhost:3000/', description: 'Development server', }, + { + url: 'http://localhost/', + description: 'Staging server', + }, { url: 'https://sel2-1.ugent.be/', description: 'Production server', From 4e834c9ed1dad5eb25c78fca8e39144d4d2093c5 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Wed, 9 Apr 2025 12:03:12 +0200 Subject: [PATCH 46/94] fix(docs): Top level await --- docs/api/generate.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api/generate.ts b/docs/api/generate.ts index 2221cb53..796369d1 100644 --- a/docs/api/generate.ts +++ b/docs/api/generate.ts @@ -59,4 +59,4 @@ const doc = { const outputFile = './swagger.json'; const routes = ['../../backend/src/app.ts']; -await swaggerAutogen({ openapi: '3.1.0' })(outputFile, routes, doc); +void swaggerAutogen({ openapi: '3.1.0' })(outputFile, routes, doc); From fbc77b9ad3722181f10997d20866ad19b993d022 Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Wed, 9 Apr 2025 12:19:41 +0200 Subject: [PATCH 47/94] fix: tests --- backend/tests/controllers/students.test.ts | 2 +- backend/tests/controllers/teachers.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/tests/controllers/students.test.ts b/backend/tests/controllers/students.test.ts index b0611ee8..aca29de1 100644 --- a/backend/tests/controllers/students.test.ts +++ b/backend/tests/controllers/students.test.ts @@ -222,7 +222,7 @@ describe('Student controllers', () => { it('Create join request student already in class error', async () => { req = { params: { username: 'Noordkaap' }, - body: { classId: 'id02' }, + body: { classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89' }, }; await expect(async () => createStudentRequestHandler(req as Request, res as Response)).rejects.toThrow(ConflictException); diff --git a/backend/tests/controllers/teachers.test.ts b/backend/tests/controllers/teachers.test.ts index f687d797..a73a79a5 100644 --- a/backend/tests/controllers/teachers.test.ts +++ b/backend/tests/controllers/teachers.test.ts @@ -183,7 +183,7 @@ describe('Teacher controllers', () => { it('Update join request status', async () => { req = { - params: { classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89' }, + params: { classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89', studentUsername: 'PinkFloyd' }, body: { accepted: 'true' }, }; From 6574a7eee56bb484e5331b429a1ce66591c6ddde Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Wed, 9 Apr 2025 12:29:39 +0200 Subject: [PATCH 48/94] fix(frontend): uuid dependency Closes #182 --- frontend/package.json | 1 + package-lock.json | 1 + 2 files changed, 2 insertions(+) diff --git a/frontend/package.json b/frontend/package.json index e6ce1426..b6bd5deb 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -20,6 +20,7 @@ "@tanstack/vue-query": "^5.69.0", "axios": "^1.8.2", "oidc-client-ts": "^3.1.0", + "uuid": "^11.1.0", "vue": "^3.5.13", "vue-i18n": "^11.1.2", "vue-router": "^4.5.0", diff --git a/package-lock.json b/package-lock.json index 27d261cb..45c5a310 100644 --- a/package-lock.json +++ b/package-lock.json @@ -104,6 +104,7 @@ "@tanstack/vue-query": "^5.69.0", "axios": "^1.8.2", "oidc-client-ts": "^3.1.0", + "uuid": "^11.1.0", "vue": "^3.5.13", "vue-i18n": "^11.1.2", "vue-router": "^4.5.0", From 1c99b03554c02869a5ec69c7645de744fce619ce Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Wed, 9 Apr 2025 19:26:38 +0200 Subject: [PATCH 49/94] 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 50/94] 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 51/94] 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 52/94] 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 53/94] 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 54/94] 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 55/94] 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 56/94] 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 57/94] 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 58/94] 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 620a988c6b36ce78581a11ad3cc82b71ca6baa80 Mon Sep 17 00:00:00 2001 From: Gerald Schmittinger Date: Wed, 9 Apr 2025 23:59:27 +0200 Subject: [PATCH 59/94] fix(backend): Merge-conflicten opgelost & testen gerepareerd. --- backend/src/controllers/submissions.ts | 10 ++++++++-- backend/src/data/questions/question-repository.ts | 4 +++- backend/src/interfaces/submission.ts | 2 +- backend/src/services/submissions.ts | 2 +- backend/tests/data/assignments/assignments.test.ts | 2 +- backend/tests/data/assignments/submissions.test.ts | 2 +- backend/tests/data/questions/questions.test.ts | 4 ++-- common/src/interfaces/question.ts | 6 ++++++ 8 files changed, 23 insertions(+), 9 deletions(-) diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts index 4714c1c4..51faa79b 100644 --- a/backend/src/controllers/submissions.ts +++ b/backend/src/controllers/submissions.ts @@ -15,9 +15,15 @@ import { LearningObjectIdentifier } from '../entities/content/learning-object-id export async function getSubmissionsHandler(req: Request, res: Response): Promise { const loHruid = req.params.hruid; const lang = languageMap[req.query.language as string] || Language.Dutch; - const version = req.query.version || 1; + const version = parseInt(req.query.version as string) ?? 1; - const submissions = await getSubmissionsForLearningObjectAndAssignment(loHruid, lang, version, req.query.classId, req.query.assignmentId); + const submissions = await getSubmissionsForLearningObjectAndAssignment( + loHruid, + lang, + version, + req.query.classId as string, + parseInt(req.query.assignmentId as string) + ); res.json(submissions); } diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts index faaf3528..e14c4f14 100644 --- a/backend/src/data/questions/question-repository.ts +++ b/backend/src/data/questions/question-repository.ts @@ -62,7 +62,9 @@ export class QuestionRepository extends DwengoEntityRepository { public async findAllByAssignment(assignment: Assignment): Promise { return this.find({ - author: assignment.groups.flatMap((group) => group.members), + inGroup: { + $contained: assignment.groups + }, learningObjectHruid: assignment.learningPathHruid, learningObjectLanguage: assignment.learningPathLanguage, }); diff --git a/backend/src/interfaces/submission.ts b/backend/src/interfaces/submission.ts index 085c795d..2aebb0f1 100644 --- a/backend/src/interfaces/submission.ts +++ b/backend/src/interfaces/submission.ts @@ -32,7 +32,7 @@ export function mapToSubmissionDTOId(submission: Submission): SubmissionDTOId { }; } -export function mapToSubmission(submissionDTO: SubmissionDTO, submitter: Student, onBehalfOf: Group | undefined): Submission { +export function mapToSubmission(submissionDTO: SubmissionDTO, submitter: Student, onBehalfOf: Group): Submission { return getSubmissionRepository().create({ learningObjectHruid: submissionDTO.learningObjectIdentifier.hruid, learningObjectLanguage: submissionDTO.learningObjectIdentifier.language, diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts index 76141c4c..0f225845 100644 --- a/backend/src/services/submissions.ts +++ b/backend/src/services/submissions.ts @@ -33,7 +33,7 @@ export async function getAllSubmissions(loId: LearningObjectIdentifier): Promise export async function createSubmission(submissionDTO: SubmissionDTO): Promise { const submitter = await fetchStudent(submissionDTO.submitter.username); - const group = submissionDTO.group ? await getExistingGroupFromGroupDTO(submissionDTO.group) : undefined; + const group = await getExistingGroupFromGroupDTO(submissionDTO.group!); const submissionRepository = getSubmissionRepository(); const submission = mapToSubmission(submissionDTO, submitter, group); diff --git a/backend/tests/data/assignments/assignments.test.ts b/backend/tests/data/assignments/assignments.test.ts index 206ab4fd..1fe52523 100644 --- a/backend/tests/data/assignments/assignments.test.ts +++ b/backend/tests/data/assignments/assignments.test.ts @@ -32,7 +32,7 @@ describe('AssignmentRepository', () => { }); it('should find all by username of the responsible teacher', async () => { - const result = await assignmentRepository.findAllByResponsibleTeacher('FooFighters'); + const result = await assignmentRepository.findAllByResponsibleTeacher('testleerkracht1'); const resultIds = result.map((it) => it.id).sort((a, b) => (a ?? 0) - (b ?? 0)); expect(resultIds).toEqual([1, 3, 4]); diff --git a/backend/tests/data/assignments/submissions.test.ts b/backend/tests/data/assignments/submissions.test.ts index 47e1c414..31aafc1d 100644 --- a/backend/tests/data/assignments/submissions.test.ts +++ b/backend/tests/data/assignments/submissions.test.ts @@ -66,7 +66,7 @@ describe('SubmissionRepository', () => { let assignment: Assignment | null; let loId: LearningObjectIdentifier; it('should find all submissions for a certain learning object and assignment', async () => { - clazz = await classRepository.findById('id01'); + clazz = await classRepository.findById('8764b861-90a6-42e5-9732-c0d9eb2f55f9'); assignment = await assignmentRepository.findByClassAndId(clazz!, 1); loId = { hruid: 'id02', diff --git a/backend/tests/data/questions/questions.test.ts b/backend/tests/data/questions/questions.test.ts index f24601bb..9565e71d 100644 --- a/backend/tests/data/questions/questions.test.ts +++ b/backend/tests/data/questions/questions.test.ts @@ -37,7 +37,7 @@ describe('QuestionRepository', () => { const id = new LearningObjectIdentifier('id03', Language.English, 1); const student = await studentRepository.findByUsername('Noordkaap'); - const clazz = await getClassRepository().findById('id01'); + const clazz = await getClassRepository().findById('8764b861-90a6-42e5-9732-c0d9eb2f55f9'); const assignment = await getAssignmentRepository().findByClassAndId(clazz!, 1); const group = await getGroupRepository().findByAssignmentAndGroupNumber(assignment!, 1); await questionRepository.createQuestion({ @@ -56,7 +56,7 @@ describe('QuestionRepository', () => { let assignment: Assignment | null; let loId: LearningObjectIdentifier; it('should find all questions for a certain learning object and assignment', async () => { - clazz = await getClassRepository().findById('id01'); + clazz = await getClassRepository().findById('8764b861-90a6-42e5-9732-c0d9eb2f55f9'); assignment = await getAssignmentRepository().findByClassAndId(clazz!, 1); loId = { hruid: 'id05', diff --git a/common/src/interfaces/question.ts b/common/src/interfaces/question.ts index f5eceffd..172d14b7 100644 --- a/common/src/interfaces/question.ts +++ b/common/src/interfaces/question.ts @@ -11,6 +11,12 @@ export interface QuestionDTO { content: string; } +export interface QuestionData { + author?: string; + content: string; + inGroup: GroupDTO; +} + export interface QuestionId { learningObjectIdentifier: LearningObjectIdentifierDTO; sequenceNumber: number; From 8e00fa53f044dd797f0a1f5de5487c6e7a285b7e Mon Sep 17 00:00:00 2001 From: Gerald Schmittinger Date: Thu, 10 Apr 2025 00:00:56 +0200 Subject: [PATCH 60/94] style(backend): Linting --- backend/src/services/submissions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts index 0f225845..ec19b280 100644 --- a/backend/src/services/submissions.ts +++ b/backend/src/services/submissions.ts @@ -33,7 +33,7 @@ export async function getAllSubmissions(loId: LearningObjectIdentifier): Promise export async function createSubmission(submissionDTO: SubmissionDTO): Promise { const submitter = await fetchStudent(submissionDTO.submitter.username); - const group = await getExistingGroupFromGroupDTO(submissionDTO.group!); + const group = await getExistingGroupFromGroupDTO(submissionDTO.group); const submissionRepository = getSubmissionRepository(); const submission = mapToSubmission(submissionDTO, submitter, group); From 61424e1ea247e28850dd4bf2d5468a1d5c1e4f89 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Wed, 9 Apr 2025 22:01:34 +0000 Subject: [PATCH 61/94] style: fix linting issues met Prettier --- backend/src/controllers/questions.ts | 4 ++-- backend/src/controllers/submissions.ts | 3 +-- backend/src/data/questions/question-repository.ts | 2 +- backend/src/interfaces/group.ts | 2 +- backend/src/interfaces/submission.ts | 6 +++--- backend/src/services/questions.ts | 8 ++++---- backend/src/services/submissions.ts | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts index 3fdfdacd..3240aa71 100644 --- a/backend/src/controllers/questions.ts +++ b/backend/src/controllers/questions.ts @@ -5,11 +5,11 @@ import { getAllQuestions, getQuestion, getQuestionsAboutLearningObjectInAssignment, - updateQuestion + updateQuestion, } from '../services/questions.js'; import { FALLBACK_LANG, FALLBACK_SEQ_NUM, FALLBACK_VERSION_NUM } from '../config.js'; import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js'; -import {QuestionData, QuestionDTO, QuestionId} from '@dwengo-1/common/interfaces/question'; +import { QuestionData, QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; import { Language } from '@dwengo-1/common/util/language'; import { requireFields } from './error-helper.js'; diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts index 51faa79b..92cf84c1 100644 --- a/backend/src/controllers/submissions.ts +++ b/backend/src/controllers/submissions.ts @@ -4,7 +4,7 @@ import { deleteSubmission, getAllSubmissions, getSubmission, - getSubmissionsForLearningObjectAndAssignment + getSubmissionsForLearningObjectAndAssignment, } from '../services/submissions.js'; import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission'; import { Language, languageMap } from '@dwengo-1/common/util/language'; @@ -28,7 +28,6 @@ export async function getSubmissionsHandler(req: Request, res: Response): Promis res.json(submissions); } - export async function getSubmissionHandler(req: Request, res: Response): Promise { const lohruid = req.params.hruid; const lang = languageMap[req.query.language as string] || Language.Dutch; diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts index e14c4f14..362ec4c9 100644 --- a/backend/src/data/questions/question-repository.ts +++ b/backend/src/data/questions/question-repository.ts @@ -63,7 +63,7 @@ export class QuestionRepository extends DwengoEntityRepository { public async findAllByAssignment(assignment: Assignment): Promise { return this.find({ inGroup: { - $contained: assignment.groups + $contained: assignment.groups, }, learningObjectHruid: assignment.learningPathHruid, learningObjectLanguage: assignment.learningPathLanguage, diff --git a/backend/src/interfaces/group.ts b/backend/src/interfaces/group.ts index 924a4586..2a8287a3 100644 --- a/backend/src/interfaces/group.ts +++ b/backend/src/interfaces/group.ts @@ -8,7 +8,7 @@ import { getGroupRepository } from '../data/repositories.js'; import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; import { Class } from '../entities/classes/class.entity.js'; import { StudentDTO } from '@dwengo-1/common/interfaces/student'; -import {mapToClassDTO} from "./class"; +import { mapToClassDTO } from './class'; export function mapToGroup(groupDto: GroupDTO, clazz: Class): Group { const assignmentDto = groupDto.assignment as AssignmentDTO; diff --git a/backend/src/interfaces/submission.ts b/backend/src/interfaces/submission.ts index 2aebb0f1..aa88f4a1 100644 --- a/backend/src/interfaces/submission.ts +++ b/backend/src/interfaces/submission.ts @@ -2,9 +2,9 @@ import { Submission } from '../entities/assignments/submission.entity.js'; import { mapToGroupDTO } from './group.js'; import { mapToStudentDTO } from './student.js'; import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission'; -import {getSubmissionRepository} from "../data/repositories"; -import {Student} from "../entities/users/student.entity"; -import {Group} from "../entities/assignments/group.entity"; +import { getSubmissionRepository } from '../data/repositories'; +import { Student } from '../entities/users/student.entity'; +import { Group } from '../entities/assignments/group.entity'; export function mapToSubmissionDTO(submission: Submission): SubmissionDTO { return { diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts index 889c6da6..49bf9e92 100644 --- a/backend/src/services/questions.ts +++ b/backend/src/services/questions.ts @@ -1,16 +1,16 @@ import { getAnswerRepository, getAssignmentRepository, getClassRepository, getGroupRepository, getQuestionRepository } from '../data/repositories.js'; -import {mapToLearningObjectID, mapToQuestionDTO, mapToQuestionDTOId} from '../interfaces/question.js'; +import { mapToLearningObjectID, mapToQuestionDTO, mapToQuestionDTOId } from '../interfaces/question.js'; import { Question } from '../entities/questions/question.entity.js'; import { Answer } from '../entities/questions/answer.entity.js'; import { mapToAnswerDTO, mapToAnswerDTOId } from '../interfaces/answer.js'; import { QuestionRepository } from '../data/questions/question-repository.js'; import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js'; -import {QuestionData, QuestionDTO, QuestionId} from '@dwengo-1/common/interfaces/question'; +import { QuestionData, QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer'; import { mapToAssignment } from '../interfaces/assignment.js'; -import {AssignmentDTO} from "@dwengo-1/common/interfaces/assignment"; +import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment'; import { fetchStudent } from './students.js'; -import {NotFoundException} from "../exceptions/not-found-exception"; +import { NotFoundException } from '../exceptions/not-found-exception'; import { FALLBACK_VERSION_NUM } from '../config.js'; export async function getQuestionsAboutLearningObjectInAssignment( diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts index ec19b280..64028a5f 100644 --- a/backend/src/services/submissions.ts +++ b/backend/src/services/submissions.ts @@ -6,7 +6,7 @@ import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission'; import { fetchStudent } from './students.js'; import { getExistingGroupFromGroupDTO } from './groups.js'; import { Submission } from '../entities/assignments/submission.entity.js'; -import {Language} from "@dwengo-1/common/util/language"; +import { Language } from '@dwengo-1/common/util/language'; export async function fetchSubmission(loId: LearningObjectIdentifier, submissionNumber: number): Promise { const submissionRepository = getSubmissionRepository(); From 439edc58930200298d9a17ee99098f08c418dfb8 Mon Sep 17 00:00:00 2001 From: laurejablonski Date: Fri, 11 Apr 2025 09:56:08 +0200 Subject: [PATCH 62/94] fix: vergeten parameter en verkeerde types fix --- backend/tool/seed.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/tool/seed.ts b/backend/tool/seed.ts index 33344234..3ded9379 100644 --- a/backend/tool/seed.ts +++ b/backend/tool/seed.ts @@ -14,6 +14,8 @@ import { makeTestQuestions } from '../tests/test_assets/questions/questions.test import { makeTestStudents } from '../tests/test_assets/users/students.testdata.js'; import { makeTestTeachers } from '../tests/test_assets/users/teachers.testdata.js'; import { getLogger, Logger } from '../src/logging/initalize.js'; +import { Collection } from '@mikro-orm/core'; +import { Group } from '../dist/entities/assignments/group.entity.js'; const logger: Logger = getLogger(); @@ -34,8 +36,8 @@ export async function seedDatabase(): Promise { 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); @@ -43,7 +45,7 @@ export async function seedDatabase(): Promise { learningObjects[1].attachments = attachments; - const questions = makeTestQuestions(em, students); + const questions = makeTestQuestions(em, students, groups); const answers = makeTestAnswers(em, teachers, questions); const submissions = makeTestSubmissions(em, students, groups); From d1f94588b86598f00be616a7464e5e5fd8fdf3ac Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Sat, 12 Apr 2025 11:46:12 +0200 Subject: [PATCH 63/94] chore(docs): Bouw docs automatisch in staging --- backend/.env-old | 21 +++++++++++++++++++++ backend/Dockerfile | 20 +++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 backend/.env-old diff --git a/backend/.env-old b/backend/.env-old new file mode 100644 index 00000000..bedfb0b7 --- /dev/null +++ b/backend/.env-old @@ -0,0 +1,21 @@ +PORT=3000 +DWENGO_DB_HOST=db +DWENGO_DB_PORT=5432 +DWENGO_DB_USERNAME=postgres +DWENGO_DB_PASSWORD=postgres +DWENGO_DB_UPDATE=false + +DWENGO_AUTH_STUDENT_URL=http://localhost/idp/realms/student +DWENGO_AUTH_STUDENT_CLIENT_ID=dwengo +DWENGO_AUTH_STUDENT_JWKS_ENDPOINT=http://idp:7080/idp/realms/student/protocol/openid-connect/certs +DWENGO_AUTH_TEACHER_URL=http://localhost/idp/realms/teacher +DWENGO_AUTH_TEACHER_CLIENT_ID=dwengo +DWENGO_AUTH_TEACHER_JWKS_ENDPOINT=http://idp:7080/idp/realms/teacher/protocol/openid-connect/certs + +# Allow Vite dev-server to access the backend (for testing purposes). Don't forget to remove this in production! +#DWENGO_CORS_ALLOWED_ORIGINS=http://localhost/,127.0.0.1:80,http://127.0.0.1,http://localhost:80,http://127.0.0.1:80,localhost +DWENGO_CORS_ALLOWED_ORIGINS=http://localhost/*,http://idp:7080,https://idp:7080 + +# Logging and monitoring + +LOKI_HOST=http://logging:3102 diff --git a/backend/Dockerfile b/backend/Dockerfile index bb3464c3..5f37aba9 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -22,6 +22,24 @@ COPY docs ./docs RUN npm run build +FROM node:22 AS docs-stage + +WORKDIR /app/dwengo + +# Install dependencies + +COPY package*.json ./ +COPY docs/package.json ./docs/ + +RUN npm install --silent + +# Build the docs + +COPY docs ./docs +COPY backend ./backend + +RUN npm run swagger -w docs + FROM node:22 AS production-stage WORKDIR /app/dwengo @@ -34,6 +52,7 @@ COPY ./backend/i18n ./i18n COPY --from=build-stage /app/dwengo/common/dist ./common/dist COPY --from=build-stage /app/dwengo/backend/dist ./backend/dist +COPY --from=docs-stage /app/dwengo/docs/api/swagger.json ./docs/api/swagger.json COPY package*.json ./ COPY backend/package.json ./backend/ @@ -42,7 +61,6 @@ COPY common/package.json ./common/ RUN npm install --silent --only=production -COPY ./docs ./docs COPY ./backend/i18n ./backend/i18n EXPOSE 3000 From e12967dc92a630e041c4a32a4f303da9550a41a0 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Sat, 12 Apr 2025 11:47:40 +0200 Subject: [PATCH 64/94] chore(docs): swagger.json automatisch genereren Niet meer inchecken in git --- docs/.gitignore | 1 + docs/api/swagger.json | 1964 ----------------------------------------- package.json | 2 +- 3 files changed, 2 insertions(+), 1965 deletions(-) create mode 100644 docs/.gitignore delete mode 100644 docs/api/swagger.json diff --git a/docs/.gitignore b/docs/.gitignore new file mode 100644 index 00000000..ca73ebc9 --- /dev/null +++ b/docs/.gitignore @@ -0,0 +1 @@ +api/swagger.json diff --git a/docs/api/swagger.json b/docs/api/swagger.json deleted file mode 100644 index 911839d0..00000000 --- a/docs/api/swagger.json +++ /dev/null @@ -1,1964 +0,0 @@ -{ - "openapi": "3.1.0", - "info": { - "version": "0.1.0", - "title": "Dwengo-1 Backend API", - "description": "Dwengo-1 Backend API using Express, based on VZW Dwengo", - "license": { - "name": "MIT", - "url": "https://github.com/SELab-2/Dwengo-1/blob/336496ab6352ee3f8bf47490c90b5cf81526cef6/LICENSE" - } - }, - "servers": [ - { - "url": "http://localhost:3000/", - "description": "Development server" - }, - { - "url": "https://sel2-1.ugent.be/", - "description": "Production server" - } - ], - "paths": { - "/api/": { - "get": { - "description": "", - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/student/": { - "get": { - "tags": ["Student"], - "description": "", - "parameters": [ - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "201": { - "description": "Created" - }, - "404": { - "description": "Not Found" - } - } - }, - "post": { - "tags": ["Student"], - "description": "", - "responses": { - "201": { - "description": "Created" - }, - "400": { - "description": "Bad Request" - } - }, - "requestBody": { - "content": { - "application/json": { - "schema": { - "type": "object", - "properties": { - "username": { - "example": "any" - }, - "firstName": { - "example": "any" - }, - "lastName": { - "example": "any" - } - } - } - } - } - } - }, - "delete": { - "tags": ["Student"], - "description": "", - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - }, - "404": { - "description": "Not Found" - } - } - } - }, - "/api/student/{username}": { - "delete": { - "tags": ["Student"], - "description": "", - "parameters": [ - { - "name": "username", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - }, - "404": { - "description": "Not Found" - } - } - }, - "get": { - "tags": ["Student"], - "description": "", - "parameters": [ - { - "name": "username", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "201": { - "description": "Created" - }, - "400": { - "description": "Bad Request" - }, - "404": { - "description": "Not Found" - } - } - } - }, - "/api/student/{id}/classes": { - "get": { - "tags": ["Student"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "500": { - "description": "Internal Server Error" - } - } - } - }, - "/api/student/{id}/submissions": { - "get": { - "tags": ["Student"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/student/{id}/assignments": { - "get": { - "tags": ["Student"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/student/{id}/groups": { - "get": { - "tags": ["Student"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/student/{id}/questions": { - "get": { - "tags": ["Student"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/group/": { - "get": { - "tags": ["Group"], - "description": "", - "parameters": [ - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - } - } - }, - "post": { - "tags": ["Group"], - "description": "", - "responses": { - "201": { - "description": "Created" - }, - "400": { - "description": "Bad Request" - }, - "500": { - "description": "Internal Server Error" - } - } - } - }, - "/api/group/{groupid}": { - "get": { - "tags": ["Group"], - "description": "", - "parameters": [ - { - "name": "groupid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - } - } - } - }, - "/api/group/{id}/questions": { - "get": { - "tags": ["Group"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/assignment/": { - "get": { - "tags": ["Assignment"], - "description": "", - "parameters": [ - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - }, - "post": { - "tags": ["Assignment"], - "description": "", - "responses": { - "201": { - "description": "Created" - }, - "400": { - "description": "Bad Request" - }, - "500": { - "description": "Internal Server Error" - } - }, - "requestBody": { - "content": { - "application/json": { - "schema": { - "type": "object", - "properties": { - "description": { - "example": "any" - }, - "language": { - "example": "any" - }, - "learningPath": { - "example": "any" - }, - "title": { - "example": "any" - } - } - } - } - } - } - } - }, - "/api/assignment/{id}": { - "get": { - "tags": ["Assignment"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - }, - "404": { - "description": "Not Found" - } - } - } - }, - "/api/assignment/{id}/submissions": { - "get": { - "tags": ["Assignment"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - } - } - } - }, - "/api/assignment/{id}/questions": { - "get": { - "tags": ["Assignment"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/assignment/{assignmentid}/groups/": { - "get": { - "tags": ["Assignment"], - "description": "", - "parameters": [ - { - "name": "assignmentid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - } - } - }, - "post": { - "tags": ["Assignment"], - "description": "", - "parameters": [ - { - "name": "assignmentid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "201": { - "description": "Created" - }, - "400": { - "description": "Bad Request" - }, - "500": { - "description": "Internal Server Error" - } - } - } - }, - "/api/assignment/{assignmentid}/groups/{groupid}": { - "get": { - "tags": ["Assignment"], - "description": "", - "parameters": [ - { - "name": "assignmentid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "groupid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - } - } - } - }, - "/api/assignment/{assignmentid}/groups/{id}/questions": { - "get": { - "tags": ["Assignment"], - "description": "", - "parameters": [ - { - "name": "assignmentid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/submission/": { - "get": { - "tags": ["Submission"], - "description": "", - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/submission/{id}": { - "post": { - "tags": ["Submission"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "404": { - "description": "Not Found" - } - } - }, - "get": { - "tags": ["Submission"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "language", - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "version", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - }, - "404": { - "description": "Not Found" - } - } - }, - "delete": { - "tags": ["Submission"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "language", - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "version", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "404": { - "description": "Not Found" - } - } - } - }, - "/api/class/": { - "get": { - "tags": ["Class"], - "description": "", - "parameters": [ - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - }, - "post": { - "tags": ["Class"], - "description": "", - "responses": { - "201": { - "description": "Created" - }, - "400": { - "description": "Bad Request" - }, - "500": { - "description": "Internal Server Error" - } - }, - "requestBody": { - "content": { - "application/json": { - "schema": { - "type": "object", - "properties": { - "displayName": { - "example": "any" - } - } - } - } - } - } - } - }, - "/api/class/{id}": { - "get": { - "tags": ["Class"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "404": { - "description": "Not Found" - }, - "500": { - "description": "Internal Server Error" - } - } - } - }, - "/api/class/{id}/teacher-invitations": { - "get": { - "tags": ["Class"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/class/{id}/students": { - "get": { - "tags": ["Class"], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/class/{classid}/assignments/": { - "get": { - "tags": ["Class"], - "description": "", - "parameters": [ - { - "name": "classid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - }, - "post": { - "tags": ["Class"], - "description": "", - "parameters": [ - { - "name": "classid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "201": { - "description": "Created" - }, - "400": { - "description": "Bad Request" - }, - "500": { - "description": "Internal Server Error" - } - }, - "requestBody": { - "content": { - "application/json": { - "schema": { - "type": "object", - "properties": { - "description": { - "example": "any" - }, - "language": { - "example": "any" - }, - "learningPath": { - "example": "any" - }, - "title": { - "example": "any" - } - } - } - } - } - } - } - }, - "/api/class/{classid}/assignments/{id}": { - "get": { - "tags": ["Class"], - "description": "", - "parameters": [ - { - "name": "classid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - }, - "404": { - "description": "Not Found" - } - } - } - }, - "/api/class/{classid}/assignments/{id}/submissions": { - "get": { - "tags": ["Class"], - "description": "", - "parameters": [ - { - "name": "classid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - } - } - } - }, - "/api/class/{classid}/assignments/{id}/questions": { - "get": { - "tags": ["Class"], - "description": "", - "parameters": [ - { - "name": "classid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/class/{classid}/assignments/{assignmentid}/groups/": { - "get": { - "tags": ["Class"], - "description": "", - "parameters": [ - { - "name": "classid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "assignmentid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - } - } - }, - "post": { - "tags": ["Class"], - "description": "", - "parameters": [ - { - "name": "classid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "assignmentid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "201": { - "description": "Created" - }, - "400": { - "description": "Bad Request" - }, - "500": { - "description": "Internal Server Error" - } - } - } - }, - "/api/class/{classid}/assignments/{assignmentid}/groups/{groupid}": { - "get": { - "tags": ["Class"], - "description": "", - "parameters": [ - { - "name": "classid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "assignmentid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "groupid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - } - } - } - }, - "/api/class/{classid}/assignments/{assignmentid}/groups/{id}/questions": { - "get": { - "tags": ["Class"], - "description": "", - "parameters": [ - { - "name": "classid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "assignmentid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/question/": { - "get": { - "tags": ["Question"], - "description": "", - "parameters": [ - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "404": { - "description": "Not Found" - } - } - }, - "post": { - "tags": ["Question"], - "description": "", - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - } - }, - "requestBody": { - "content": { - "application/json": { - "schema": { - "type": "object", - "properties": { - "learningObjectIdentifier": { - "example": "any" - }, - "author": { - "example": "any" - }, - "content": { - "example": "any" - } - } - } - } - } - } - } - }, - "/api/question/{seq}": { - "delete": { - "tags": ["Question"], - "description": "", - "parameters": [ - { - "name": "seq", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - } - } - }, - "get": { - "tags": ["Question"], - "description": "", - "parameters": [ - { - "name": "seq", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "404": { - "description": "Not Found" - } - } - } - }, - "/api/question/answers/{seq}": { - "get": { - "tags": ["Question"], - "description": "", - "parameters": [ - { - "name": "seq", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "404": { - "description": "Not Found" - } - } - } - }, - "/api/auth/config": { - "get": { - "tags": ["Auth"], - "description": "", - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/auth/testAuthenticatedOnly": { - "get": { - "tags": ["Auth"], - "description": "", - "responses": { - "200": { - "description": "OK" - } - }, - "security": [ - { - "student": [] - }, - { - "teacher": [] - } - ] - } - }, - "/api/auth/testStudentsOnly": { - "get": { - "tags": ["Auth"], - "description": "", - "responses": { - "200": { - "description": "OK" - } - }, - "security": [ - { - "student": [] - } - ] - } - }, - "/api/auth/testTeachersOnly": { - "get": { - "tags": ["Auth"], - "description": "", - "responses": { - "200": { - "description": "OK" - } - }, - "security": [ - { - "teacher": [] - } - ] - } - }, - "/api/theme/": { - "get": { - "tags": ["Theme"], - "description": "", - "parameters": [ - { - "name": "language", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/theme/{theme}": { - "get": { - "tags": ["Theme"], - "description": "", - "parameters": [ - { - "name": "theme", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "404": { - "description": "Not Found" - } - } - } - }, - "/api/learningPath/": { - "get": { - "tags": ["Learning Path"], - "description": "", - "parameters": [ - { - "name": "hruid", - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "theme", - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "search", - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "language", - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "forStudent", - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "forGroup", - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "assignmentNo", - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "classId", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/learningObject/": { - "get": { - "tags": ["Learning Object"], - "description": "", - "parameters": [ - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/learningObject/{hruid}": { - "get": { - "tags": ["Learning Object"], - "description": "", - "parameters": [ - { - "name": "hruid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/learningObject/{hruid}/html": { - "get": { - "tags": ["Learning Object"], - "description": "", - "parameters": [ - { - "name": "hruid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/learningObject/{hruid}/html/{attachmentName}": { - "get": { - "tags": ["Learning Object"], - "description": "", - "parameters": [ - { - "name": "hruid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "attachmentName", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "default": { - "description": "" - } - } - } - }, - "/api/learningObject/{hruid}/submissions/": { - "get": { - "tags": ["Learning Object"], - "description": "", - "parameters": [ - { - "name": "hruid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/api/learningObject/{hruid}/submissions/{id}": { - "post": { - "tags": ["Learning Object"], - "description": "", - "parameters": [ - { - "name": "hruid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "404": { - "description": "Not Found" - } - } - }, - "get": { - "tags": ["Learning Object"], - "description": "", - "parameters": [ - { - "name": "hruid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "language", - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "version", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - }, - "404": { - "description": "Not Found" - } - } - }, - "delete": { - "tags": ["Learning Object"], - "description": "", - "parameters": [ - { - "name": "hruid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "language", - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "version", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "404": { - "description": "Not Found" - } - } - } - }, - "/api/learningObject/{hruid}/{version}/questions/": { - "get": { - "tags": ["Learning Object"], - "description": "", - "parameters": [ - { - "name": "hruid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "version", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "404": { - "description": "Not Found" - } - } - }, - "post": { - "tags": ["Learning Object"], - "description": "", - "parameters": [ - { - "name": "hruid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "version", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - } - }, - "requestBody": { - "content": { - "application/json": { - "schema": { - "type": "object", - "properties": { - "learningObjectIdentifier": { - "example": "any" - }, - "author": { - "example": "any" - }, - "content": { - "example": "any" - } - } - } - } - } - } - } - }, - "/api/learningObject/{hruid}/{version}/questions/{seq}": { - "delete": { - "tags": ["Learning Object"], - "description": "", - "parameters": [ - { - "name": "hruid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "version", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "seq", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - } - } - }, - "get": { - "tags": ["Learning Object"], - "description": "", - "parameters": [ - { - "name": "hruid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "version", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "seq", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "404": { - "description": "Not Found" - } - } - } - }, - "/api/learningObject/{hruid}/{version}/questions/answers/{seq}": { - "get": { - "tags": ["Learning Object"], - "description": "", - "parameters": [ - { - "name": "hruid", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "version", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "seq", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "full", - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "description": "OK" - }, - "404": { - "description": "Not Found" - } - } - } - } - }, - "components": { - "securitySchemes": { - "student": { - "type": "oauth2", - "flows": { - "implicit": { - "authorizationUrl": "https://sel2-1.ugent.be/idp/realms/student/protocol/openid-connect/auth", - "scopes": { - "openid": "openid", - "profile": "profile", - "email": "email" - } - } - } - }, - "teacher": { - "type": "oauth2", - "flows": { - "implicit": { - "authorizationUrl": "https://sel2-1.ugent.be/idp/realms/teacher/protocol/openid-connect/auth", - "scopes": { - "openid": "openid", - "profile": "profile", - "email": "email" - } - } - } - } - } - } -} diff --git a/package.json b/package.json index 64cfd665..3d9be4d0 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "type": "module", "scripts": { - "prebuild": "npm run clean", + "prebuild": "npm run clean && npm run swagger --workspace=docs", "build": "tsc --build tsconfig.build.json", "clean": "tsc --build tsconfig.build.json --clean", "watch": "tsc --build tsconfig.build.json --watch", From f3c14a175076ad926bdcaedee87122be607f54b8 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Sat, 12 Apr 2025 11:55:29 +0200 Subject: [PATCH 65/94] fix(backend): Volgorde docs bouwen --- backend/Dockerfile | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 5f37aba9..1d82a484 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -6,8 +6,9 @@ WORKDIR /app/dwengo COPY package*.json ./ COPY backend/package.json ./backend/ -# Backend depends on common +# Backend depends on common and docs COPY common/package.json ./common/ +COPY docs/package.json ./docs/ RUN npm install --silent @@ -22,24 +23,6 @@ COPY docs ./docs RUN npm run build -FROM node:22 AS docs-stage - -WORKDIR /app/dwengo - -# Install dependencies - -COPY package*.json ./ -COPY docs/package.json ./docs/ - -RUN npm install --silent - -# Build the docs - -COPY docs ./docs -COPY backend ./backend - -RUN npm run swagger -w docs - FROM node:22 AS production-stage WORKDIR /app/dwengo @@ -52,7 +35,7 @@ COPY ./backend/i18n ./i18n COPY --from=build-stage /app/dwengo/common/dist ./common/dist COPY --from=build-stage /app/dwengo/backend/dist ./backend/dist -COPY --from=docs-stage /app/dwengo/docs/api/swagger.json ./docs/api/swagger.json +COPY --from=build-stage /app/dwengo/docs/api/swagger.json ./docs/api/swagger.json COPY package*.json ./ COPY backend/package.json ./backend/ From 311e76149c1f27513bef421f3304e703c51a5092 Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Sat, 12 Apr 2025 17:55:39 +0200 Subject: [PATCH 66/94] 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 67/94] 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 68/94] 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 69/94] 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 70/94] 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 71/94] 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 72/94] 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 73/94] 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 74/94] 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 75/94] 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 76/94] 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 77/94] 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 78/94] 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 79/94] 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 80/94] 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 81/94] 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 82/94] 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 83/94] 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 84/94] 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 85/94] 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 86/94] 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 87/94] 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 88/94] 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 89/94] 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 90/94] 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 91/94] 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 92/94] 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 93/94] 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 94/94] 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 {