diff --git a/backend/src/controllers/teacher-invitations.ts b/backend/src/controllers/teacher-invitations.ts index f7cfa05a..4956f3e2 100644 --- a/backend/src/controllers/teacher-invitations.ts +++ b/backend/src/controllers/teacher-invitations.ts @@ -1,13 +1,7 @@ -import {Request, Response} from 'express'; -import {requireFields} from './error-helper'; -import { - createInvitation, - deleteInvitation, - getAllInvitations, - getInvitation, - updateInvitation -} from '../services/teacher-invitations'; -import {TeacherInvitationData} from '@dwengo-1/common/interfaces/teacher-invitation'; +import { Request, Response } from 'express'; +import { requireFields } from './error-helper'; +import { createInvitation, deleteInvitation, getAllInvitations, getInvitation, updateInvitation } from '../services/teacher-invitations'; +import { TeacherInvitationData } from '@dwengo-1/common/interfaces/teacher-invitation'; export async function getAllInvitationsHandler(req: Request, res: Response): Promise { const username = req.params.username; @@ -62,7 +56,9 @@ export async function deleteInvitationHandler(req: Request, res: Response): Prom requireFields({ sender, receiver, classId }); const data: TeacherInvitationData = { - sender, receiver, class: classId + sender, + receiver, + class: classId, }; const invitation = await deleteInvitation(data); diff --git a/backend/src/data/classes/teacher-invitation-repository.ts b/backend/src/data/classes/teacher-invitation-repository.ts index 46abc685..c9442e29 100644 --- a/backend/src/data/classes/teacher-invitation-repository.ts +++ b/backend/src/data/classes/teacher-invitation-repository.ts @@ -1,8 +1,8 @@ -import {DwengoEntityRepository} from '../dwengo-entity-repository.js'; -import {Class} from '../../entities/classes/class.entity.js'; -import {TeacherInvitation} from '../../entities/classes/teacher-invitation.entity.js'; -import {Teacher} from '../../entities/users/teacher.entity.js'; -import {ClassStatus} from "@dwengo-1/common/util/class-join-request"; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { Class } from '../../entities/classes/class.entity.js'; +import { TeacherInvitation } from '../../entities/classes/teacher-invitation.entity.js'; +import { Teacher } from '../../entities/users/teacher.entity.js'; +import { ClassStatus } from '@dwengo-1/common/util/class-join-request'; export class TeacherInvitationRepository extends DwengoEntityRepository { public async findAllInvitationsForClass(clazz: Class): Promise { diff --git a/backend/src/entities/classes/teacher-invitation.entity.ts b/backend/src/entities/classes/teacher-invitation.entity.ts index b7451682..6059f155 100644 --- a/backend/src/entities/classes/teacher-invitation.entity.ts +++ b/backend/src/entities/classes/teacher-invitation.entity.ts @@ -1,8 +1,8 @@ -import {Entity, Enum, ManyToOne} from '@mikro-orm/core'; +import { Entity, Enum, ManyToOne } from '@mikro-orm/core'; import { Teacher } from '../users/teacher.entity.js'; import { Class } from './class.entity.js'; import { TeacherInvitationRepository } from '../../data/classes/teacher-invitation-repository.js'; -import {ClassStatus} from "@dwengo-1/common/util/class-join-request"; +import { ClassStatus } from '@dwengo-1/common/util/class-join-request'; /** * Invitation of a teacher into a class (in order to teach it). diff --git a/backend/src/interfaces/teacher-invitation.ts b/backend/src/interfaces/teacher-invitation.ts index f6cd1698..8fef17af 100644 --- a/backend/src/interfaces/teacher-invitation.ts +++ b/backend/src/interfaces/teacher-invitation.ts @@ -1,17 +1,17 @@ -import {TeacherInvitation} from '../entities/classes/teacher-invitation.entity.js'; -import {mapToUserDTO} from './user.js'; -import {TeacherInvitationDTO} from '@dwengo-1/common/interfaces/teacher-invitation'; -import {getTeacherInvitationRepository} from '../data/repositories'; -import {Teacher} from '../entities/users/teacher.entity'; -import {Class} from '../entities/classes/class.entity'; -import {ClassStatus} from "@dwengo-1/common/util/class-join-request"; +import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity.js'; +import { mapToUserDTO } from './user.js'; +import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation'; +import { getTeacherInvitationRepository } from '../data/repositories'; +import { Teacher } from '../entities/users/teacher.entity'; +import { Class } from '../entities/classes/class.entity'; +import { ClassStatus } from '@dwengo-1/common/util/class-join-request'; export function mapToTeacherInvitationDTO(invitation: TeacherInvitation): TeacherInvitationDTO { return { sender: mapToUserDTO(invitation.sender), receiver: mapToUserDTO(invitation.receiver), classId: invitation.class.classId!, - status: invitation.status + status: invitation.status, }; } @@ -20,7 +20,7 @@ export function mapToTeacherInvitationDTOIds(invitation: TeacherInvitation): Tea sender: invitation.sender.username, receiver: invitation.receiver.username, classId: invitation.class.classId!, - status: invitation.status + status: invitation.status, }; } diff --git a/backend/src/routes/teacher-invitations.ts b/backend/src/routes/teacher-invitations.ts index 6826ec21..772b1351 100644 --- a/backend/src/routes/teacher-invitations.ts +++ b/backend/src/routes/teacher-invitations.ts @@ -2,8 +2,9 @@ import express from 'express'; import { createInvitationHandler, deleteInvitationHandler, - getAllInvitationsHandler, getInvitationHandler, - updateInvitationHandler + getAllInvitationsHandler, + getInvitationHandler, + updateInvitationHandler, } from '../controllers/teacher-invitations'; const router = express.Router({ mergeParams: true }); diff --git a/backend/src/services/teacher-invitations.ts b/backend/src/services/teacher-invitations.ts index 19ead9a7..07f61bae 100644 --- a/backend/src/services/teacher-invitations.ts +++ b/backend/src/services/teacher-invitations.ts @@ -1,12 +1,12 @@ -import {fetchTeacher} from './teachers'; -import {getTeacherInvitationRepository} from '../data/repositories'; -import {mapToInvitation, mapToTeacherInvitationDTO} from '../interfaces/teacher-invitation'; -import {addClassTeacher, fetchClass} from './classes'; -import {TeacherInvitationData, TeacherInvitationDTO} from '@dwengo-1/common/interfaces/teacher-invitation'; -import {ConflictException} from '../exceptions/conflict-exception'; -import {NotFoundException} from '../exceptions/not-found-exception'; -import {TeacherInvitation} from '../entities/classes/teacher-invitation.entity'; -import {ClassStatus} from "@dwengo-1/common/util/class-join-request"; +import { fetchTeacher } from './teachers'; +import { getTeacherInvitationRepository } from '../data/repositories'; +import { mapToInvitation, mapToTeacherInvitationDTO } from '../interfaces/teacher-invitation'; +import { addClassTeacher, fetchClass } from './classes'; +import { TeacherInvitationData, TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation'; +import { ConflictException } from '../exceptions/conflict-exception'; +import { NotFoundException } from '../exceptions/not-found-exception'; +import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity'; +import { ClassStatus } from '@dwengo-1/common/util/class-join-request'; export async function getAllInvitations(username: string, sent: boolean): Promise { const teacher = await fetchTeacher(username); diff --git a/backend/tests/test_assets/classes/teacher-invitations.testdata.ts b/backend/tests/test_assets/classes/teacher-invitations.testdata.ts index 35a3d1b8..6337a513 100644 --- a/backend/tests/test_assets/classes/teacher-invitations.testdata.ts +++ b/backend/tests/test_assets/classes/teacher-invitations.testdata.ts @@ -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]; diff --git a/common/src/interfaces/teacher-invitation.ts b/common/src/interfaces/teacher-invitation.ts index 3158b806..f878b741 100644 --- a/common/src/interfaces/teacher-invitation.ts +++ b/common/src/interfaces/teacher-invitation.ts @@ -1,5 +1,5 @@ import { UserDTO } from './user'; -import {ClassStatus} from "../util/class-join-request"; +import { ClassStatus } from '../util/class-join-request'; export interface TeacherInvitationDTO { sender: string | UserDTO;