Merge branch 'dev' into feat/discussions

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

@@ -5,6 +5,12 @@ import { testLearningPath01, testLearningPath02, testLearningPathWithConditions
 import { getClass01, getClass02, getClassWithTestleerlingAndTestleerkracht } from '../classes/classes.testdata';
 
 export function makeTestAssignemnts(em: EntityManager): Assignment[] {
+    const futureDate = new Date();
+    futureDate.setDate(futureDate.getDate() + 7);
+    const pastDate = new Date();
+    pastDate.setDate(pastDate.getDate() - 7);
+    const today = new Date();
+    today.setHours(23, 59);
     assignment01 = em.create(Assignment, {
         id: 21000,
         within: getClass01(),
@@ -12,6 +18,7 @@ export function makeTestAssignemnts(em: EntityManager): Assignment[] {
         description: 'reading',
         learningPathHruid: testLearningPath02.hruid,
         learningPathLanguage: testLearningPath02.language as Language,
+        deadline: today,
         groups: [],
     });
 
@@ -22,6 +29,7 @@ export function makeTestAssignemnts(em: EntityManager): Assignment[] {
         description: 'reading',
         learningPathHruid: testLearningPath01.hruid,
         learningPathLanguage: testLearningPath01.language as Language,
+        deadline: futureDate,
         groups: [],
     });
 
@@ -32,6 +40,7 @@ export function makeTestAssignemnts(em: EntityManager): Assignment[] {
         description: 'will be deleted',
         learningPathHruid: testLearningPath02.hruid,
         learningPathLanguage: testLearningPath02.language as Language,
+        deadline: pastDate,
         groups: [],
     });
 
@@ -42,6 +51,7 @@ export function makeTestAssignemnts(em: EntityManager): Assignment[] {
         description: 'with a description',
         learningPathHruid: testLearningPath01.hruid,
         learningPathLanguage: testLearningPath01.language as Language,
+        deadline: pastDate,
         groups: [],
     });
 
@@ -52,6 +62,7 @@ export function makeTestAssignemnts(em: EntityManager): Assignment[] {
         description: 'You have to do the testing learning path with a condition.',
         learningPathHruid: testLearningPathWithConditions.hruid,
         learningPathLanguage: testLearningPathWithConditions.language as Language,
+        deadline: futureDate,
         groups: [],
     });
 

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

