merge: fixed merge conflicts

backend/tests/test_assets/assignments/assignments.testdata.ts

@@ -2,9 +2,11 @@ import { EntityManager } from '@mikro-orm/core';
 import { Assignment } from '../../../src/entities/assignments/assignment.entity';
 import { Class } from '../../../src/entities/classes/class.entity';
 import { Language } from '@dwengo-1/common/util/language';
+import { testLearningPathWithConditions } from '../content/learning-paths.testdata';
+import { getClassWithTestleerlingAndTestleerkracht } from '../classes/classes.testdata';
 
 export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assignment[] {
-    const assignment01 = em.create(Assignment, {
+    assignment01 = em.create(Assignment, {
         id: 21000,
         within: classes[0],
         title: 'dire straits',
@@ -14,7 +16,7 @@ export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assign
         groups: [],
     });
 
-    const assignment02 = em.create(Assignment, {
+    assignment02 = em.create(Assignment, {
         id: 21001,
         within: classes[1],
         title: 'tool',
@@ -24,7 +26,7 @@ export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assign
         groups: [],
     });
 
-    const assignment03 = em.create(Assignment, {
+    assignment03 = em.create(Assignment, {
         id: 21002,
         within: classes[0],
         title: 'delete',
@@ -34,7 +36,7 @@ export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assign
         groups: [],
     });
 
-    const assignment04 = em.create(Assignment, {
+    assignment04 = em.create(Assignment, {
         id: 21003,
         within: classes[0],
         title: 'another assignment',
@@ -44,5 +46,41 @@ export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assign
         groups: [],
     });
 
-    return [assignment01, assignment02, assignment03, assignment04];
+    conditionalPathAssignment = em.create(Assignment, {
+        within: getClassWithTestleerlingAndTestleerkracht(),
+        id: 1,
+        title: 'Assignment: Conditional Learning Path',
+        description: 'You have to do the testing learning path with a condition.',
+        learningPathHruid: testLearningPathWithConditions.hruid,
+        learningPathLanguage: testLearningPathWithConditions.language as Language,
+        groups: [],
+    });
+
+    return [assignment01, assignment02, assignment03, assignment04, conditionalPathAssignment];
+}
+
+let assignment01: Assignment;
+let assignment02: Assignment;
+let assignment03: Assignment;
+let assignment04: Assignment;
+let conditionalPathAssignment: Assignment;
+
+export function getAssignment01(): Assignment {
+    return assignment01;
+}
+
+export function getAssignment02(): Assignment {
+    return assignment02;
+}
+
+export function getAssignment03(): Assignment {
+    return assignment03;
+}
+
+export function getAssignment04(): Assignment {
+    return assignment04;
+}
+
+export function getConditionalPathAssignment(): Assignment {
+    return conditionalPathAssignment;
 }

backend/tests/test_assets/assignments/groups.testdata.ts

@@ -2,13 +2,15 @@ import { EntityManager } from '@mikro-orm/core';
 import { Group } from '../../../src/entities/assignments/group.entity';
 import { Assignment } from '../../../src/entities/assignments/assignment.entity';
 import { Student } from '../../../src/entities/users/student.entity';
+import { getConditionalPathAssignment } from './assignments.testdata';
+import { getTestleerling1 } from '../users/students.testdata';
 
 export function makeTestGroups(em: EntityManager, students: Student[], assignments: Assignment[]): Group[] {
     /*
      * Group #1 for Assignment #1 in class 'id01'
      * => Assigned to do learning path 'id02'
      */
-    const group01 = em.create(Group, {
+    group01 = em.create(Group, {
         assignment: assignments[0],
         groupNumber: 21001,
         members: students.slice(0, 2),
@@ -18,7 +20,7 @@ export function makeTestGroups(em: EntityManager, students: Student[], assignmen
      * Group #2 for Assignment #1 in class 'id01'
      * => Assigned to do learning path 'id02'
      */
-    const group02 = em.create(Group, {
+    group02 = em.create(Group, {
         assignment: assignments[0],
         groupNumber: 21002,
         members: students.slice(2, 4),
@@ -28,7 +30,7 @@ export function makeTestGroups(em: EntityManager, students: Student[], assignmen
      * Group #3 for Assignment #1 in class 'id01'
      * => Assigned to do learning path 'id02'
      */
-    const group03 = em.create(Group, {
+    group03 = em.create(Group, {
         assignment: assignments[0],
         groupNumber: 21003,
         members: students.slice(4, 6),
@@ -38,7 +40,7 @@ export function makeTestGroups(em: EntityManager, students: Student[], assignmen
      * Group #4 for Assignment #2 in class 'id02'
      * => Assigned to do learning path 'id01'
      */
-    const group04 = em.create(Group, {
+    group04 = em.create(Group, {
         assignment: assignments[1],
         groupNumber: 21004,
         members: students.slice(3, 4),
@@ -48,11 +50,51 @@ export function makeTestGroups(em: EntityManager, students: Student[], assignmen
      * Group #5 for Assignment #4 in class 'id01'
      * => Assigned to do learning path 'id01'
      */
-    const group05 = em.create(Group, {
+    group05 = em.create(Group, {
         assignment: assignments[3],
         groupNumber: 21001,
         members: students.slice(0, 2),
     });
 
-    return [group01, group02, group03, group04, group05];
+    /**
+     * Group 1 for the assignment of the testing learning path with conditions.
+     */
+    group1ConditionalLearningPath = em.create(Group, {
+        assignment: getConditionalPathAssignment(),
+        groupNumber: 1,
+        members: [getTestleerling1()],
+    });
+
+    return [group01, group02, group03, group04, group05, group1ConditionalLearningPath];
+}
+
+let group01: Group;
+let group02: Group;
+let group03: Group;
+let group04: Group;
+let group05: Group;
+let group1ConditionalLearningPath: Group;
+
+export function getTestGroup01(): Group {
+    return group01;
+}
+
+export function getTestGroup02(): Group {
+    return group02;
+}
+
+export function getTestGroup03(): Group {
+    return group03;
+}
+
+export function getTestGroup04(): Group {
+    return group04;
+}
+
+export function getTestGroup05(): Group {
+    return group05;
+}
+
+export function getGroup1ConditionalLearningPath(): Group {
+    return group1ConditionalLearningPath;
 }