From b9681926f80d666b4f7c4e7352c085c3320cd9fa Mon Sep 17 00:00:00 2001 From: Lint Action Date: Tue, 1 Apr 2025 16:39:31 +0000 Subject: [PATCH] style: fix linting issues met Prettier --- backend/src/controllers/students.ts | 3 ++- backend/src/interfaces/answer.ts | 2 +- backend/src/routes/student-join-requests.ts | 2 +- backend/src/services/questions.ts | 2 +- backend/src/services/students.ts | 13 ++++------- backend/src/services/teachers.ts | 7 +----- backend/tests/controllers/students.test.ts | 23 ++++++++----------- backend/tests/controllers/teachers.test.ts | 14 ++++------- .../test_assets/users/students.testdata.ts | 2 +- frontend/src/controllers/teachers.ts | 7 +++++- 10 files changed, 31 insertions(+), 44 deletions(-) diff --git a/backend/src/controllers/students.ts b/backend/src/controllers/students.ts index 7f00d640..4bc4394e 100644 --- a/backend/src/controllers/students.ts +++ b/backend/src/controllers/students.ts @@ -4,7 +4,8 @@ import { createStudent, deleteClassJoinRequest, deleteStudent, - getAllStudents, getJoinRequestByStudentClass, + getAllStudents, + getJoinRequestByStudentClass, getJoinRequestsByStudent, getStudent, getStudentAssignments, diff --git a/backend/src/interfaces/answer.ts b/backend/src/interfaces/answer.ts index 1162a1d3..5d395958 100644 --- a/backend/src/interfaces/answer.ts +++ b/backend/src/interfaces/answer.ts @@ -1,5 +1,5 @@ import { mapToUserDTO, UserDTO } from './user.js'; -import {mapToQuestionDTO, mapToQuestionDTOId, QuestionDTO, QuestionId} from './question.js'; +import { mapToQuestionDTO, mapToQuestionDTOId, QuestionDTO, QuestionId } from './question.js'; import { Answer } from '../entities/questions/answer.entity.js'; export interface AnswerDTO { diff --git a/backend/src/routes/student-join-requests.ts b/backend/src/routes/student-join-requests.ts index 6204e74d..daf79f09 100644 --- a/backend/src/routes/student-join-requests.ts +++ b/backend/src/routes/student-join-requests.ts @@ -3,7 +3,7 @@ import { createStudentRequestHandler, deleteClassJoinRequestHandler, getStudentRequestHandler, - getStudentRequestsHandler + getStudentRequestsHandler, } from '../controllers/students.js'; const router = express.Router({ mergeParams: true }); diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts index 589ae115..44f26a1d 100644 --- a/backend/src/services/questions.ts +++ b/backend/src/services/questions.ts @@ -1,5 +1,5 @@ import { getAnswerRepository, getQuestionRepository } from '../data/repositories.js'; -import {mapToQuestionDTO, mapToQuestionDTOId, QuestionDTO, QuestionId} from '../interfaces/question.js'; +import { mapToQuestionDTO, mapToQuestionDTOId, QuestionDTO, QuestionId } from '../interfaces/question.js'; import { Question } from '../entities/questions/question.entity.js'; import { Answer } from '../entities/questions/answer.entity.js'; import { AnswerDTO, AnswerId, mapToAnswerDTO, mapToAnswerDTOId } from '../interfaces/answer.js'; diff --git a/backend/src/services/students.ts b/backend/src/services/students.ts index dde5bf0d..3f528dbc 100644 --- a/backend/src/services/students.ts +++ b/backend/src/services/students.ts @@ -12,13 +12,8 @@ import { GroupDTO, mapToGroupDTO, mapToGroupDTOId } from '../interfaces/group.js import { mapToStudent, mapToStudentDTO, StudentDTO } from '../interfaces/student.js'; import { mapToSubmissionDTO, mapToSubmissionDTOId, SubmissionDTO, SubmissionDTOId } from '../interfaces/submission.js'; import { getAllAssignments } from './assignments.js'; -import { - mapToQuestionDTO, - mapToQuestionDTOId, - QuestionDTO, - QuestionId -} from '../interfaces/question.js'; -import {mapToStudentRequest, mapToStudentRequestDTO, StudentRequestDTO} from '../interfaces/student-request.js'; +import { mapToQuestionDTO, mapToQuestionDTOId, QuestionDTO, QuestionId } from '../interfaces/question.js'; +import { mapToStudentRequest, mapToStudentRequestDTO, StudentRequestDTO } from '../interfaces/student-request.js'; import { Student } from '../entities/users/student.entity.js'; import { NotFoundException } from '../exceptions/not-found-exception.js'; import { fetchClass } from './classes.js'; @@ -148,14 +143,14 @@ export async function getJoinRequestsByStudent(username: string): Promise{ +export async function getJoinRequestByStudentClass(username: string, classId: string): Promise { const requestRepo = getClassJoinRequestRepository(); const student = await fetchStudent(username); const cls = await fetchClass(classId); const request = await requestRepo.findByStudentAndClass(student, cls); - if (!request){ + if (!request) { throw new NotFoundException('Join request not found'); } diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts index ddd81a02..98ac0a83 100644 --- a/backend/src/services/teachers.ts +++ b/backend/src/services/teachers.ts @@ -6,12 +6,7 @@ import { getTeacherRepository, } from '../data/repositories.js'; import { ClassDTO, mapToClassDTO } from '../interfaces/class.js'; -import { - mapToQuestionDTO, - mapToQuestionDTOId, - QuestionDTO, - QuestionId -} from '../interfaces/question.js'; +import { mapToQuestionDTO, mapToQuestionDTOId, QuestionDTO, QuestionId } from '../interfaces/question.js'; import { mapToTeacher, mapToTeacherDTO, TeacherDTO } from '../interfaces/teacher.js'; import { Teacher } from '../entities/users/teacher.entity.js'; import { fetchStudent } from './students.js'; diff --git a/backend/tests/controllers/students.test.ts b/backend/tests/controllers/students.test.ts index cf72f28c..607449aa 100644 --- a/backend/tests/controllers/students.test.ts +++ b/backend/tests/controllers/students.test.ts @@ -12,7 +12,8 @@ import { getStudentQuestionsHandler, createStudentRequestHandler, getStudentRequestsHandler, - deleteClassJoinRequestHandler, getStudentRequestHandler, + deleteClassJoinRequestHandler, + getStudentRequestHandler, } from '../../src/controllers/students.js'; import { TEST_STUDENTS } from '../test_assets/users/students.testdata.js'; import { NotFoundException } from '../../src/exceptions/not-found-exception.js'; @@ -49,15 +50,13 @@ describe('Student controllers', () => { it('Student not found', async () => { req = { params: { username: 'doesnotexist' } }; - await expect(async () => getStudentHandler(req as Request, res as Response)) - .rejects.toThrow(NotFoundException); + await expect(async () => getStudentHandler(req as Request, res as Response)).rejects.toThrow(NotFoundException); }); it('No username', async () => { req = { params: {} }; - await expect(async () => getStudentHandler(req as Request, res as Response)) - .rejects.toThrowError(BadRequestException); + await expect(async () => getStudentHandler(req as Request, res as Response)).rejects.toThrowError(BadRequestException); }); it('Create and delete student', async () => { @@ -68,7 +67,7 @@ describe('Student controllers', () => { lastName: 'Student', } as StudentDTO; req = { - body: student + body: student, }; await createStudentHandler(req as Request, res as Response); @@ -91,15 +90,13 @@ describe('Student controllers', () => { }, }; - await expect(async () => createStudentHandler(req as Request, res as Response)) - .rejects.toThrowError(EntityAlreadyExistsException); + await expect(async () => createStudentHandler(req as Request, res as Response)).rejects.toThrowError(EntityAlreadyExistsException); }); it('Create student no body', async () => { req = { body: {} }; - await expect(async () => createStudentHandler(req as Request, res as Response)) - .rejects.toThrowError(BadRequestException); + await expect(async () => createStudentHandler(req as Request, res as Response)).rejects.toThrowError(BadRequestException); }); it('Student list', async () => { @@ -218,8 +215,7 @@ describe('Student controllers', () => { body: { classId: 'id02' }, }; - await expect(async () => createStudentRequestHandler(req as Request, res as Response)) - .rejects.toThrow(ConflictException); + await expect(async () => createStudentRequestHandler(req as Request, res as Response)).rejects.toThrow(ConflictException); }); it('Delete join request', async () => { @@ -231,7 +227,6 @@ describe('Student controllers', () => { expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ request: expect.anything() })); - await expect(async () => deleteClassJoinRequestHandler(req as Request, res as Response)) - .rejects.toThrow(NotFoundException); + 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 a0b5f648..d48481c2 100644 --- a/backend/tests/controllers/teachers.test.ts +++ b/backend/tests/controllers/teachers.test.ts @@ -45,15 +45,13 @@ describe('Teacher controllers', () => { it('Teacher not found', async () => { req = { params: { username: 'doesnotexist' } }; - await expect(async () => getTeacherHandler(req as Request, res as Response)) - .rejects.toThrow(NotFoundException); + await expect(async () => getTeacherHandler(req as Request, res as Response)).rejects.toThrow(NotFoundException); }); it('No username', async () => { req = { params: {} }; - await expect(async () => getTeacherHandler(req as Request, res as Response)) - .rejects.toThrowError(BadRequestException); + await expect(async () => getTeacherHandler(req as Request, res as Response)).rejects.toThrowError(BadRequestException); }); it('Create and delete teacher', async () => { @@ -62,7 +60,7 @@ describe('Teacher controllers', () => { username: 'coolteacher', firstName: 'New', lastName: 'Teacher', - } + }; req = { body: teacher, }; @@ -87,15 +85,13 @@ describe('Teacher controllers', () => { }, }; - await expect(async () => createTeacherHandler(req as Request, res as Response)) - .rejects.toThrowError(EntityAlreadyExistsException); + await expect(async () => createTeacherHandler(req as Request, res as Response)).rejects.toThrowError(EntityAlreadyExistsException); }); it('Create teacher no body', async () => { req = { body: {} }; - await expect(async () => createTeacherHandler(req as Request, res as Response)) - .rejects.toThrowError(BadRequestException); + await expect(async () => createTeacherHandler(req as Request, res as Response)).rejects.toThrowError(BadRequestException); }); it('Teacher list', async () => { diff --git a/backend/tests/test_assets/users/students.testdata.ts b/backend/tests/test_assets/users/students.testdata.ts index ba34c728..5cd75787 100644 --- a/backend/tests/test_assets/users/students.testdata.ts +++ b/backend/tests/test_assets/users/students.testdata.ts @@ -1,4 +1,4 @@ -import { EntityManager} from '@mikro-orm/core'; +import { EntityManager } from '@mikro-orm/core'; import { Student } from '../../../src/entities/users/student.entity'; // 🔓 Ruwe testdata array — herbruikbaar in assertions diff --git a/frontend/src/controllers/teachers.ts b/frontend/src/controllers/teachers.ts index 1a496ad8..229eced5 100644 --- a/frontend/src/controllers/teachers.ts +++ b/frontend/src/controllers/teachers.ts @@ -37,7 +37,12 @@ export class TeacherController extends BaseController { return this.get<{ joinRequests: any[] }>(`/${username}/joinRequests/${classId}`); } - async updateStudentJoinRequest(teacherUsername: string, classId: string, studentUsername: string, accepted: boolean) { + async updateStudentJoinRequest( + teacherUsername: string, + classId: string, + studentUsername: string, + accepted: boolean, + ) { return this.put(`/${teacherUsername}/joinRequests/${classId}/${studentUsername}`, accepted); }