style: lint + format

This commit is contained in:
laurejablonski 2025-04-27 10:35:22 +02:00
parent 78b5864f68
commit 844cc6a1a1
11 changed files with 25 additions and 40 deletions

View file

@ -26,9 +26,9 @@ export async function setupTestApp(): Promise<void> {
const teachers = makeTestTeachers(em); const teachers = makeTestTeachers(em);
const learningObjects = makeTestLearningObjects(em); const learningObjects = makeTestLearningObjects(em);
const learningPaths = makeTestLearningPaths(em); const learningPaths = makeTestLearningPaths(em);
const classes = makeTestClasses(em, students, teachers); const classes = makeTestClasses(em);
const assignments = makeTestAssignemnts(em, classes); const assignments = makeTestAssignemnts(em);
const groups = makeTestGroups(em, students, assignments); const groups = makeTestGroups(em);
const groups1 = [getTestGroup01(), getTestGroup02(), getTestGroup03()]; const groups1 = [getTestGroup01(), getTestGroup02(), getTestGroup03()];
const groups2 = [getTestGroup04()]; const groups2 = [getTestGroup04()];
@ -37,15 +37,15 @@ export async function setupTestApp(): Promise<void> {
assignment1.groups = new Collection<Group>(groups1); assignment1.groups = new Collection<Group>(groups1);
assignment2.groups = new Collection<Group>(groups2); assignment2.groups = new Collection<Group>(groups2);
const teacherInvitations = makeTestTeacherInvitations(em, teachers, classes); const teacherInvitations = makeTestTeacherInvitations(em);
const classJoinRequests = makeTestClassJoinRequests(em, students, classes); const classJoinRequests = makeTestClassJoinRequests(em);
const attachments = makeTestAttachments(em, learningObjects); const attachments = makeTestAttachments(em);
testLearningObject01.attachments = attachments; testLearningObject01.attachments = attachments;
const questions = makeTestQuestions(em, students, groups); const questions = makeTestQuestions(em);
const answers = makeTestAnswers(em, teachers, questions); const answers = makeTestAnswers(em);
const submissions = makeTestSubmissions(em, students, groups); const submissions = makeTestSubmissions(em);
await em.persistAndFlush([ await em.persistAndFlush([
...students, ...students,

View file

@ -1,11 +1,10 @@
import { EntityManager } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/core';
import { Assignment } from '../../../src/entities/assignments/assignment.entity'; import { Assignment } from '../../../src/entities/assignments/assignment.entity';
import { Class } from '../../../src/entities/classes/class.entity';
import { Language } from '@dwengo-1/common/util/language'; import { Language } from '@dwengo-1/common/util/language';
import { testLearningPath01, testLearningPath02, testLearningPathWithConditions } from '../content/learning-paths.testdata'; import { testLearningPath01, testLearningPath02, testLearningPathWithConditions } from '../content/learning-paths.testdata';
import { getClass01, getClass02, getClassWithTestleerlingAndTestleerkracht } from '../classes/classes.testdata'; import { getClass01, getClass02, getClassWithTestleerlingAndTestleerkracht } from '../classes/classes.testdata';
export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assignment[] { export function makeTestAssignemnts(em: EntityManager): Assignment[] {
assignment01 = em.create(Assignment, { assignment01 = em.create(Assignment, {
id: 21000, id: 21000,
within: getClass01(), within: getClass01(),

View file

@ -1,11 +1,9 @@
import { EntityManager } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/core';
import { Group } from '../../../src/entities/assignments/group.entity'; import { Group } from '../../../src/entities/assignments/group.entity';
import { Assignment } from '../../../src/entities/assignments/assignment.entity';
import { Student } from '../../../src/entities/users/student.entity';
import { getAssignment01, getAssignment02, getAssignment04, getConditionalPathAssignment } from './assignments.testdata'; import { getAssignment01, getAssignment02, getAssignment04, getConditionalPathAssignment } from './assignments.testdata';
import { getDireStraits, getNoordkaap, getPinkFloyd, getSmashingPumpkins, getTestleerling1, getTheDoors, getTool } from '../users/students.testdata'; import { getDireStraits, getNoordkaap, getPinkFloyd, getSmashingPumpkins, getTestleerling1, getTheDoors, getTool } from '../users/students.testdata';
export function makeTestGroups(em: EntityManager, students: Student[], assignments: Assignment[]): Group[] { export function makeTestGroups(em: EntityManager): Group[] {
/* /*
* Group #1 for Assignment #1 in class 'id01' * Group #1 for Assignment #1 in class 'id01'
* => Assigned to do learning path 'id02' * => Assigned to do learning path 'id02'

View file

@ -1,13 +1,10 @@
import { EntityManager } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/core';
import { Submission } from '../../../src/entities/assignments/submission.entity'; import { Submission } from '../../../src/entities/assignments/submission.entity';
import { Language } from '@dwengo-1/common/util/language';
import { Student } from '../../../src/entities/users/student.entity';
import { Group } from '../../../src/entities/assignments/group.entity';
import { testLearningObject01, testLearningObject02, testLearningObject03 } from '../content/learning-objects.testdata'; import { testLearningObject01, testLearningObject02, testLearningObject03 } from '../content/learning-objects.testdata';
import { getDireStraits, getNoordkaap, getSmashingPumpkins } from '../users/students.testdata'; import { getDireStraits, getNoordkaap, getSmashingPumpkins } from '../users/students.testdata';
import { getTestGroup01, getTestGroup02, getTestGroup04, getTestGroup05 } from './groups.testdata'; import { getTestGroup01, getTestGroup02, getTestGroup04, getTestGroup05 } from './groups.testdata';
export function makeTestSubmissions(em: EntityManager, students: Student[], groups: Group[]): Submission[] { export function makeTestSubmissions(em: EntityManager): Submission[] {
submission01 = em.create(Submission, { submission01 = em.create(Submission, {
learningObjectHruid: testLearningObject03.hruid, learningObjectHruid: testLearningObject03.hruid,
learningObjectLanguage: testLearningObject03.language, learningObjectLanguage: testLearningObject03.language,

View file

@ -1,12 +1,10 @@
import { EntityManager } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/core';
import { ClassJoinRequest } from '../../../src/entities/classes/class-join-request.entity'; 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 { ClassStatus } from '@dwengo-1/common/util/class-join-request'; import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
import { getPinkFloyd, getSmashingPumpkins, getTool } from '../users/students.testdata'; import { getPinkFloyd, getSmashingPumpkins, getTool } from '../users/students.testdata';
import { getClass02, getClass03 } from './classes.testdata'; import { getClass02, getClass03 } from './classes.testdata';
export function makeTestClassJoinRequests(em: EntityManager, students: Student[], classes: Class[]): ClassJoinRequest[] { export function makeTestClassJoinRequests(em: EntityManager): ClassJoinRequest[] {
classJoinRequest01 = em.create(ClassJoinRequest, { classJoinRequest01 = em.create(ClassJoinRequest, {
requester: getPinkFloyd(), requester: getPinkFloyd(),
class: getClass02(), class: getClass02(),

View file

@ -5,7 +5,7 @@ import { Teacher } from '../../../src/entities/users/teacher.entity';
import { getLimpBizkit, getStaind, getTestleerkracht1 } from '../users/teachers.testdata'; import { getLimpBizkit, getStaind, getTestleerkracht1 } from '../users/teachers.testdata';
import { getDireStraits, getNoordkaap, getSmashingPumpkins, getTestleerling1, getTool } from '../users/students.testdata'; import { getDireStraits, getNoordkaap, getSmashingPumpkins, getTestleerling1, getTool } from '../users/students.testdata';
export function makeTestClasses(em: EntityManager, students: Student[], teachers: Teacher[]): Class[] { export function makeTestClasses(em: EntityManager): Class[] {
const studentsClass01 = [getTestleerling1()]; const studentsClass01 = [getTestleerling1()];
const teacherClass01: Teacher[] = [getTestleerkracht1()]; const teacherClass01: Teacher[] = [getTestleerkracht1()];

View file

@ -1,12 +1,10 @@
import { EntityManager } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/core';
import { TeacherInvitation } from '../../../src/entities/classes/teacher-invitation.entity'; 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 { ClassStatus } from '@dwengo-1/common/util/class-join-request';
import { getFooFighters, getLimpBizkit, getStaind } from '../users/teachers.testdata'; import { getFooFighters, getLimpBizkit, getStaind } from '../users/teachers.testdata';
import { getClass01, getClass02, getClass03 } from './classes.testdata'; import { getClass01, getClass02, getClass03 } from './classes.testdata';
export function makeTestTeacherInvitations(em: EntityManager, teachers: Teacher[], classes: Class[]): TeacherInvitation[] { export function makeTestTeacherInvitations(em: EntityManager): TeacherInvitation[] {
teacherInvitation01 = em.create(TeacherInvitation, { teacherInvitation01 = em.create(TeacherInvitation, {
sender: getLimpBizkit(), sender: getLimpBizkit(),
receiver: getFooFighters(), receiver: getFooFighters(),

View file

@ -1,9 +1,8 @@
import { EntityManager } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/core';
import { Attachment } from '../../../src/entities/content/attachment.entity'; import { Attachment } from '../../../src/entities/content/attachment.entity';
import { LearningObject } from '../../../src/entities/content/learning-object.entity';
import { testLearningObject01 } from './learning-objects.testdata'; import { testLearningObject01 } from './learning-objects.testdata';
export function makeTestAttachments(em: EntityManager, learningObjects: LearningObject[]): Attachment[] { export function makeTestAttachments(em: EntityManager): Attachment[] {
attachment01 = em.create(Attachment, { attachment01 = em.create(Attachment, {
learningObject: testLearningObject01, learningObject: testLearningObject01,
name: 'attachment01', name: 'attachment01',

View file

@ -1,11 +1,9 @@
import { EntityManager } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/core';
import { Answer } from '../../../src/entities/questions/answer.entity'; import { Answer } from '../../../src/entities/questions/answer.entity';
import { Teacher } from '../../../src/entities/users/teacher.entity';
import { Question } from '../../../src/entities/questions/question.entity';
import { getFooFighters, getLimpBizkit, getTestleerkracht1 } from '../users/teachers.testdata'; import { getFooFighters, getLimpBizkit, getTestleerkracht1 } from '../users/teachers.testdata';
import { getQuestion02, getQuestion04, getQuestion07 } from './questions.testdata'; import { getQuestion02, getQuestion04, getQuestion07 } from './questions.testdata';
export function makeTestAnswers(em: EntityManager, teachers: Teacher[], questions: Question[]): Answer[] { export function makeTestAnswers(em: EntityManager): Answer[] {
answer01 = em.create(Answer, { answer01 = em.create(Answer, {
author: getFooFighters(), author: getFooFighters(),
toQuestion: getQuestion02(), toQuestion: getQuestion02(),

View file

@ -1,12 +1,10 @@
import { EntityManager } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/core';
import { Question } from '../../../src/entities/questions/question.entity'; import { Question } from '../../../src/entities/questions/question.entity';
import { Student } from '../../../src/entities/users/student.entity';
import { Group } from '../../../src/entities/assignments/group.entity';
import { getDireStraits, getNoordkaap, getTestleerling1, getTool } from '../users/students.testdata'; import { getDireStraits, getNoordkaap, getTestleerling1, getTool } from '../users/students.testdata';
import { testLearningObject01, testLearningObject04, testLearningObject05, testLearningObjectMultipleChoice } from '../content/learning-objects.testdata'; import { testLearningObject01, testLearningObject04, testLearningObject05, testLearningObjectMultipleChoice } from '../content/learning-objects.testdata';
import { getGroup1ConditionalLearningPath, getTestGroup01, getTestGroup02 } from '../assignments/groups.testdata'; import { getGroup1ConditionalLearningPath, getTestGroup01, getTestGroup02 } from '../assignments/groups.testdata';
export function makeTestQuestions(em: EntityManager, students: Student[], groups: Group[]): Question[] { export function makeTestQuestions(em: EntityManager): Question[] {
question01 = em.create(Question, { question01 = em.create(Question, {
learningObjectLanguage: testLearningObject05.language, learningObjectLanguage: testLearningObject05.language,
learningObjectVersion: testLearningObject05.version, learningObjectVersion: testLearningObject05.version,

View file

@ -28,29 +28,29 @@ export function getTestleerling1(): Student {
} }
export function getNoordkaap(): Student { export function getNoordkaap(): Student {
return testStudents.find((it) => it.username == 'Noordkaap')!; return testStudents.find((it) => it.username === 'Noordkaap')!;
} }
export function getDireStraits(): Student { export function getDireStraits(): Student {
return testStudents.find((it) => it.username == 'DireStraits')!; return testStudents.find((it) => it.username === 'DireStraits')!;
} }
export function getTool(): Student { export function getTool(): Student {
return testStudents.find((it) => it.username == 'Tool')!; return testStudents.find((it) => it.username === 'Tool')!;
} }
export function getSmashingPumpkins(): Student { export function getSmashingPumpkins(): Student {
return testStudents.find((it) => it.username == 'SmashingPumpkins')!; return testStudents.find((it) => it.username === 'SmashingPumpkins')!;
} }
export function getPinkFloyd(): Student { export function getPinkFloyd(): Student {
return testStudents.find((it) => it.username == 'PinkFloyd')!; return testStudents.find((it) => it.username === 'PinkFloyd')!;
} }
export function getTheDoors(): Student { export function getTheDoors(): Student {
return testStudents.find((it) => it.username == 'TheDoors')!; return testStudents.find((it) => it.username === 'TheDoors')!;
} }
export function getNirvana(): Student { export function getNirvana(): Student {
return testStudents.find((it) => it.username == 'Nirvana')!; return testStudents.find((it) => it.username === 'Nirvana')!;
} }