MERGE: dev ino feat/service-layer

backend/src/entities/classes/class-join-request.entity.ts

@@ -10,24 +10,18 @@ import { ClassJoinRequestRepository } from '../../data/classes/class-join-reques
 })
 export class ClassJoinRequest {
     @ManyToOne({
-        entity: () => {
-            return Student;
-        },
+        entity: () => Student,
         primary: true,
     })
     requester!: Student;
 
     @ManyToOne({
-        entity: () => {
-            return Class;
-        },
+        entity: () => Class,
         primary: true,
     })
     class!: Class;
 
-    @Enum(() => {
-        return ClassJoinRequestStatus;
-    })
+    @Enum(() => ClassJoinRequestStatus)
     status!: ClassJoinRequestStatus;
 }
 

backend/src/entities/classes/class.entity.ts

@@ -8,7 +8,6 @@ import {
 import { v4 } from 'uuid';
 import { Teacher } from '../users/teacher.entity.js';
 import { Student } from '../users/student.entity.js';
-import { ClassRepository } from '../../data/classes/class-repository.js';
 
 @Entity({
     repository: () => {
@@ -22,13 +21,9 @@ export class Class {
     @Property({ type: 'string' })
     displayName!: string;
 
-    @ManyToMany(() => {
-        return Teacher;
-    })
+    @ManyToMany(() => Teacher)
     teachers!: Collection<Teacher>;
 
-    @ManyToMany(() => {
-        return Student;
-    })
+    @ManyToMany(() => Student)
     students!: Collection<Student>;
 }

backend/src/entities/classes/teacher-invitation.entity.ts

@@ -6,32 +6,22 @@ import { TeacherInvitationRepository } from '../../data/classes/teacher-invitati
 /**
  * Invitation of a teacher into a class (in order to teach it).
  */
-@Entity({
-    repository: () => {
-        return TeacherInvitationRepository;
-    },
-})
+@Entity({ repository: () => TeacherInvitationRepository })
 export class TeacherInvitation {
     @ManyToOne({
-        entity: () => {
-            return Teacher;
-        },
+        entity: () => Teacher,
         primary: true,
     })
     sender!: Teacher;
 
     @ManyToOne({
-        entity: () => {
-            return Teacher;
-        },
+        entity: () => Teacher,
         primary: true,
     })
     receiver!: Teacher;
 
     @ManyToOne({
-        entity: () => {
-            return Class;
-        },
+        entity: () => Class,
         primary: true,
     })
     class!: Class;