refactor: Arrays
This commit is contained in:
		
							parent
							
								
									ac10518cb8
								
							
						
					
					
						commit
						e1aba11222
					
				
					 14 changed files with 29 additions and 23 deletions
				
			
		|  | @ -3,7 +3,7 @@ import { Assignment } from '../../../src/entities/assignments/assignment.entity' | ||||||
| import { Class } from '../../../src/entities/classes/class.entity'; | import { Class } from '../../../src/entities/classes/class.entity'; | ||||||
| import { Language } from '../../../src/entities/content/language'; | import { Language } from '../../../src/entities/content/language'; | ||||||
| 
 | 
 | ||||||
| export function makeTestAssignemnts(em: EntityManager, classes: Array<Class>): Array<Assignment> { | export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assignment[] { | ||||||
|     const assignment01 = em.create(Assignment, { |     const assignment01 = em.create(Assignment, { | ||||||
|         within: classes[0], |         within: classes[0], | ||||||
|         id: 1, |         id: 1, | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ import { Group } from '../../../src/entities/assignments/group.entity'; | ||||||
| import { Assignment } from '../../../src/entities/assignments/assignment.entity'; | import { Assignment } from '../../../src/entities/assignments/assignment.entity'; | ||||||
| import { Student } from '../../../src/entities/users/student.entity'; | import { Student } from '../../../src/entities/users/student.entity'; | ||||||
| 
 | 
 | ||||||
| export function makeTestGroups(em: EntityManager, students: Array<Student>, assignments: Array<Assignment>): Array<Group> { | export function makeTestGroups(em: EntityManager, students: Student[], assignments: Assignment[]): Group[] { | ||||||
|     const group01 = em.create(Group, { |     const group01 = em.create(Group, { | ||||||
|         assignment: assignments[0], |         assignment: assignments[0], | ||||||
|         groupNumber: 1, |         groupNumber: 1, | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ import { Language } from '../../../src/entities/content/language'; | ||||||
| import { Student } from '../../../src/entities/users/student.entity'; | import { Student } from '../../../src/entities/users/student.entity'; | ||||||
| import { Group } from '../../../src/entities/assignments/group.entity'; | import { Group } from '../../../src/entities/assignments/group.entity'; | ||||||
| 
 | 
 | ||||||
| export function makeTestSubmissions(em: EntityManager, students: Array<Student>, groups: Array<Group>): Array<Submission> { | export function makeTestSubmissions(em: EntityManager, students: Student[], groups: Group[]): Submission[] { | ||||||
|     const submission01 = em.create(Submission, { |     const submission01 = em.create(Submission, { | ||||||
|         learningObjectHruid: 'id03', |         learningObjectHruid: 'id03', | ||||||
|         learningObjectLanguage: Language.English, |         learningObjectLanguage: Language.English, | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ import { ClassJoinRequest, ClassJoinRequestStatus } from '../../../src/entities/ | ||||||
| import { Student } from '../../../src/entities/users/student.entity'; | import { Student } from '../../../src/entities/users/student.entity'; | ||||||
| import { Class } from '../../../src/entities/classes/class.entity'; | import { Class } from '../../../src/entities/classes/class.entity'; | ||||||
| 
 | 
 | ||||||
| export function makeTestClassJoinRequests(em: EntityManager, students: Array<Student>, classes: Array<Class>): Array<ClassJoinRequest> { | export function makeTestClassJoinRequests(em: EntityManager, students: Student[], classes: Class[]): ClassJoinRequest[] { | ||||||
|     const classJoinRequest01 = em.create(ClassJoinRequest, { |     const classJoinRequest01 = em.create(ClassJoinRequest, { | ||||||
|         requester: students[4], |         requester: students[4], | ||||||
|         class: classes[1], |         class: classes[1], | ||||||
|  |  | ||||||
|  | @ -3,9 +3,9 @@ import { Class } from '../../../src/entities/classes/class.entity'; | ||||||
| import { Student } from '../../../src/entities/users/student.entity'; | import { Student } from '../../../src/entities/users/student.entity'; | ||||||
| import { Teacher } from '../../../src/entities/users/teacher.entity'; | import { Teacher } from '../../../src/entities/users/teacher.entity'; | ||||||
| 
 | 
 | ||||||
| export function makeTestClasses(em: EntityManager, students: Array<Student>, teachers: Array<Teacher>): Array<Class> { | export function makeTestClasses(em: EntityManager, students: Student[], teachers: Teacher[]): Class[] { | ||||||
|     const studentsClass01 = students.slice(0, 7); |     const studentsClass01 = students.slice(0, 7); | ||||||
|     const teacherClass01: Array<Teacher> = teachers.slice(0, 1); |     const teacherClass01: Teacher[] = teachers.slice(0, 1); | ||||||
| 
 | 
 | ||||||
|     const class01 = em.create(Class, { |     const class01 = em.create(Class, { | ||||||
|         classId: 'id01', |         classId: 'id01', | ||||||
|  | @ -14,8 +14,8 @@ export function makeTestClasses(em: EntityManager, students: Array<Student>, tea | ||||||
|         students: studentsClass01, |         students: studentsClass01, | ||||||
|     }); |     }); | ||||||
| 
 | 
 | ||||||
|     const studentsClass02: Array<Student> = students.slice(0, 2).concat(students.slice(3, 4)); |     const studentsClass02: Student[] = students.slice(0, 2).concat(students.slice(3, 4)); | ||||||
|     const teacherClass02: Array<Teacher> = teachers.slice(1, 2); |     const teacherClass02: Teacher[] = teachers.slice(1, 2); | ||||||
| 
 | 
 | ||||||
|     const class02 = em.create(Class, { |     const class02 = em.create(Class, { | ||||||
|         classId: 'id02', |         classId: 'id02', | ||||||
|  | @ -24,8 +24,8 @@ export function makeTestClasses(em: EntityManager, students: Array<Student>, tea | ||||||
|         students: studentsClass02, |         students: studentsClass02, | ||||||
|     }); |     }); | ||||||
| 
 | 
 | ||||||
|     const studentsClass03: Array<Student> = students.slice(1, 4); |     const studentsClass03: Student[] = students.slice(1, 4); | ||||||
|     const teacherClass03: Array<Teacher> = teachers.slice(2, 3); |     const teacherClass03: Teacher[] = teachers.slice(2, 3); | ||||||
| 
 | 
 | ||||||
|     const class03 = em.create(Class, { |     const class03 = em.create(Class, { | ||||||
|         classId: 'id03', |         classId: 'id03', | ||||||
|  | @ -34,8 +34,8 @@ export function makeTestClasses(em: EntityManager, students: Array<Student>, tea | ||||||
|         students: studentsClass03, |         students: studentsClass03, | ||||||
|     }); |     }); | ||||||
| 
 | 
 | ||||||
|     const studentsClass04: Array<Student> = students.slice(0, 2); |     const studentsClass04: Student[] = students.slice(0, 2); | ||||||
|     const teacherClass04: Array<Teacher> = teachers.slice(2, 3); |     const teacherClass04: Teacher[] = teachers.slice(2, 3); | ||||||
| 
 | 
 | ||||||
|     const class04 = em.create(Class, { |     const class04 = em.create(Class, { | ||||||
|         classId: 'id04', |         classId: 'id04', | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ import { TeacherInvitation } from '../../../src/entities/classes/teacher-invitat | ||||||
| import { Teacher } from '../../../src/entities/users/teacher.entity'; | import { Teacher } from '../../../src/entities/users/teacher.entity'; | ||||||
| import { Class } from '../../../src/entities/classes/class.entity'; | import { Class } from '../../../src/entities/classes/class.entity'; | ||||||
| 
 | 
 | ||||||
| export function makeTestTeacherInvitations(em: EntityManager, teachers: Array<Teacher>, classes: Array<Class>): Array<TeacherInvitation> { | export function makeTestTeacherInvitations(em: EntityManager, teachers: Teacher[], classes: Class[]): TeacherInvitation[] { | ||||||
|     const teacherInvitation01 = em.create(TeacherInvitation, { |     const teacherInvitation01 = em.create(TeacherInvitation, { | ||||||
|         sender: teachers[1], |         sender: teachers[1], | ||||||
|         receiver: teachers[0], |         receiver: teachers[0], | ||||||
|  |  | ||||||
|  | @ -2,7 +2,7 @@ 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 { LearningObject } from '../../../src/entities/content/learning-object.entity'; | ||||||
| 
 | 
 | ||||||
| export function makeTestAttachments(em: EntityManager, learningObjects: Array<LearningObject>): Array<Attachment> { | export function makeTestAttachments(em: EntityManager, learningObjects: LearningObject[]): Attachment[] { | ||||||
|     const attachment01 = em.create(Attachment, { |     const attachment01 = em.create(Attachment, { | ||||||
|         learningObject: learningObjects[1], |         learningObject: learningObjects[1], | ||||||
|         name: 'attachment01', |         name: 'attachment01', | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ import { Language } from '../../../src/entities/content/language'; | ||||||
| import { DwengoContentType } from '../../../src/services/learning-objects/processing/content-type'; | import { DwengoContentType } from '../../../src/services/learning-objects/processing/content-type'; | ||||||
| import { ReturnValue } from '../../../src/entities/content/return-value.entity'; | import { ReturnValue } from '../../../src/entities/content/return-value.entity'; | ||||||
| 
 | 
 | ||||||
| export function makeTestLearningObjects(em: EntityManager): Array<LearningObject> { | export function makeTestLearningObjects(em: EntityManager): LearningObject[] { | ||||||
|     const returnValue: ReturnValue = new ReturnValue(); |     const returnValue: ReturnValue = new ReturnValue(); | ||||||
|     returnValue.callbackSchema = ''; |     returnValue.callbackSchema = ''; | ||||||
|     returnValue.callbackUrl = ''; |     returnValue.callbackUrl = ''; | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ import { Language } from '../../../src/entities/content/language'; | ||||||
| import { LearningPathTransition } from '../../../src/entities/content/learning-path-transition.entity'; | import { LearningPathTransition } from '../../../src/entities/content/learning-path-transition.entity'; | ||||||
| import { LearningPathNode } from '../../../src/entities/content/learning-path-node.entity'; | import { LearningPathNode } from '../../../src/entities/content/learning-path-node.entity'; | ||||||
| 
 | 
 | ||||||
| export function makeTestLearningPaths(em: EntityManager): Array<LearningPath> { | export function makeTestLearningPaths(em: EntityManager): LearningPath[] { | ||||||
|     const learningPathNode01: LearningPathNode = new LearningPathNode(); |     const learningPathNode01: LearningPathNode = new LearningPathNode(); | ||||||
|     const learningPathNode02: LearningPathNode = new LearningPathNode(); |     const learningPathNode02: LearningPathNode = new LearningPathNode(); | ||||||
|     const learningPathNode03: LearningPathNode = new LearningPathNode(); |     const learningPathNode03: LearningPathNode = new LearningPathNode(); | ||||||
|  | @ -67,7 +67,7 @@ export function makeTestLearningPaths(em: EntityManager): Array<LearningPath> { | ||||||
|     learningPathNode05.transitions = [transitions05]; |     learningPathNode05.transitions = [transitions05]; | ||||||
|     learningPathNode05.version = 1; |     learningPathNode05.version = 1; | ||||||
| 
 | 
 | ||||||
|     const nodes01: Array<LearningPathNode> = [ |     const nodes01: LearningPathNode[] = [ | ||||||
|         // LearningPathNode01,
 |         // LearningPathNode01,
 | ||||||
|         // LearningPathNode02,
 |         // LearningPathNode02,
 | ||||||
|     ]; |     ]; | ||||||
|  | @ -81,7 +81,7 @@ export function makeTestLearningPaths(em: EntityManager): Array<LearningPath> { | ||||||
|         nodes: nodes01, |         nodes: nodes01, | ||||||
|     }); |     }); | ||||||
| 
 | 
 | ||||||
|     const nodes02: Array<LearningPathNode> = [ |     const nodes02: LearningPathNode[] = [ | ||||||
|         // LearningPathNode03,
 |         // LearningPathNode03,
 | ||||||
|         // LearningPathNode04,
 |         // LearningPathNode04,
 | ||||||
|         // LearningPathNode05,
 |         // LearningPathNode05,
 | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ import { Answer } from '../../../src/entities/questions/answer.entity'; | ||||||
| import { Teacher } from '../../../src/entities/users/teacher.entity'; | import { Teacher } from '../../../src/entities/users/teacher.entity'; | ||||||
| import { Question } from '../../../src/entities/questions/question.entity'; | import { Question } from '../../../src/entities/questions/question.entity'; | ||||||
| 
 | 
 | ||||||
| export function makeTestAnswers(em: EntityManager, teachers: Array<Teacher>, questions: Array<Question>): Array<Answer> { | export function makeTestAnswers(em: EntityManager, teachers: Teacher[], questions: Question[]): Answer[] { | ||||||
|     const answer01 = em.create(Answer, { |     const answer01 = em.create(Answer, { | ||||||
|         author: teachers[0], |         author: teachers[0], | ||||||
|         toQuestion: questions[1], |         toQuestion: questions[1], | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ import { Question } from '../../../src/entities/questions/question.entity'; | ||||||
| import { Language } from '../../../src/entities/content/language'; | import { Language } from '../../../src/entities/content/language'; | ||||||
| import { Student } from '../../../src/entities/users/student.entity'; | import { Student } from '../../../src/entities/users/student.entity'; | ||||||
| 
 | 
 | ||||||
| export function makeTestQuestions(em: EntityManager, students: Array<Student>): Array<Question> { | export function makeTestQuestions(em: EntityManager, students: Student[]): Question[] { | ||||||
|     const question01 = em.create(Question, { |     const question01 = em.create(Question, { | ||||||
|         learningObjectLanguage: Language.English, |         learningObjectLanguage: Language.English, | ||||||
|         learningObjectVersion: 1, |         learningObjectVersion: 1, | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| import { EntityManager } from '@mikro-orm/core'; | import { EntityManager } from '@mikro-orm/core'; | ||||||
| import { Student } from '../../../src/entities/users/student.entity'; | import { Student } from '../../../src/entities/users/student.entity'; | ||||||
| 
 | 
 | ||||||
| export function makeTestStudents(em: EntityManager): Array<Student> { | export function makeTestStudents(em: EntityManager): Student[] { | ||||||
|     const student01 = em.create(Student, { |     const student01 = em.create(Student, { | ||||||
|         username: 'Noordkaap', |         username: 'Noordkaap', | ||||||
|         firstName: 'Stijn', |         firstName: 'Stijn', | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| import { Teacher } from '../../../src/entities/users/teacher.entity'; | import { Teacher } from '../../../src/entities/users/teacher.entity'; | ||||||
| import { EntityManager } from '@mikro-orm/core'; | import { EntityManager } from '@mikro-orm/core'; | ||||||
| 
 | 
 | ||||||
| export function makeTestTeachers(em: EntityManager): Array<Teacher> { | export function makeTestTeachers(em: EntityManager): Teacher[] { | ||||||
|     const teacher01 = em.create(Teacher, { |     const teacher01 = em.create(Teacher, { | ||||||
|         username: 'FooFighters', |         username: 'FooFighters', | ||||||
|         firstName: 'Dave', |         firstName: 'Dave', | ||||||
|  |  | ||||||
|  | @ -32,6 +32,8 @@ export default [ | ||||||
|             reportUnusedInlineConfigs: 'error', |             reportUnusedInlineConfigs: 'error', | ||||||
|         }, |         }, | ||||||
|         rules: { |         rules: { | ||||||
|  |             '@typescript-eslint/array-type': 'warn', | ||||||
|  | 
 | ||||||
|             'consistent-return': 'off', |             'consistent-return': 'off', | ||||||
|             '@typescript-eslint/consistent-return': 'off', |             '@typescript-eslint/consistent-return': 'off', | ||||||
|             '@typescript-eslint/consistent-type-assertions': 'error', |             '@typescript-eslint/consistent-type-assertions': 'error', | ||||||
|  | @ -67,6 +69,9 @@ export default [ | ||||||
|                     leadingUnderscore: 'allow', |                     leadingUnderscore: 'allow', | ||||||
|                 } |                 } | ||||||
|             ], |             ], | ||||||
|  |             'no-array-constructor': 'off', | ||||||
|  |             '@typescript-eslint/no-array-constructor': 'error', | ||||||
|  |             '@typescript-eslint/no-array-delete': 'error', | ||||||
| 
 | 
 | ||||||
|             'no-dupe-class-members': 'off', |             'no-dupe-class-members': 'off', | ||||||
|             '@typescript-eslint/no-dupe-class-members': 'off', |             '@typescript-eslint/no-dupe-class-members': 'off', | ||||||
|  | @ -118,6 +123,8 @@ export default [ | ||||||
| 
 | 
 | ||||||
|             '@typescript-eslint/promise-function-async': 'warn', |             '@typescript-eslint/promise-function-async': 'warn', | ||||||
| 
 | 
 | ||||||
|  |             '@typescript-eslint/require-array-sort-compare': 'warn', | ||||||
|  | 
 | ||||||
|             'no-await-in-loop': 'warn', |             'no-await-in-loop': 'warn', | ||||||
|             'no-constructor-return': 'error', |             'no-constructor-return': 'error', | ||||||
|             'no-inner-declarations': 'error', |             'no-inner-declarations': 'error', | ||||||
|  | @ -143,7 +150,6 @@ export default [ | ||||||
|             'logical-assignment-operators': 'warn', |             'logical-assignment-operators': 'warn', | ||||||
|             'max-classes-per-file': 'warn', |             'max-classes-per-file': 'warn', | ||||||
|             'no-alert': 'error', |             'no-alert': 'error', | ||||||
|             'no-array-constructor': 'warn', |  | ||||||
|             'no-bitwise': 'warn', |             'no-bitwise': 'warn', | ||||||
|             'no-console': 'warn', |             'no-console': 'warn', | ||||||
|             'no-continue': 'warn', |             'no-continue': 'warn', | ||||||
|  |  | ||||||
		Reference in a new issue