tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

style(backend): Lint

Browse source
This commit is contained in:
Gerald Schmittinger 2025-04-08 01:05:27 +02:00
parent d21377cda4
commit 3c3a1d89c6
8 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/src/controllers/submissions.ts
View file

@ -30,8 +30,8 @@ export async function getSubmissionsHandler(
res: Response res: Response
): Promise<void> { ): Promise<void> {
const loHruid = req.params.hruid; const loHruid = req.params.hruid;
const lang = languageMap[req.query.language as string] || Language.Dutch; const lang = languageMap[req.query.language] || Language.Dutch;
const version = (req.query.version || 1) as number; const version = (req.query.version || 1);
const submissions = await getSubmissionsForLearningObjectAndAssignment( const submissions = await getSubmissionsForLearningObjectAndAssignment(
loHruid, lang, version, req.query.classId, req.query.assignmentId loHruid, lang, version, req.query.classId, req.query.assignmentId

2
backend/src/data/assignments/submission-repository.ts
View file

@ -60,7 +60,7 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
assignment: Assignment, assignment: Assignment,
forStudentUsername?: string forStudentUsername?: string
): Promise<Submission[]> { ): Promise<Submission[]> {
let onBehalfOf = forStudentUsername ? { const onBehalfOf = forStudentUsername ? {
assignment, assignment,
members: { members: {
$some: { $some: {

2
backend/src/data/questions/question-repository.ts
View file

@ -75,7 +75,7 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
assignment: Assignment, assignment: Assignment,
forStudentUsername?: string forStudentUsername?: string
): Promise<Question[]> { ): Promise<Question[]> {
let inGroup = forStudentUsername ? { const inGroup = forStudentUsername ? {
assignment, assignment,
members: { members: {
$some: { $some: {

2
backend/src/interfaces/group.ts
View file

@ -12,7 +12,7 @@ export function mapToGroup(groupDto: GroupDTO, clazz: Class): Group {
return getGroupRepository().create({ return getGroupRepository().create({
groupNumber: groupDto.groupNumber, groupNumber: groupDto.groupNumber,
assignment: mapToAssignment(assignmentDto, clazz!), assignment: mapToAssignment(assignmentDto, clazz),
members: groupDto.members.map(studentDto => mapToStudent(studentDto as StudentDTO)) members: groupDto.members.map(studentDto => mapToStudent(studentDto as StudentDTO))
}); });
} }

3
backend/src/services/questions.ts
View file

@ -30,8 +30,7 @@ export async function getQuestionsAboutLearningObjectInAssignment(
.findAllQuestionsAboutLearningObjectInAssignment(loId, assignment!, studentUsername); .findAllQuestionsAboutLearningObjectInAssignment(loId, assignment!, studentUsername);
if (full) if (full)
return questions.map(q => mapToQuestionDTO(q)); {return questions.map(q => mapToQuestionDTO(q));}
else
return questions.map(q => mapToQuestionDTOId(q)); return questions.map(q => mapToQuestionDTOId(q));
} }

14
backend/tests/data/assignments/submissions.test.ts
View file

@ -97,15 +97,15 @@ describe('SubmissionRepository', () => {
expect(result).toHaveLength(3); 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].learningObjectHruid).toBe(loId.hruid);
expect(result[0].submissionNumber).toBe(1); 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].learningObjectHruid).toBe(loId.hruid);
expect(result[1].submissionNumber).toBe(2); 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].learningObjectHruid).toBe(loId.hruid);
expect(result[2].submissionNumber).toBe(3); expect(result[2].submissionNumber).toBe(3);
}); });
@ -117,12 +117,12 @@ describe('SubmissionRepository', () => {
expect(result).toHaveLength(1); 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].learningObjectHruid).toBe(loId.hruid);
expect(result[0].submissionNumber).toBe(3); 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 // 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 () => { it('should not find a deleted submission', async () => {
@ -137,8 +137,8 @@ describe('SubmissionRepository', () => {
function sortSubmissions(submissions: Submission[]) { function sortSubmissions(submissions: Submission[]) {
submissions.sort((a, b) => { 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!; return a.submissionNumber! - b.submissionNumber!;
}); });
} }

20
backend/tests/data/questions/questions.test.ts
View file

@ -67,19 +67,19 @@ describe('QuestionRepository', () => {
expect(result).toHaveLength(3); 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].learningObjectHruid).toEqual(loId.hruid);
expect(result[0].sequenceNumber).toEqual(1); 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].learningObjectHruid).toEqual(loId.hruid);
expect(result[1].sequenceNumber).toEqual(2); 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].learningObjectHruid).toEqual(loId.hruid);
expect(result[2].sequenceNumber).toEqual(3); 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 () => { 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); 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].learningObjectHruid).toEqual(loId.hruid);
expect(result[0].sequenceNumber).toEqual(3); 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 () => { it('should not find removed question', async () => {
@ -110,8 +110,8 @@ describe('QuestionRepository', () => {
function sortQuestions(questions: Question[]) { function sortQuestions(questions: Question[]) {
questions.sort((a, b) => { questions.sort((a, b) => {
if (a.learningObjectHruid < b.learningObjectHruid) return -1 if (a.learningObjectHruid < b.learningObjectHruid) {return -1}
else if (a.learningObjectHruid > b.learningObjectHruid) return 1 else if (a.learningObjectHruid > b.learningObjectHruid) {return 1}
else return a.sequenceNumber! - b.sequenceNumber! return a.sequenceNumber! - b.sequenceNumber!
}); });
} }

8
backend/tests/test_assets/assignments/submission.testdata.ts
View file

@ -12,7 +12,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
submissionNumber: 1, submissionNumber: 1,
submitter: students[0], submitter: students[0],
submissionTime: new Date(2025, 2, 20), 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', content: 'sub1',
}); });
@ -23,7 +23,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
submissionNumber: 2, submissionNumber: 2,
submitter: students[0], submitter: students[0],
submissionTime: new Date(2025, 2, 25), 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: '', content: '',
}); });
@ -34,7 +34,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
submissionNumber: 1, submissionNumber: 1,
submitter: students[0], submitter: students[0],
submissionTime: new Date(2025, 2, 20), 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: '', content: '',
}); });
@ -45,7 +45,7 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
submissionNumber: 2, submissionNumber: 2,
submitter: students[0], submitter: students[0],
submissionTime: new Date(2025, 2, 25), 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: '', content: '',
}); });