@@ -8,7 +8,7 @@ export function makeTestGroups(em: EntityManager): Group[] {
      * Group #1 for Assignment #1 in class 'id01'
      * => Assigned to do learning path 'id02'
      */
-    // gets deleted
+    // Gets deleted
     group01 = em.create(Group, {
         assignment: getAssignment01(),
         groupNumber: 21001,

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

@@ -71,7 +71,7 @@ export function makeTestSubmissions(em: EntityManager): Submission[] {
         content: '',
     });
 
-    // gets deleted
+    // Gets deleted
     submission07 = em.create(Submission, {
         learningObjectHruid: testLearningObject01.hruid,
         learningObjectLanguage: testLearningObject01.language,
@@ -106,34 +106,34 @@ let submission06: Submission;
 let submission07: Submission;
 let submission08: Submission;
 
-export function getSubmission01(): Submission{
+export function getSubmission01(): Submission {
     return submission01;
 }
 
-export function getSubmission02(): Submission{
+export function getSubmission02(): Submission {
     return submission02;
 }
 
-export function getSubmission03(): Submission{
+export function getSubmission03(): Submission {
     return submission03;
 }
 
-export function getSubmission04(): Submission{
+export function getSubmission04(): Submission {
     return submission04;
 }
 
-export function getSubmission05(): Submission{
+export function getSubmission05(): Submission {
     return submission05;
 }
 
-export function getSubmission06(): Submission{
+export function getSubmission06(): Submission {
     return submission06;
 }
 
-export function getSubmission07(): Submission{
+export function getSubmission07(): Submission {
     return submission07;
 }
 
-export function getSubmission08(): Submission{
+export function getSubmission08(): Submission {
     return submission08;
-}
+}

backend/tests/test_assets/classes/class-join-requests.testdata.ts

@@ -37,18 +37,18 @@ let classJoinRequest02: ClassJoinRequest;
 let classJoinRequest03: ClassJoinRequest;
 let classJoinRequest04: ClassJoinRequest;
 
-export function getClassJoinRequest01(): ClassJoinRequest{
+export function getClassJoinRequest01(): ClassJoinRequest {
     return classJoinRequest01;
 }
 
-export function getClassJoinRequest02(): ClassJoinRequest{
+export function getClassJoinRequest02(): ClassJoinRequest {
     return classJoinRequest02;
 }
 
-export function getClassJoinRequest03(): ClassJoinRequest{
+export function getClassJoinRequest03(): ClassJoinRequest {
     return classJoinRequest03;
 }
 
-export function getClassJoinRequest04(): ClassJoinRequest{
+export function getClassJoinRequest04(): ClassJoinRequest {
     return classJoinRequest04;
-}
+}

backend/tests/test_assets/classes/classes.testdata.ts

@@ -10,7 +10,7 @@ export function makeTestClasses(em: EntityManager): Class[] {
     const teacherClass01: Teacher[] = [getTestleerkracht1()];
 
     class01 = em.create(Class, {
-        classId: '8764b861-90a6-42e5-9732-c0d9eb2f55f9',
+        classId: 'X2J9QT', // 8764b861-90a6-42e5-9732-c0d9eb2f55f9
         displayName: 'class01',
         teachers: teacherClass01,
         students: studentsClass01,
@@ -20,7 +20,7 @@ export function makeTestClasses(em: EntityManager): Class[] {
     const teacherClass02: Teacher[] = [getLimpBizkit()];
 
     class02 = em.create(Class, {
-        classId: '34d484a1-295f-4e9f-bfdc-3e7a23d86a89',
+        classId: '7KLPMA', // 34d484a1-295f-4e9f-bfdc-3e7a23d86a89
         displayName: 'class02',
         teachers: teacherClass02,
         students: studentsClass02,
@@ -30,7 +30,7 @@ export function makeTestClasses(em: EntityManager): Class[] {
     const teacherClass03: Teacher[] = [getStaind()];
 
     class03 = em.create(Class, {
-        classId: '80dcc3e0-1811-4091-9361-42c0eee91cfa',
+        classId: 'R0D3UZ', // 80dcc3e0-1811-4091-9361-42c0eee91cfa
         displayName: 'class03',
         teachers: teacherClass03,
         students: studentsClass03,
@@ -39,16 +39,16 @@ export function makeTestClasses(em: EntityManager): Class[] {
     const studentsClass04: Student[] = [getNoordkaap(), getDireStraits()];
     const teacherClass04: Teacher[] = [getStaind()];
 
-    // gets deleted in test
+    // Gets deleted in test
     class04 = em.create(Class, {
-        classId: '33d03536-83b8-4880-9982-9bbf2f908ddf',
+        classId: 'Q8N5YC', // 33d03536-83b8-4880-9982-9bbf2f908ddf
         displayName: 'class04',
         teachers: teacherClass04,
         students: studentsClass04,
     });
 
     classWithTestleerlingAndTestleerkracht = em.create(Class, {
-        classId: 'a75298b5-18aa-471d-8eeb-5d77eb989393',
+        classId: 'ZAV71B', // Was a75298b5-18aa-471d-8eeb-5d77eb989393
         displayName: 'Testklasse',
         teachers: [getTestleerkracht1()],
         students: [getTestleerling1()],

backend/tests/test_assets/classes/teacher-invitations.testdata.ts

@@ -26,7 +26,7 @@ export function makeTestTeacherInvitations(em: EntityManager): TeacherInvitation
         status: ClassStatus.Open,
     });
 
-    // gets deleted in test
+    // Gets deleted in test
     teacherInvitation04 = em.create(TeacherInvitation, {
         sender: getFooFighters(),
         receiver: getLimpBizkit(),
@@ -56,4 +56,4 @@ export function getTeacherInvitation03(): TeacherInvitation {
 
 export function getTeacherInvitation04(): TeacherInvitation {
     return teacherInvitation04;
-}
+}

backend/tests/test_assets/content/attachments.testdata.ts

@@ -4,7 +4,7 @@ import { testLearningObject01 } from './learning-objects.testdata';
 import { LearningObject } from '../../../src/entities/content/learning-object.entity';
 
 export function makeTestAttachments(em: EntityManager): Attachment[] {
-    // prevent duplicate insertion
+    // Prevent duplicate insertion
     const lo = em.merge(LearningObject, testLearningObject01);
 
     attachment01 = em.create(Attachment, {
@@ -19,6 +19,6 @@ export function makeTestAttachments(em: EntityManager): Attachment[] {
 
 let attachment01: Attachment;
 
-export function getAttachment01(): Attachment{
+export function getAttachment01(): Attachment {
     return attachment01;
 }

backend/tests/test_assets/questions/answers.testdata.ts

@@ -20,7 +20,7 @@ export function makeTestAnswers(em: EntityManager): Answer[] {
         content: 'answer2',
     });
 
-    // gets deleted
+    // Gets deleted
     answer03 = em.create(Answer, {
         author: getLimpBizkit(),
         toQuestion: getQuestion04(),
@@ -72,4 +72,4 @@ export function getAnswer04(): Answer {
 
 export function getAnswer05(): Answer {
     return answer05;
-}
+}

backend/tests/test_assets/questions/questions.testdata.ts

@@ -1,7 +1,12 @@
 import { EntityManager } from '@mikro-orm/core';
 import { Question } from '../../../src/entities/questions/question.entity';
 import { getDireStraits, getNoordkaap, getTestleerling1, getTool } from '../users/students.testdata';
-import { testLearningObject01, testLearningObject04, testLearningObject05, testLearningObjectMultipleChoice } from '../content/learning-objects.testdata';
+import {
+    testLearningObject01,
+    testLearningObject04,
+    testLearningObject05,
+    testLearningObjectMultipleChoice,
+} from '../content/learning-objects.testdata';
 import { getGroup1ConditionalLearningPath, getTestGroup01, getTestGroup02 } from '../assignments/groups.testdata';
 
 export function makeTestQuestions(em: EntityManager): Question[] {
@@ -27,7 +32,7 @@ export function makeTestQuestions(em: EntityManager): Question[] {
         content: 'question',
     });
 
-    //gets deleted
+    //Gets deleted
     question03 = em.create(Question, {
         learningObjectLanguage: testLearningObject04.language,
         learningObjectVersion: testLearningObject04.version,
@@ -130,7 +135,6 @@ export function getQuestion06(): Question {
     return question06;
 }
 
-
 export function getQuestion07(): Question {
     return question07;
 }