Merge remote-tracking branch 'origin/feat/teacher-invitation' into feat/teacher-invitation

# Conflicts:
#	backend/tests/controllers/teacher-invitations.test.ts
This commit is contained in:
Gabriellvl 2025-04-15 17:41:27 +02:00
commit 9017b75ce1
8 changed files with 45 additions and 48 deletions

View file

@ -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];