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