fix: @entity(...) decorator gefixt in backend/src/entities
This commit is contained in:
		
							parent
							
								
									7a8673f66e
								
							
						
					
					
						commit
						55387066f0
					
				
					 12 changed files with 24 additions and 12 deletions
				
			
		|  | @ -9,8 +9,9 @@ import { | ||||||
| import { Class } from '../classes/class.entity.js'; | import { Class } from '../classes/class.entity.js'; | ||||||
| import { Group } from './group.entity.js'; | import { Group } from './group.entity.js'; | ||||||
| import { Language } from '../content/language.js'; | import { Language } from '../content/language.js'; | ||||||
|  | import { AssignmentRepository } from '../../data/assignments/assignment-repository.js'; | ||||||
| 
 | 
 | ||||||
| @Entity() | @Entity({ repository: () => AssignmentRepository }) | ||||||
| export class Assignment { | export class Assignment { | ||||||
|     @ManyToOne({ entity: () => Class, primary: true }) |     @ManyToOne({ entity: () => Class, primary: true }) | ||||||
|     within!: Class; |     within!: Class; | ||||||
|  |  | ||||||
|  | @ -1,8 +1,9 @@ | ||||||
| import { Entity, ManyToMany, ManyToOne, PrimaryKey } from '@mikro-orm/core'; | import { Entity, ManyToMany, ManyToOne, PrimaryKey } from '@mikro-orm/core'; | ||||||
| import { Assignment } from './assignment.entity.js'; | import { Assignment } from './assignment.entity.js'; | ||||||
| import { Student } from '../users/student.entity.js'; | import { Student } from '../users/student.entity.js'; | ||||||
|  | import { GroupRepository } from '../../data/assignments/group-repository.js'; | ||||||
| 
 | 
 | ||||||
| @Entity() | @Entity({ repository: () => GroupRepository }) | ||||||
| export class Group { | export class Group { | ||||||
|     @ManyToOne({ entity: () => Assignment, primary: true }) |     @ManyToOne({ entity: () => Assignment, primary: true }) | ||||||
|     assignment!: Assignment; |     assignment!: Assignment; | ||||||
|  |  | ||||||
|  | @ -2,8 +2,9 @@ import { Student } from '../users/student.entity.js'; | ||||||
| import { Group } from './group.entity.js'; | import { Group } from './group.entity.js'; | ||||||
| import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; | import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; | ||||||
| import { Language } from '../content/language.js'; | import { Language } from '../content/language.js'; | ||||||
|  | import { SubmissionRepository } from '../../data/assignments/submission-repository.js'; | ||||||
| 
 | 
 | ||||||
| @Entity() | @Entity({ repository: () => SubmissionRepository }) | ||||||
| export class Submission { | export class Submission { | ||||||
|     @PrimaryKey({ type: 'string' }) |     @PrimaryKey({ type: 'string' }) | ||||||
|     learningObjectHruid!: string; |     learningObjectHruid!: string; | ||||||
|  |  | ||||||
|  | @ -1,8 +1,9 @@ | ||||||
| import { Entity, Enum, ManyToOne } from '@mikro-orm/core'; | import { Entity, Enum, ManyToOne } from '@mikro-orm/core'; | ||||||
| import { Student } from '../users/student.entity.js'; | import { Student } from '../users/student.entity.js'; | ||||||
| import { Class } from './class.entity.js'; | import { Class } from './class.entity.js'; | ||||||
|  | import { ClassJoinRequestRepository } from '../../data/classes/class-join-request-repository.js'; | ||||||
| 
 | 
 | ||||||
| @Entity() | @Entity({ repository: () => ClassJoinRequestRepository }) | ||||||
| export class ClassJoinRequest { | export class ClassJoinRequest { | ||||||
|     @ManyToOne({ entity: () => Student, primary: true }) |     @ManyToOne({ entity: () => Student, primary: true }) | ||||||
|     requester!: Student; |     requester!: Student; | ||||||
|  |  | ||||||
|  | @ -8,8 +8,9 @@ import { | ||||||
| import { v4 } from 'uuid'; | import { v4 } from 'uuid'; | ||||||
| import { Teacher } from '../users/teacher.entity.js'; | import { Teacher } from '../users/teacher.entity.js'; | ||||||
| import { Student } from '../users/student.entity.js'; | import { Student } from '../users/student.entity.js'; | ||||||
|  | import { ClassRepository } from '../../data/classes/class-repository.js'; | ||||||
| 
 | 
 | ||||||
| @Entity() | @Entity({ repository: () => ClassRepository }) | ||||||
| export class Class { | export class Class { | ||||||
|     @PrimaryKey() |     @PrimaryKey() | ||||||
|     classId = v4(); |     classId = v4(); | ||||||
|  |  | ||||||
|  | @ -1,11 +1,12 @@ | ||||||
| import { Entity, ManyToOne } from '@mikro-orm/core'; | import { Entity, ManyToOne } from '@mikro-orm/core'; | ||||||
| import { Teacher } from '../users/teacher.entity.js'; | import { Teacher } from '../users/teacher.entity.js'; | ||||||
| import { Class } from './class.entity.js'; | import { Class } from './class.entity.js'; | ||||||
|  | import { TeacherInvitationRepository } from '../../data/classes/teacher-invitation-repository.js'; | ||||||
| 
 | 
 | ||||||
| /** | /** | ||||||
|  * Invitation of a teacher into a class (in order to teach it). |  * Invitation of a teacher into a class (in order to teach it). | ||||||
|  */ |  */ | ||||||
| @Entity() | @Entity({ repository: () => TeacherInvitationRepository }) | ||||||
| export class TeacherInvitation { | export class TeacherInvitation { | ||||||
|     @ManyToOne({ entity: () => Teacher, primary: true }) |     @ManyToOne({ entity: () => Teacher, primary: true }) | ||||||
|     sender!: Teacher; |     sender!: Teacher; | ||||||
|  |  | ||||||
|  | @ -1,7 +1,8 @@ | ||||||
| import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; | import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; | ||||||
| import { LearningObject } from './learning-object.entity.js'; | import { LearningObject } from './learning-object.entity.js'; | ||||||
|  | import { AttachmentRepository } from '../../data/content/attachment-repository.js'; | ||||||
| 
 | 
 | ||||||
| @Entity() | @Entity({ repository: () => AttachmentRepository }) | ||||||
| export class Attachment { | export class Attachment { | ||||||
|     @ManyToOne({ entity: () => LearningObject, primary: true }) |     @ManyToOne({ entity: () => LearningObject, primary: true }) | ||||||
|     learningObject!: LearningObject; |     learningObject!: LearningObject; | ||||||
|  |  | ||||||
|  | @ -11,8 +11,9 @@ import { | ||||||
| import { Language } from './language.js'; | import { Language } from './language.js'; | ||||||
| import { Attachment } from './attachment.entity.js'; | import { Attachment } from './attachment.entity.js'; | ||||||
| import { Teacher } from '../users/teacher.entity.js'; | import { Teacher } from '../users/teacher.entity.js'; | ||||||
|  | import { LearningObjectRepository } from '../../data/content/learning-object-repository.js'; | ||||||
| 
 | 
 | ||||||
| @Entity() | @Entity({ repository: () => LearningObjectRepository }) | ||||||
| export class LearningObject { | export class LearningObject { | ||||||
|     @PrimaryKey({ type: 'string' }) |     @PrimaryKey({ type: 'string' }) | ||||||
|     hruid!: string; |     hruid!: string; | ||||||
|  |  | ||||||
|  | @ -10,8 +10,9 @@ import { | ||||||
| } from '@mikro-orm/core'; | } from '@mikro-orm/core'; | ||||||
| import { Language } from './language.js'; | import { Language } from './language.js'; | ||||||
| import { Teacher } from '../users/teacher.entity.js'; | import { Teacher } from '../users/teacher.entity.js'; | ||||||
|  | import { LearningPathRepository } from '../../data/content/learning-path-repository.js'; | ||||||
| 
 | 
 | ||||||
| @Entity() | @Entity({ repository: () => LearningPathRepository }) | ||||||
| export class LearningPath { | export class LearningPath { | ||||||
|     @PrimaryKey({ type: 'string' }) |     @PrimaryKey({ type: 'string' }) | ||||||
|     hruid!: string; |     hruid!: string; | ||||||
|  |  | ||||||
|  | @ -1,8 +1,9 @@ | ||||||
| import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; | import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; | ||||||
| import { Question } from './question.entity.js'; | import { Question } from './question.entity.js'; | ||||||
| import { Teacher } from '../users/teacher.entity.js'; | import { Teacher } from '../users/teacher.entity.js'; | ||||||
|  | import { AnswerRepository } from '../../data/questions/answer-repository.js'; | ||||||
| 
 | 
 | ||||||
| @Entity() | @Entity({ repository: () => AnswerRepository }) | ||||||
| export class Answer { | export class Answer { | ||||||
|     @ManyToOne({ entity: () => Teacher, primary: true }) |     @ManyToOne({ entity: () => Teacher, primary: true }) | ||||||
|     author!: Teacher; |     author!: Teacher; | ||||||
|  |  | ||||||
|  | @ -1,8 +1,9 @@ | ||||||
| import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; | import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; | ||||||
| import { Language } from '../content/language.js'; | import { Language } from '../content/language.js'; | ||||||
| import { Student } from '../users/student.entity.js'; | import { Student } from '../users/student.entity.js'; | ||||||
|  | import { QuestionRepository } from '../../data/questions/question-repository.js'; | ||||||
| 
 | 
 | ||||||
| @Entity() | @Entity({ repository: () => QuestionRepository }) | ||||||
| export class Question { | export class Question { | ||||||
|     @PrimaryKey({ type: 'string' }) |     @PrimaryKey({ type: 'string' }) | ||||||
|     learningObjectHruid!: string; |     learningObjectHruid!: string; | ||||||
|  |  | ||||||
|  | @ -1,8 +1,9 @@ | ||||||
| import { Collection, Entity, ManyToMany } from '@mikro-orm/core'; | import { Collection, Entity, ManyToMany } from '@mikro-orm/core'; | ||||||
| import { User } from './user.entity.js'; | import { User } from './user.entity.js'; | ||||||
| import { Class } from '../classes/class.entity.js'; | import { Class } from '../classes/class.entity.js'; | ||||||
|  | import { TeacherRepository } from '../../data/users/teacher-repository.js'; | ||||||
| 
 | 
 | ||||||
| @Entity() | @Entity({ repository: () => TeacherRepository }) | ||||||
| export class Teacher extends User { | export class Teacher extends User { | ||||||
|     @ManyToMany(() => Class) |     @ManyToMany(() => Class) | ||||||
|     classes!: Collection<Class>; |     classes!: Collection<Class>; | ||||||
|  |  | ||||||
		Reference in a new issue
	
	 Adriaan Jacquet
						Adriaan Jacquet