style: fix linting issues met Prettier
This commit is contained in:
Lint Action
parent
af8c783a26
commit
5168ceaee0
56 changed files with 680 additions and 741 deletions
|
|
@ -33,8 +33,7 @@ describe('AssignmentRepository', () => {
|
|||
|
||||
it('should find all by username of the responsible teacher', async () => {
|
||||
const result = await assignmentRepository.findAllByResponsibleTeacher('testleerkracht1');
|
||||
const resultIds = result.map((it) => it.id)
|
||||
.sort((a, b) => (a ?? 0) - (b ?? 0));
|
||||
const resultIds = result.map((it) => it.id).sort((a, b) => (a ?? 0) - (b ?? 0));
|
||||
|
||||
expect(resultIds).toEqual([1, 1, 3, 4]);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -91,11 +91,9 @@ describe('SubmissionRepository', () => {
|
|||
expect(result[2].submissionNumber).toBe(3);
|
||||
});
|
||||
|
||||
it("should find only the submissions for a certain learning object and assignment made for the given group", async () => {
|
||||
it('should find only the submissions for a certain learning object and assignment made for the given group', async () => {
|
||||
const group = await groupRepository.findByAssignmentAndGroupNumber(assignment!, 2);
|
||||
const result = await submissionRepository.findAllSubmissionsForLearningObjectAndGroup(
|
||||
loId, group!
|
||||
);
|
||||
const result = await submissionRepository.findAllSubmissionsForLearningObjectAndGroup(loId, group!);
|
||||
|
||||
expect(result).toHaveLength(1);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ import { AttachmentRepository } from '../../../src/data/content/attachment-repos
|
|||
import { LearningObject } from '../../../src/entities/content/learning-object.entity.js';
|
||||
import { Attachment } from '../../../src/entities/content/attachment.entity.js';
|
||||
import { LearningObjectIdentifier } from '../../../src/entities/content/learning-object-identifier.js';
|
||||
import {testLearningObjectPnNotebooks} from "../../test_assets/content/learning-objects.testdata";
|
||||
import {v4 as uuidV4} from "uuid";
|
||||
import { testLearningObjectPnNotebooks } from '../../test_assets/content/learning-objects.testdata';
|
||||
import { v4 as uuidV4 } from 'uuid';
|
||||
|
||||
describe('AttachmentRepository', () => {
|
||||
let attachmentRepo: AttachmentRepository;
|
||||
|
|
@ -26,7 +26,7 @@ describe('AttachmentRepository', () => {
|
|||
newLearningObjectData.version = 101;
|
||||
newLearningObjectData.attachments = [];
|
||||
newLearningObjectData.uuid = uuidV4();
|
||||
newLearningObjectData.content = Buffer.from("Content of the newer example");
|
||||
newLearningObjectData.content = Buffer.from('Content of the newer example');
|
||||
|
||||
newLearningObject = learningObjectRepo.create(newLearningObjectData);
|
||||
await learningObjectRepo.save(newLearningObject);
|
||||
|
|
@ -36,7 +36,7 @@ describe('AttachmentRepository', () => {
|
|||
it('allows us to add attachments with the same name to a different learning object without throwing an error', async () => {
|
||||
attachmentOnlyNewer = structuredClone(attachmentsOlderLearningObject[0]);
|
||||
attachmentOnlyNewer.learningObject = newLearningObject;
|
||||
attachmentOnlyNewer.content = Buffer.from("New attachment content");
|
||||
attachmentOnlyNewer.content = Buffer.from('New attachment content');
|
||||
|
||||
await attachmentRepo.save(attachmentRepo.create(attachmentOnlyNewer));
|
||||
});
|
||||
|
|
@ -49,10 +49,7 @@ describe('AttachmentRepository', () => {
|
|||
version: testLearningObjectPnNotebooks.version,
|
||||
};
|
||||
|
||||
const result = await attachmentRepo.findByLearningObjectIdAndName(
|
||||
olderLearningObjectId,
|
||||
attachmentsOlderLearningObject[0].name
|
||||
);
|
||||
const result = await attachmentRepo.findByLearningObjectIdAndName(olderLearningObjectId, attachmentsOlderLearningObject[0].name);
|
||||
expect(result).not.toBeNull();
|
||||
expect(result!.name).toEqual(attachmentsOlderLearningObject[0].name);
|
||||
expect(result!.content).toEqual(attachmentsOlderLearningObject[0].content);
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import { beforeAll, describe, expect, it } from 'vitest';
|
|||
import { setupTestApp } from '../../setup-tests.js';
|
||||
import { getAttachmentRepository } from '../../../src/data/repositories.js';
|
||||
import { AttachmentRepository } from '../../../src/data/content/attachment-repository.js';
|
||||
import { testLearningObject02 } from "../../test_assets/content/learning-objects.testdata";
|
||||
import { testLearningObject02 } from '../../test_assets/content/learning-objects.testdata';
|
||||
|
||||
describe('AttachmentRepository', () => {
|
||||
let attachmentRepository: AttachmentRepository;
|
||||
|
|
|
|||
|
|
@ -4,12 +4,8 @@ import { setupTestApp } from '../../setup-tests.js';
|
|||
import { getLearningObjectRepository } from '../../../src/data/repositories.js';
|
||||
import { LearningObject } from '../../../src/entities/content/learning-object.entity.js';
|
||||
import { expectToBeCorrectEntity } from '../../test-utils/expectations.js';
|
||||
import {
|
||||
testLearningObject01,
|
||||
testLearningObject02,
|
||||
testLearningObject03
|
||||
} from "../../test_assets/content/learning-objects.testdata";
|
||||
import {v4} from "uuid";
|
||||
import { testLearningObject01, testLearningObject02, testLearningObject03 } from '../../test_assets/content/learning-objects.testdata';
|
||||
import { v4 } from 'uuid';
|
||||
|
||||
describe('LearningObjectRepository', () => {
|
||||
let learningObjectRepository: LearningObjectRepository;
|
||||
|
|
@ -43,26 +39,22 @@ describe('LearningObjectRepository', () => {
|
|||
it('should allow a learning object with the same id except a different version to be added', async () => {
|
||||
const testLearningObject01Newer = structuredClone(testLearningObject01);
|
||||
testLearningObject01Newer.version = 10;
|
||||
testLearningObject01Newer.title += " (nieuw)";
|
||||
testLearningObject01Newer.title += ' (nieuw)';
|
||||
testLearningObject01Newer.uuid = v4();
|
||||
testLearningObject01Newer.content = Buffer.from("This is the new content.");
|
||||
testLearningObject01Newer.content = Buffer.from('This is the new content.');
|
||||
newerExample = learningObjectRepository.create(testLearningObject01Newer);
|
||||
await learningObjectRepository.save(newerExample);
|
||||
});
|
||||
|
||||
it('should return the newest version of the learning object when queried by only hruid and language', async () => {
|
||||
const result = await learningObjectRepository.findLatestByHruidAndLanguage(
|
||||
newerExample.hruid, newerExample.language
|
||||
);
|
||||
const result = await learningObjectRepository.findLatestByHruidAndLanguage(newerExample.hruid, newerExample.language);
|
||||
expect(result).toBeInstanceOf(LearningObject);
|
||||
expect(result?.version).toBe(10);
|
||||
expect(result?.title).toContain('(nieuw)');
|
||||
});
|
||||
|
||||
it('should return null when queried by non-existing hruid or language', async () => {
|
||||
const result = await learningObjectRepository.findLatestByHruidAndLanguage(
|
||||
'something_that_does_not_exist', testLearningObject01.language
|
||||
);
|
||||
const result = await learningObjectRepository.findLatestByHruidAndLanguage('something_that_does_not_exist', testLearningObject01.language);
|
||||
expect(result).toBe(null);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import { getLearningObjectRepository } from '../../../src/data/repositories';
|
|||
import { setupTestApp } from '../../setup-tests';
|
||||
import { LearningObjectIdentifier } from '../../../src/entities/content/learning-object-identifier';
|
||||
import { Language } from '@dwengo-1/common/util/language';
|
||||
import {testLearningObject01} from "../../test_assets/content/learning-objects.testdata";
|
||||
import { testLearningObject01 } from '../../test_assets/content/learning-objects.testdata';
|
||||
|
||||
describe('LearningObjectRepository', () => {
|
||||
let learningObjectRepository: LearningObjectRepository;
|
||||
|
|
|
|||
|
|
@ -3,14 +3,10 @@ import { setupTestApp } from '../../setup-tests.js';
|
|||
import { getLearningPathRepository } from '../../../src/data/repositories.js';
|
||||
import { LearningPathRepository } from '../../../src/data/content/learning-path-repository.js';
|
||||
import { LearningPath } from '../../../src/entities/content/learning-path.entity.js';
|
||||
import {
|
||||
expectToBeCorrectEntity,
|
||||
expectToHaveFoundNothing,
|
||||
expectToHaveFoundPrecisely
|
||||
} from '../../test-utils/expectations.js';
|
||||
import { expectToBeCorrectEntity, expectToHaveFoundNothing, expectToHaveFoundPrecisely } from '../../test-utils/expectations.js';
|
||||
import { Language } from '@dwengo-1/common/util/language';
|
||||
import {testLearningPath01} from "../../test_assets/content/learning-paths.testdata";
|
||||
import {mapToLearningPath} from "../../../src/services/learning-paths/learning-path-service";
|
||||
import { testLearningPath01 } from '../../test_assets/content/learning-paths.testdata';
|
||||
import { mapToLearningPath } from '../../../src/services/learning-paths/learning-path-service';
|
||||
|
||||
describe('LearningPathRepository', () => {
|
||||
let learningPathRepo: LearningPathRepository;
|
||||
|
|
@ -24,10 +20,7 @@ describe('LearningPathRepository', () => {
|
|||
});
|
||||
|
||||
it('should return a learning path when it is queried by hruid and language', async () => {
|
||||
const result = await learningPathRepo.findByHruidAndLanguage(
|
||||
testLearningPath01.hruid,
|
||||
testLearningPath01.language as Language
|
||||
);
|
||||
const result = await learningPathRepo.findByHruidAndLanguage(testLearningPath01.hruid, testLearningPath01.language as Language);
|
||||
expect(result).toBeInstanceOf(LearningPath);
|
||||
expectToBeCorrectEntity(result!, examplePath);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import { getLearningPathRepository } from '../../../src/data/repositories';
|
|||
import { LearningPathRepository } from '../../../src/data/content/learning-path-repository';
|
||||
import { setupTestApp } from '../../setup-tests';
|
||||
import { Language } from '@dwengo-1/common/util/language';
|
||||
import {testLearningPath01} from "../../test_assets/content/learning-paths.testdata";
|
||||
import { testLearningPath01 } from '../../test_assets/content/learning-paths.testdata';
|
||||
|
||||
describe('LearningPathRepository', () => {
|
||||
let learningPathRepository: LearningPathRepository;
|
||||
|
|
@ -20,9 +20,7 @@ describe('LearningPathRepository', () => {
|
|||
});
|
||||
|
||||
it('should return requested learning path', async () => {
|
||||
const learningPath = await learningPathRepository.findByHruidAndLanguage(
|
||||
testLearningPath01.hruid, testLearningPath01.language as Language
|
||||
);
|
||||
const learningPath = await learningPathRepository.findByHruidAndLanguage(testLearningPath01.hruid, testLearningPath01.language as Language);
|
||||
|
||||
expect(learningPath).toBeTruthy();
|
||||
expect(learningPath?.title).toBe(testLearningPath01.title);
|
||||
|
|
|
|||
|
|
@ -4,18 +4,12 @@ import { LearningObject } from '../../../src/entities/content/learning-object.en
|
|||
import databaseLearningObjectProvider from '../../../src/services/learning-objects/database-learning-object-provider';
|
||||
import { expectToBeCorrectFilteredLearningObject } from '../../test-utils/expectations';
|
||||
import { Language } from '@dwengo-1/common/util/language';
|
||||
import {
|
||||
FilteredLearningObject,
|
||||
LearningObjectNode,
|
||||
LearningPathIdentifier
|
||||
} from '@dwengo-1/common/interfaces/learning-content';
|
||||
import {
|
||||
testPartiallyDatabaseAndPartiallyDwengoApiLearningPath
|
||||
} from "../../test_assets/content/learning-paths.testdata";
|
||||
import {testLearningObjectPnNotebooks} from "../../test_assets/content/learning-objects.testdata";
|
||||
import { FilteredLearningObject, LearningObjectNode, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
|
||||
import { testPartiallyDatabaseAndPartiallyDwengoApiLearningPath } from '../../test_assets/content/learning-paths.testdata';
|
||||
import { testLearningObjectPnNotebooks } from '../../test_assets/content/learning-objects.testdata';
|
||||
import { LearningPath } from '@dwengo-1/common/dist/interfaces/learning-content';
|
||||
import {RequiredEntityData} from "@mikro-orm/core";
|
||||
import {getHtmlRenderingForTestLearningObject} from "../../test-utils/get-html-rendering";
|
||||
import { RequiredEntityData } from '@mikro-orm/core';
|
||||
import { getHtmlRenderingForTestLearningObject } from '../../test-utils/get-html-rendering';
|
||||
|
||||
const EXPECTED_TITLE_FROM_DWENGO_LEARNING_OBJECT = 'Notebook opslaan';
|
||||
|
||||
|
|
@ -31,7 +25,7 @@ describe('DatabaseLearningObjectProvider', () => {
|
|||
|
||||
exampleLearningPathId = {
|
||||
hruid: exampleLearningPath.hruid,
|
||||
language: exampleLearningPath.language as Language
|
||||
language: exampleLearningPath.language as Language,
|
||||
};
|
||||
});
|
||||
describe('getLearningObjectById', () => {
|
||||
|
|
@ -75,9 +69,7 @@ describe('DatabaseLearningObjectProvider', () => {
|
|||
describe('getLearningObjectIdsFromPath', () => {
|
||||
it('should return all learning object IDs from a path', async () => {
|
||||
const result = await databaseLearningObjectProvider.getLearningObjectIdsFromPath(exampleLearningPathId);
|
||||
expect(new Set(result)).toEqual(
|
||||
new Set(exampleLearningPath.nodes.map((it: LearningObjectNode) => it.learningobject_hruid))
|
||||
);
|
||||
expect(new Set(result)).toEqual(new Set(exampleLearningPath.nodes.map((it: LearningObjectNode) => it.learningobject_hruid)));
|
||||
});
|
||||
it('should throw an error if queried with a path identifier for which there is no learning path', async () => {
|
||||
await expect(
|
||||
|
|
|
|||
|
|
@ -3,18 +3,12 @@ import { setupTestApp } from '../../setup-tests';
|
|||
import { LearningObject } from '../../../src/entities/content/learning-object.entity';
|
||||
import learningObjectService from '../../../src/services/learning-objects/learning-object-service';
|
||||
import { envVars, getEnvVar } from '../../../src/util/envVars';
|
||||
import {
|
||||
LearningObjectIdentifierDTO,
|
||||
LearningPath as LearningPathDTO,
|
||||
LearningPathIdentifier
|
||||
} from '@dwengo-1/common/interfaces/learning-content';
|
||||
import { LearningObjectIdentifierDTO, LearningPath as LearningPathDTO, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
|
||||
import { Language } from '@dwengo-1/common/util/language';
|
||||
import {testLearningObjectPnNotebooks} from "../../test_assets/content/learning-objects.testdata";
|
||||
import {
|
||||
testPartiallyDatabaseAndPartiallyDwengoApiLearningPath
|
||||
} from "../../test_assets/content/learning-paths.testdata";
|
||||
import {RequiredEntityData} from "@mikro-orm/core";
|
||||
import {getHtmlRenderingForTestLearningObject} from "../../test-utils/get-html-rendering";
|
||||
import { testLearningObjectPnNotebooks } from '../../test_assets/content/learning-objects.testdata';
|
||||
import { testPartiallyDatabaseAndPartiallyDwengoApiLearningPath } from '../../test_assets/content/learning-paths.testdata';
|
||||
import { RequiredEntityData } from '@mikro-orm/core';
|
||||
import { getHtmlRenderingForTestLearningObject } from '../../test-utils/get-html-rendering';
|
||||
|
||||
const EXPECTED_DWENGO_LEARNING_OBJECT_TITLE = 'Werken met notebooks';
|
||||
const DWENGO_TEST_LEARNING_OBJECT_ID: LearningObjectIdentifierDTO = {
|
||||
|
|
@ -41,8 +35,8 @@ describe('LearningObjectService', () => {
|
|||
|
||||
exampleLearningPathId = {
|
||||
hruid: exampleLearningPath.hruid,
|
||||
language: exampleLearningPath.language as Language
|
||||
}
|
||||
language: exampleLearningPath.language as Language,
|
||||
};
|
||||
});
|
||||
|
||||
describe('getLearningObjectById', () => {
|
||||
|
|
@ -99,9 +93,7 @@ describe('LearningObjectService', () => {
|
|||
describe('getLearningObjectsFromPath', () => {
|
||||
it('returns all learning objects when a learning path in the database is queried', async () => {
|
||||
const result = await learningObjectService.getLearningObjectsFromPath(exampleLearningPathId);
|
||||
expect(result.map(it=> it.key)).toEqual(
|
||||
exampleLearningPath.nodes.map(it => it.learningobject_hruid)
|
||||
);
|
||||
expect(result.map((it) => it.key)).toEqual(exampleLearningPath.nodes.map((it) => it.learningobject_hruid));
|
||||
});
|
||||
it('also returns all learning objects when a learning path from the Dwengo API is queried', async () => {
|
||||
const result = await learningObjectService.getLearningObjectsFromPath(DWENGO_TEST_LEARNING_PATH_ID);
|
||||
|
|
@ -119,7 +111,7 @@ describe('LearningObjectService', () => {
|
|||
describe('getLearningObjectIdsFromPath', () => {
|
||||
it('returns all learning objects when a learning path in the database is queried', async () => {
|
||||
const result = await learningObjectService.getLearningObjectIdsFromPath(exampleLearningPathId);
|
||||
expect(result).toEqual(exampleLearningPath.nodes.map(it => it.learningobject_hruid));
|
||||
expect(result).toEqual(exampleLearningPath.nodes.map((it) => it.learningobject_hruid));
|
||||
});
|
||||
it('also returns all learning object hruids when a learning path from the Dwengo API is queried', async () => {
|
||||
const result = await learningObjectService.getLearningObjectIdsFromPath(DWENGO_TEST_LEARNING_PATH_ID);
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
import {beforeAll, describe, expect, it} from 'vitest';
|
||||
import { beforeAll, describe, expect, it } from 'vitest';
|
||||
import processingService from '../../../../src/services/learning-objects/processing/processing-service';
|
||||
import {
|
||||
testLearningObjectEssayQuestion,
|
||||
testLearningObjectMultipleChoice, testLearningObjectPnNotebooks
|
||||
} from "../../../test_assets/content/learning-objects.testdata";
|
||||
import {getHtmlRenderingForTestLearningObject} from "../../../test-utils/get-html-rendering";
|
||||
import {getLearningObjectRepository} from "../../../../src/data/repositories";
|
||||
import {setupTestApp} from "../../../setup-tests";
|
||||
testLearningObjectMultipleChoice,
|
||||
testLearningObjectPnNotebooks,
|
||||
} from '../../../test_assets/content/learning-objects.testdata';
|
||||
import { getHtmlRenderingForTestLearningObject } from '../../../test-utils/get-html-rendering';
|
||||
import { getLearningObjectRepository } from '../../../../src/data/repositories';
|
||||
import { setupTestApp } from '../../../setup-tests';
|
||||
|
||||
describe('ProcessingService', () => {
|
||||
beforeAll(async () => {
|
||||
|
|
@ -17,24 +18,18 @@ describe('ProcessingService', () => {
|
|||
const markdownLearningObject = getLearningObjectRepository().create(testLearningObjectPnNotebooks);
|
||||
const result = await processingService.render(markdownLearningObject);
|
||||
// Set newlines so your tests are platform-independent.
|
||||
expect(result).toEqual(
|
||||
getHtmlRenderingForTestLearningObject(markdownLearningObject).replace(/\r\n/g, '\n')
|
||||
);
|
||||
expect(result).toEqual(getHtmlRenderingForTestLearningObject(markdownLearningObject).replace(/\r\n/g, '\n'));
|
||||
});
|
||||
|
||||
it('renders a multiple choice question correctly', async () => {
|
||||
const testLearningObject = getLearningObjectRepository().create(testLearningObjectMultipleChoice);
|
||||
const result = await processingService.render(testLearningObject);
|
||||
expect(result).toEqual(
|
||||
getHtmlRenderingForTestLearningObject(testLearningObjectMultipleChoice).replace(/\r\n/g, '\n')
|
||||
);
|
||||
expect(result).toEqual(getHtmlRenderingForTestLearningObject(testLearningObjectMultipleChoice).replace(/\r\n/g, '\n'));
|
||||
});
|
||||
|
||||
it('renders an essay question correctly', async () => {
|
||||
const essayLearningObject = getLearningObjectRepository().create(testLearningObjectEssayQuestion);
|
||||
const result = await processingService.render(essayLearningObject);
|
||||
expect(result).toEqual(
|
||||
getHtmlRenderingForTestLearningObject(essayLearningObject).replace(/\r\n/g, '\n')
|
||||
);
|
||||
expect(result).toEqual(getHtmlRenderingForTestLearningObject(essayLearningObject).replace(/\r\n/g, '\n'));
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -8,26 +8,20 @@ import databaseLearningPathProvider from '../../../src/services/learning-paths/d
|
|||
import { expectToBeCorrectLearningPath } from '../../test-utils/expectations.js';
|
||||
import { Language } from '@dwengo-1/common/util/language';
|
||||
|
||||
import { LearningObjectNode, LearningPathResponse } from '@dwengo-1/common/interfaces/learning-content';
|
||||
import {
|
||||
LearningObjectNode,
|
||||
LearningPathResponse
|
||||
} from '@dwengo-1/common/interfaces/learning-content';
|
||||
import {
|
||||
testLearningObject01, testLearningObjectEssayQuestion,
|
||||
testLearningObjectMultipleChoice
|
||||
} from "../../test_assets/content/learning-objects.testdata";
|
||||
import {testLearningPathWithConditions} from "../../test_assets/content/learning-paths.testdata";
|
||||
import {mapToLearningPath} from "../../../src/services/learning-paths/learning-path-service";
|
||||
import {getTestGroup01, getTestGroup02} from "../../test_assets/assignments/groups.testdata";
|
||||
testLearningObject01,
|
||||
testLearningObjectEssayQuestion,
|
||||
testLearningObjectMultipleChoice,
|
||||
} from '../../test_assets/content/learning-objects.testdata';
|
||||
import { testLearningPathWithConditions } from '../../test_assets/content/learning-paths.testdata';
|
||||
import { mapToLearningPath } from '../../../src/services/learning-paths/learning-path-service';
|
||||
import { getTestGroup01, getTestGroup02 } from '../../test_assets/assignments/groups.testdata';
|
||||
import { Group } from '../../../src/entities/assignments/group.entity.js';
|
||||
import {RequiredEntityData} from "@mikro-orm/core";
|
||||
import { RequiredEntityData } from '@mikro-orm/core';
|
||||
|
||||
function expectBranchingObjectNode(
|
||||
result: LearningPathResponse
|
||||
): LearningObjectNode {
|
||||
const branchingObjectMatches = result.data![0].nodes.filter(
|
||||
(it) => it.learningobject_hruid === testLearningObjectMultipleChoice.hruid
|
||||
);
|
||||
function expectBranchingObjectNode(result: LearningPathResponse): LearningObjectNode {
|
||||
const branchingObjectMatches = result.data![0].nodes.filter((it) => it.learningobject_hruid === testLearningObjectMultipleChoice.hruid);
|
||||
expect(branchingObjectMatches.length).toBe(1);
|
||||
return branchingObjectMatches[0];
|
||||
}
|
||||
|
|
@ -36,7 +30,7 @@ describe('DatabaseLearningPathProvider', () => {
|
|||
let testLearningPath: LearningPath;
|
||||
let branchingLearningObject: RequiredEntityData<LearningObject>;
|
||||
let extraExerciseLearningObject: RequiredEntityData<LearningObject>;
|
||||
let finalLearningObject: RequiredEntityData<LearningObject>;
|
||||
let finalLearningObject: RequiredEntityData<LearningObject>;
|
||||
let groupA: Group;
|
||||
let groupB: Group;
|
||||
|
||||
|
|
@ -55,10 +49,10 @@ describe('DatabaseLearningPathProvider', () => {
|
|||
learningObjectHruid: branchingLearningObject.hruid,
|
||||
learningObjectLanguage: branchingLearningObject.language,
|
||||
learningObjectVersion: branchingLearningObject.version,
|
||||
content: "[0]",
|
||||
content: '[0]',
|
||||
onBehalfOf: groupA,
|
||||
submissionTime: new Date(),
|
||||
submitter: groupA.members[0]
|
||||
submitter: groupA.members[0],
|
||||
});
|
||||
await submissionRepo.save(submissionA);
|
||||
|
||||
|
|
@ -66,21 +60,17 @@ describe('DatabaseLearningPathProvider', () => {
|
|||
learningObjectHruid: branchingLearningObject.hruid,
|
||||
learningObjectLanguage: branchingLearningObject.language,
|
||||
learningObjectVersion: branchingLearningObject.version,
|
||||
content: "[1]",
|
||||
content: '[1]',
|
||||
onBehalfOf: groupB,
|
||||
submissionTime: new Date(),
|
||||
submitter: groupB.members[0]
|
||||
submitter: groupB.members[0],
|
||||
});
|
||||
await submissionRepo.save(submissionB);
|
||||
});
|
||||
|
||||
describe('fetchLearningPaths', () => {
|
||||
it('returns the learning path correctly', async () => {
|
||||
const result = await databaseLearningPathProvider.fetchLearningPaths(
|
||||
[testLearningPath.hruid],
|
||||
testLearningPath.language,
|
||||
'the source'
|
||||
);
|
||||
const result = await databaseLearningPathProvider.fetchLearningPaths([testLearningPath.hruid], testLearningPath.language, 'the source');
|
||||
expect(result.success).toBe(true);
|
||||
expect(result.data?.length).toBe(1);
|
||||
|
||||
|
|
@ -100,24 +90,11 @@ describe('DatabaseLearningPathProvider', () => {
|
|||
// There should be exactly one branching object
|
||||
let branchingObject = expectBranchingObjectNode(result);
|
||||
|
||||
expect(
|
||||
branchingObject.transitions.filter(
|
||||
it => it.next.hruid === finalLearningObject.hruid
|
||||
).length
|
||||
).toBe(0); // StudentA picked the first option, therefore, there should be no direct path to the final object.
|
||||
expect(
|
||||
branchingObject.transitions.filter(
|
||||
it => it.next.hruid === extraExerciseLearningObject.hruid
|
||||
).length
|
||||
).toBe(1); // There should however be a path to the extra exercise object.
|
||||
expect(branchingObject.transitions.filter((it) => it.next.hruid === finalLearningObject.hruid).length).toBe(0); // StudentA picked the first option, therefore, there should be no direct path to the final object.
|
||||
expect(branchingObject.transitions.filter((it) => it.next.hruid === extraExerciseLearningObject.hruid).length).toBe(1); // There should however be a path to the extra exercise object.
|
||||
|
||||
// For student B:
|
||||
result = await databaseLearningPathProvider.fetchLearningPaths(
|
||||
[testLearningPath.hruid],
|
||||
testLearningPath.language,
|
||||
'the source',
|
||||
groupB
|
||||
);
|
||||
result = await databaseLearningPathProvider.fetchLearningPaths([testLearningPath.hruid], testLearningPath.language, 'the source', groupB);
|
||||
expect(result.success).toBeTruthy();
|
||||
expect(result.data?.length).toBe(1);
|
||||
|
||||
|
|
@ -125,16 +102,8 @@ describe('DatabaseLearningPathProvider', () => {
|
|||
branchingObject = expectBranchingObjectNode(result);
|
||||
|
||||
// However, now the student picks the other option.
|
||||
expect(
|
||||
branchingObject.transitions.filter(
|
||||
(it) => it.next.hruid === finalLearningObject.hruid
|
||||
).length
|
||||
).toBe(1); // StudentB picked the second option, therefore, there should be a direct path to the final object.
|
||||
expect(
|
||||
branchingObject.transitions.filter(
|
||||
(it) => it.next.hruid === extraExerciseLearningObject.hruid
|
||||
).length
|
||||
).toBe(0); // There should not be a path anymore to the extra exercise object.
|
||||
expect(branchingObject.transitions.filter((it) => it.next.hruid === finalLearningObject.hruid).length).toBe(1); // StudentB picked the second option, therefore, there should be a direct path to the final object.
|
||||
expect(branchingObject.transitions.filter((it) => it.next.hruid === extraExerciseLearningObject.hruid).length).toBe(0); // There should not be a path anymore to the extra exercise object.
|
||||
});
|
||||
it('returns a non-successful response if a non-existing learning path is queried', async () => {
|
||||
const result = await databaseLearningPathProvider.fetchLearningPaths(
|
||||
|
|
@ -149,10 +118,7 @@ describe('DatabaseLearningPathProvider', () => {
|
|||
|
||||
describe('searchLearningPaths', () => {
|
||||
it('returns the correct learning path when queried with a substring of its title', async () => {
|
||||
const result = await databaseLearningPathProvider.searchLearningPaths(
|
||||
testLearningPath.title.substring(2, 6),
|
||||
testLearningPath.language
|
||||
);
|
||||
const result = await databaseLearningPathProvider.searchLearningPaths(testLearningPath.title.substring(2, 6), testLearningPath.language);
|
||||
expect(result.length).toBe(1);
|
||||
expect(result[0].title).toBe(testLearningPath.title);
|
||||
expect(result[0].description).toBe(testLearningPath.description);
|
||||
|
|
|
|||
|
|
@ -2,10 +2,8 @@ import { beforeAll, describe, expect, it } from 'vitest';
|
|||
import { setupTestApp } from '../../setup-tests';
|
||||
import learningPathService from '../../../src/services/learning-paths/learning-path-service';
|
||||
import { Language } from '@dwengo-1/common/util/language';
|
||||
import {
|
||||
testPartiallyDatabaseAndPartiallyDwengoApiLearningPath
|
||||
} from "../../test_assets/content/learning-paths.testdata";
|
||||
import {LearningPath as LearningPathDTO} from "@dwengo-1/common/interfaces/learning-content";
|
||||
import { testPartiallyDatabaseAndPartiallyDwengoApiLearningPath } from '../../test_assets/content/learning-paths.testdata';
|
||||
import { LearningPath as LearningPathDTO } from '@dwengo-1/common/interfaces/learning-content';
|
||||
|
||||
const TEST_DWENGO_LEARNING_PATH_HRUID = 'pn_werking';
|
||||
const TEST_DWENGO_LEARNING_PATH_TITLE = 'Werken met notebooks';
|
||||
|
|
@ -16,7 +14,7 @@ describe('LearningPathService', () => {
|
|||
let testLearningPath: LearningPathDTO;
|
||||
beforeAll(async () => {
|
||||
await setupTestApp();
|
||||
testLearningPath = testPartiallyDatabaseAndPartiallyDwengoApiLearningPath
|
||||
testLearningPath = testPartiallyDatabaseAndPartiallyDwengoApiLearningPath;
|
||||
});
|
||||
describe('fetchLearningPaths', () => {
|
||||
it('should return learning paths both from the database and from the Dwengo API', async () => {
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ import { makeTestAttachments } from './test_assets/content/attachments.testdata.
|
|||
import { makeTestQuestions } from './test_assets/questions/questions.testdata.js';
|
||||
import { makeTestAnswers } from './test_assets/questions/answers.testdata.js';
|
||||
import { makeTestSubmissions } from './test_assets/assignments/submission.testdata.js';
|
||||
import {Collection} from "@mikro-orm/core";
|
||||
import {Group} from "../src/entities/assignments/group.entity";
|
||||
import { Collection } from '@mikro-orm/core';
|
||||
import { Group } from '../src/entities/assignments/group.entity';
|
||||
|
||||
export async function setupTestApp(): Promise<void> {
|
||||
dotenv.config({ path: '.env.test' });
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import { AssertionError } from 'node:assert';
|
|||
import { LearningObject } from '../../src/entities/content/learning-object.entity';
|
||||
import { expect } from 'vitest';
|
||||
import { FilteredLearningObject, LearningPath } from '@dwengo-1/common/interfaces/learning-content';
|
||||
import {RequiredEntityData} from "@mikro-orm/core";
|
||||
import { RequiredEntityData } from '@mikro-orm/core';
|
||||
|
||||
// Ignored properties because they belang for example to the class, not to the entity itself.
|
||||
const IGNORE_PROPERTIES = ['parent'];
|
||||
|
|
@ -13,11 +13,7 @@ const IGNORE_PROPERTIES = ['parent'];
|
|||
* @param expected The (previously added) entity we would expect to retrieve
|
||||
* @param propertyPrefix Prefix to append to property in error messages.
|
||||
*/
|
||||
export function expectToBeCorrectEntity<T extends object>(
|
||||
actual: T,
|
||||
expected: T,
|
||||
propertyPrefix = ""
|
||||
): void {
|
||||
export function expectToBeCorrectEntity<T extends object>(actual: T, expected: T, propertyPrefix = ''): void {
|
||||
for (const property in expected) {
|
||||
if (Object.prototype.hasOwnProperty.call(expected, property)) {
|
||||
const prefixedProperty = propertyPrefix + property;
|
||||
|
|
@ -41,16 +37,16 @@ export function expectToBeCorrectEntity<T extends object>(
|
|||
}
|
||||
} else if (typeof expected[property] !== typeof actual[property]) {
|
||||
throw new AssertionError({
|
||||
message: `${prefixedProperty} was expected to have type ${typeof expected[property]},`
|
||||
+ `but had type ${typeof actual[property]}.`,
|
||||
message:
|
||||
`${prefixedProperty} was expected to have type ${typeof expected[property]},` +
|
||||
`but had type ${typeof actual[property]}.`,
|
||||
});
|
||||
} else if (typeof expected[property] === 'object') {
|
||||
expectToBeCorrectEntity(actual[property] as object, expected[property] as object, property);
|
||||
} else {
|
||||
if (expected[property] !== actual[property]) {
|
||||
throw new AssertionError({
|
||||
message: `${prefixedProperty} was expected to be ${expected[property]}, `
|
||||
+ `but was ${actual[property]}.`,
|
||||
message: `${prefixedProperty} was expected to be ${expected[property]}, ` + `but was ${actual[property]}.`,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -94,10 +90,7 @@ export function expectToBeCorrectFilteredLearningObject(filtered: FilteredLearni
|
|||
* @param learningPath The learning path returned by the retriever, service or endpoint
|
||||
* @param expected The learning path that should have been returned.
|
||||
*/
|
||||
export function expectToBeCorrectLearningPath(
|
||||
learningPath: LearningPath,
|
||||
expected: LearningPath
|
||||
): void {
|
||||
export function expectToBeCorrectLearningPath(learningPath: LearningPath, expected: LearningPath): void {
|
||||
expect(learningPath.hruid).toEqual(expected.hruid);
|
||||
expect(learningPath.language).toEqual(expected.language);
|
||||
expect(learningPath.description).toEqual(expected.description);
|
||||
|
|
@ -113,17 +106,18 @@ export function expectToBeCorrectLearningPath(
|
|||
expect(learningPath.image ?? null).toEqual(expected.image ?? null);
|
||||
|
||||
for (const node of expected.nodes) {
|
||||
const correspondingNode = learningPath.nodes.find(it =>
|
||||
node.learningobject_hruid === it.learningobject_hruid && node.language === it.language
|
||||
&& node.version === it.version
|
||||
const correspondingNode = learningPath.nodes.find(
|
||||
(it) => node.learningobject_hruid === it.learningobject_hruid && node.language === it.language && node.version === it.version
|
||||
);
|
||||
expect(correspondingNode).toBeTruthy();
|
||||
expect(Boolean(correspondingNode!.start_node)).toEqual(Boolean(node.start_node));
|
||||
|
||||
for (const transition of node.transitions) {
|
||||
const correspondingTransition = correspondingNode!.transitions.find(it =>
|
||||
it.next.hruid === transition.next.hruid && it.next.language === transition.next.language
|
||||
&& it.next.version === transition.next.version
|
||||
const correspondingTransition = correspondingNode!.transitions.find(
|
||||
(it) =>
|
||||
it.next.hruid === transition.next.hruid &&
|
||||
it.next.language === transition.next.language &&
|
||||
it.next.version === transition.next.version
|
||||
);
|
||||
expect(correspondingTransition).toBeTruthy();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
import {RequiredEntityData} from "@mikro-orm/core";
|
||||
import {loadTestAsset} from "./load-test-asset";
|
||||
import {LearningObject} from "../../src/entities/content/learning-object.entity";
|
||||
import {envVars, getEnvVar} from "../../src/util/envVars";
|
||||
import { RequiredEntityData } from '@mikro-orm/core';
|
||||
import { loadTestAsset } from './load-test-asset';
|
||||
import { LearningObject } from '../../src/entities/content/learning-object.entity';
|
||||
import { envVars, getEnvVar } from '../../src/util/envVars';
|
||||
|
||||
export function getHtmlRenderingForTestLearningObject(learningObject: RequiredEntityData<LearningObject>): string {
|
||||
const userPrefix = getEnvVar(envVars.UserContentPrefix);
|
||||
const cleanedHruid = learningObject.hruid.startsWith(userPrefix)
|
||||
? learningObject.hruid.substring(userPrefix.length)
|
||||
: learningObject.hruid;
|
||||
const cleanedHruid = learningObject.hruid.startsWith(userPrefix) ? learningObject.hruid.substring(userPrefix.length) : learningObject.hruid;
|
||||
return loadTestAsset(`/content/learning-object-resources/${cleanedHruid}/rendering.txt`).toString();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import fs from 'fs';
|
||||
import path from 'node:path';
|
||||
import {fileURLToPath} from "node:url";
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const fileName = fileURLToPath(import.meta.url);
|
||||
const dirName = path.dirname(fileName);
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ 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";
|
||||
import { testLearningPathWithConditions } from '../content/learning-paths.testdata';
|
||||
import { getClassWithTestleerlingAndTestleerkracht } from '../classes/classes.testdata';
|
||||
|
||||
export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assignment[] {
|
||||
assignment01 = em.create(Assignment, {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
import {EntityManager} from '@mikro-orm/core';
|
||||
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";
|
||||
import { getConditionalPathAssignment } from './assignments.testdata';
|
||||
import { getTestleerling1 } from '../users/students.testdata';
|
||||
|
||||
export function makeTestGroups(em: EntityManager, students: Student[], assignments: Assignment[]): Group[] {
|
||||
/*
|
||||
|
|
@ -62,8 +62,8 @@ export function makeTestGroups(em: EntityManager, students: Student[], assignmen
|
|||
group1ConditionalLearningPath = em.create(Group, {
|
||||
assignment: getConditionalPathAssignment(),
|
||||
groupNumber: 1,
|
||||
members: [getTestleerling1()]
|
||||
})
|
||||
members: [getTestleerling1()],
|
||||
});
|
||||
|
||||
return [group01, group02, group03, group04, group05, group1ConditionalLearningPath];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ import { EntityManager } from '@mikro-orm/core';
|
|||
import { Class } from '../../../src/entities/classes/class.entity';
|
||||
import { Student } from '../../../src/entities/users/student.entity';
|
||||
import { Teacher } from '../../../src/entities/users/teacher.entity';
|
||||
import {getTestleerkracht1} from "../users/teachers.testdata";
|
||||
import {getTestleerling1} from "../users/students.testdata";
|
||||
import { getTestleerkracht1 } from '../users/teachers.testdata';
|
||||
import { getTestleerling1 } from '../users/students.testdata';
|
||||
|
||||
export function makeTestClasses(em: EntityManager, students: Student[], teachers: Teacher[]): Class[] {
|
||||
const studentsClass01 = students.slice(0, 8);
|
||||
|
|
@ -47,10 +47,10 @@ export function makeTestClasses(em: EntityManager, students: Student[], teachers
|
|||
});
|
||||
|
||||
classWithTestleerlingAndTestleerkracht = em.create(Class, {
|
||||
classId: "a75298b5-18aa-471d-8eeb-5d77eb989393",
|
||||
classId: 'a75298b5-18aa-471d-8eeb-5d77eb989393',
|
||||
displayName: 'Testklasse',
|
||||
teachers: [getTestleerkracht1()],
|
||||
students: [getTestleerling1()]
|
||||
students: [getTestleerling1()],
|
||||
});
|
||||
|
||||
return [class01, class02, class03, class04, classWithTestleerlingAndTestleerkracht];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
import {EntityManager, RequiredEntityData} from '@mikro-orm/core';
|
||||
import {LearningObject} from '../../../src/entities/content/learning-object.entity';
|
||||
import {Language} from '@dwengo-1/common/util/language';
|
||||
import {DwengoContentType} from '../../../src/services/learning-objects/processing/content-type';
|
||||
import {ReturnValue} from '../../../src/entities/content/return-value.entity';
|
||||
import {envVars, getEnvVar} from "../../../src/util/envVars";
|
||||
import {loadTestAsset} from "../../test-utils/load-test-asset";
|
||||
import {v4} from "uuid";
|
||||
import { EntityManager, RequiredEntityData } from '@mikro-orm/core';
|
||||
import { LearningObject } from '../../../src/entities/content/learning-object.entity';
|
||||
import { Language } from '@dwengo-1/common/util/language';
|
||||
import { DwengoContentType } from '../../../src/services/learning-objects/processing/content-type';
|
||||
import { ReturnValue } from '../../../src/entities/content/return-value.entity';
|
||||
import { envVars, getEnvVar } from '../../../src/util/envVars';
|
||||
import { loadTestAsset } from '../../test-utils/load-test-asset';
|
||||
import { v4 } from 'uuid';
|
||||
|
||||
export function makeTestLearningObjects(em: EntityManager): LearningObject[] {
|
||||
const returnValue: ReturnValue = new ReturnValue();
|
||||
|
|
@ -19,13 +19,19 @@ export function makeTestLearningObjects(em: EntityManager): LearningObject[] {
|
|||
const learningObject05 = em.create(LearningObject, testLearningObject05);
|
||||
|
||||
const learningObjectMultipleChoice = em.create(LearningObject, testLearningObjectMultipleChoice);
|
||||
const learningObjectEssayQuestion= em.create(LearningObject, testLearningObjectEssayQuestion);
|
||||
const learningObjectEssayQuestion = em.create(LearningObject, testLearningObjectEssayQuestion);
|
||||
|
||||
const learningObjectPnNotebooks = em.create(LearningObject, testLearningObjectPnNotebooks);
|
||||
|
||||
return [
|
||||
learningObject01, learningObject02, learningObject03, learningObject04, learningObject05,
|
||||
learningObjectMultipleChoice, learningObjectEssayQuestion, learningObjectPnNotebooks
|
||||
learningObject01,
|
||||
learningObject02,
|
||||
learningObject03,
|
||||
learningObject04,
|
||||
learningObject05,
|
||||
learningObjectMultipleChoice,
|
||||
learningObjectEssayQuestion,
|
||||
learningObjectPnNotebooks,
|
||||
];
|
||||
}
|
||||
|
||||
|
|
@ -164,14 +170,14 @@ export const testLearningObjectMultipleChoice: RequiredEntityData<LearningObject
|
|||
hruid: `${getEnvVar(envVars.UserContentPrefix)}test_multiple_choice`,
|
||||
language: Language.English,
|
||||
version: 1,
|
||||
title: "Self-evaluation",
|
||||
title: 'Self-evaluation',
|
||||
description: "Time to evaluate how well you understand what you've learned so far.",
|
||||
keywords: ["test"],
|
||||
keywords: ['test'],
|
||||
teacherExclusive: false,
|
||||
skosConcepts: [],
|
||||
educationalGoals: [],
|
||||
copyright: "Groep 1 SEL-2 2025",
|
||||
license: "CC0",
|
||||
copyright: 'Groep 1 SEL-2 2025',
|
||||
license: 'CC0',
|
||||
difficulty: 1,
|
||||
estimatedTime: 1,
|
||||
attachments: [],
|
||||
|
|
@ -183,21 +189,21 @@ export const testLearningObjectMultipleChoice: RequiredEntityData<LearningObject
|
|||
returnValue: {
|
||||
callbackUrl: `%SUBMISSION%`,
|
||||
callbackSchema: '["antwoord vraag 1"]',
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
export const testLearningObjectEssayQuestion: RequiredEntityData<LearningObject> = {
|
||||
hruid: `${getEnvVar(envVars.UserContentPrefix)}test_essay_question`,
|
||||
language: Language.English,
|
||||
version: 1,
|
||||
title: "Reflection",
|
||||
description: "Reflect on your learning progress.",
|
||||
keywords: ["test"],
|
||||
title: 'Reflection',
|
||||
description: 'Reflect on your learning progress.',
|
||||
keywords: ['test'],
|
||||
teacherExclusive: false,
|
||||
skosConcepts: [],
|
||||
educationalGoals: [],
|
||||
copyright: "Groep 1 SEL-2 2025",
|
||||
license: "CC0",
|
||||
copyright: 'Groep 1 SEL-2 2025',
|
||||
license: 'CC0',
|
||||
difficulty: 1,
|
||||
estimatedTime: 1,
|
||||
attachments: [],
|
||||
|
|
@ -209,47 +215,47 @@ export const testLearningObjectEssayQuestion: RequiredEntityData<LearningObject>
|
|||
returnValue: {
|
||||
callbackUrl: `%SUBMISSION%`,
|
||||
callbackSchema: '["antwoord vraag 1"]',
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
export const testLearningObjectPnNotebooks: RequiredEntityData<LearningObject> = {
|
||||
hruid: `${getEnvVar(envVars.UserContentPrefix)}pn_werkingnotebooks`,
|
||||
version: 3,
|
||||
language: Language.Dutch,
|
||||
title: "Werken met notebooks",
|
||||
description: "Leren werken met notebooks",
|
||||
keywords: ["Python", "KIKS", "Wiskunde", "STEM", "AI"],
|
||||
title: 'Werken met notebooks',
|
||||
description: 'Leren werken met notebooks',
|
||||
keywords: ['Python', 'KIKS', 'Wiskunde', 'STEM', 'AI'],
|
||||
targetAges: [14, 15, 16, 17, 18],
|
||||
admins: [],
|
||||
copyright: "dwengo",
|
||||
copyright: 'dwengo',
|
||||
educationalGoals: [],
|
||||
license: "dwengo",
|
||||
license: 'dwengo',
|
||||
contentType: DwengoContentType.TEXT_MARKDOWN,
|
||||
difficulty: 3,
|
||||
estimatedTime: 10,
|
||||
uuid: "2adf9929-b424-4650-bf60-186f730d38ab",
|
||||
uuid: '2adf9929-b424-4650-bf60-186f730d38ab',
|
||||
teacherExclusive: false,
|
||||
skosConcepts: [
|
||||
"http://ilearn.ilabt.imec.be/vocab/curr1/s-vaktaal",
|
||||
"http://ilearn.ilabt.imec.be/vocab/curr1/s-digitale-media-en-toepassingen",
|
||||
"http://ilearn.ilabt.imec.be/vocab/curr1/s-computers-en-systemen",
|
||||
'http://ilearn.ilabt.imec.be/vocab/curr1/s-vaktaal',
|
||||
'http://ilearn.ilabt.imec.be/vocab/curr1/s-digitale-media-en-toepassingen',
|
||||
'http://ilearn.ilabt.imec.be/vocab/curr1/s-computers-en-systemen',
|
||||
],
|
||||
attachments: [
|
||||
{
|
||||
name: "dwengo.png",
|
||||
mimeType: "image/png",
|
||||
content: loadTestAsset("/content/learning-object-resources/pn_werkingnotebooks/dwengo.png")
|
||||
name: 'dwengo.png',
|
||||
mimeType: 'image/png',
|
||||
content: loadTestAsset('/content/learning-object-resources/pn_werkingnotebooks/dwengo.png'),
|
||||
},
|
||||
{
|
||||
name: "Knop.png",
|
||||
mimeType: "image/png",
|
||||
content: loadTestAsset("/content/learning-object-resources/pn_werkingnotebooks/Knop.png")
|
||||
}
|
||||
name: 'Knop.png',
|
||||
mimeType: 'image/png',
|
||||
content: loadTestAsset('/content/learning-object-resources/pn_werkingnotebooks/Knop.png'),
|
||||
},
|
||||
],
|
||||
available: false,
|
||||
content: loadTestAsset("/content/learning-object-resources/pn_werkingnotebooks/content.md"),
|
||||
content: loadTestAsset('/content/learning-object-resources/pn_werkingnotebooks/content.md'),
|
||||
returnValue: {
|
||||
callbackUrl: "%SUBMISSION%",
|
||||
callbackSchema: "[]"
|
||||
}
|
||||
}
|
||||
callbackUrl: '%SUBMISSION%',
|
||||
callbackSchema: '[]',
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,40 +1,39 @@
|
|||
import {EntityManager} from '@mikro-orm/core';
|
||||
import {LearningPath} from '../../../src/entities/content/learning-path.entity';
|
||||
import {Language} from '@dwengo-1/common/util/language';
|
||||
import {mapToLearningPath} from "../../../src/services/learning-paths/learning-path-service";
|
||||
import {envVars, getEnvVar} from "../../../src/util/envVars";
|
||||
import {LearningPath as LearningPathDTO} from "@dwengo-1/common/interfaces/learning-content";
|
||||
import { EntityManager } from '@mikro-orm/core';
|
||||
import { LearningPath } from '../../../src/entities/content/learning-path.entity';
|
||||
import { Language } from '@dwengo-1/common/util/language';
|
||||
import { mapToLearningPath } from '../../../src/services/learning-paths/learning-path-service';
|
||||
import { envVars, getEnvVar } from '../../../src/util/envVars';
|
||||
import { LearningPath as LearningPathDTO } from '@dwengo-1/common/interfaces/learning-content';
|
||||
import {
|
||||
testLearningObject01, testLearningObject02, testLearningObject03, testLearningObject04, testLearningObject05,
|
||||
testLearningObject01,
|
||||
testLearningObject02,
|
||||
testLearningObject03,
|
||||
testLearningObject04,
|
||||
testLearningObject05,
|
||||
testLearningObjectEssayQuestion,
|
||||
testLearningObjectMultipleChoice, testLearningObjectPnNotebooks
|
||||
} from "./learning-objects.testdata";
|
||||
testLearningObjectMultipleChoice,
|
||||
testLearningObjectPnNotebooks,
|
||||
} from './learning-objects.testdata';
|
||||
|
||||
export function makeTestLearningPaths(_em: EntityManager): LearningPath[] {
|
||||
const learningPath01 = mapToLearningPath(testLearningPath01, []);
|
||||
const learningPath02 = mapToLearningPath(testLearningPath02, []);
|
||||
|
||||
const partiallyDatabasePartiallyDwengoApiLearningPath
|
||||
= mapToLearningPath(testPartiallyDatabaseAndPartiallyDwengoApiLearningPath, [])
|
||||
const learningPathWithConditions = mapToLearningPath(testLearningPathWithConditions, [])
|
||||
const partiallyDatabasePartiallyDwengoApiLearningPath = mapToLearningPath(testPartiallyDatabaseAndPartiallyDwengoApiLearningPath, []);
|
||||
const learningPathWithConditions = mapToLearningPath(testLearningPathWithConditions, []);
|
||||
|
||||
return [
|
||||
learningPath01,
|
||||
learningPath02,
|
||||
partiallyDatabasePartiallyDwengoApiLearningPath,
|
||||
learningPathWithConditions
|
||||
];
|
||||
return [learningPath01, learningPath02, partiallyDatabasePartiallyDwengoApiLearningPath, learningPathWithConditions];
|
||||
}
|
||||
|
||||
const nowString = new Date().toString();
|
||||
|
||||
export const testLearningPath01: LearningPathDTO = {
|
||||
keywords: "test",
|
||||
keywords: 'test',
|
||||
target_ages: [16, 17, 18],
|
||||
hruid: `${getEnvVar(envVars.UserContentPrefix)}id01`,
|
||||
language: Language.English,
|
||||
title: "repertoire Tool",
|
||||
description: "all about Tool",
|
||||
title: 'repertoire Tool',
|
||||
description: 'all about Tool',
|
||||
nodes: [
|
||||
{
|
||||
learningobject_hruid: testLearningObject01.hruid,
|
||||
|
|
@ -48,10 +47,10 @@ export const testLearningPath01: LearningPathDTO = {
|
|||
next: {
|
||||
hruid: testLearningObject02.hruid,
|
||||
language: testLearningObject02.language,
|
||||
version: testLearningObject02.version
|
||||
}
|
||||
}
|
||||
]
|
||||
version: testLearningObject02.version,
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
learningobject_hruid: testLearningObject02.hruid,
|
||||
|
|
@ -59,18 +58,18 @@ export const testLearningPath01: LearningPathDTO = {
|
|||
version: testLearningObject02.version,
|
||||
created_at: nowString,
|
||||
updatedAt: nowString,
|
||||
transitions: []
|
||||
}
|
||||
]
|
||||
transitions: [],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
export const testLearningPath02: LearningPathDTO = {
|
||||
keywords: "test",
|
||||
keywords: 'test',
|
||||
target_ages: [16, 17, 18],
|
||||
hruid: `${getEnvVar(envVars.UserContentPrefix)}id02`,
|
||||
language: Language.English,
|
||||
title: "repertoire Dire Straits",
|
||||
description: "all about Dire Straits",
|
||||
title: 'repertoire Dire Straits',
|
||||
description: 'all about Dire Straits',
|
||||
nodes: [
|
||||
{
|
||||
learningobject_hruid: testLearningObject03.hruid,
|
||||
|
|
@ -84,10 +83,10 @@ export const testLearningPath02: LearningPathDTO = {
|
|||
next: {
|
||||
hruid: testLearningObject04.hruid,
|
||||
language: testLearningObject04.language,
|
||||
version: testLearningObject04.version
|
||||
}
|
||||
}
|
||||
]
|
||||
version: testLearningObject04.version,
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
learningobject_hruid: testLearningObject04.hruid,
|
||||
|
|
@ -100,10 +99,10 @@ export const testLearningPath02: LearningPathDTO = {
|
|||
next: {
|
||||
hruid: testLearningObject05.hruid,
|
||||
language: testLearningObject05.language,
|
||||
version: testLearningObject05.version
|
||||
}
|
||||
}
|
||||
]
|
||||
version: testLearningObject05.version,
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
learningobject_hruid: testLearningObject05.hruid,
|
||||
|
|
@ -111,17 +110,17 @@ export const testLearningPath02: LearningPathDTO = {
|
|||
version: testLearningObject05.version,
|
||||
created_at: nowString,
|
||||
updatedAt: nowString,
|
||||
transitions: []
|
||||
}
|
||||
]
|
||||
transitions: [],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
export const testPartiallyDatabaseAndPartiallyDwengoApiLearningPath: LearningPathDTO = {
|
||||
hruid: `${getEnvVar(envVars.UserContentPrefix)}pn_werking`,
|
||||
title: "Werken met notebooks",
|
||||
title: 'Werken met notebooks',
|
||||
language: Language.Dutch,
|
||||
description: 'Een korte inleiding tot Python notebooks. Hoe ga je gemakkelijk en efficiënt met de notebooks aan de slag?',
|
||||
keywords: "Python KIKS Wiskunde STEM AI",
|
||||
keywords: 'Python KIKS Wiskunde STEM AI',
|
||||
target_ages: [14, 15, 16, 17, 18],
|
||||
nodes: [
|
||||
{
|
||||
|
|
@ -135,15 +134,15 @@ export const testPartiallyDatabaseAndPartiallyDwengoApiLearningPath: LearningPat
|
|||
{
|
||||
default: true,
|
||||
next: {
|
||||
hruid: "pn_werkingnotebooks2",
|
||||
hruid: 'pn_werkingnotebooks2',
|
||||
language: Language.Dutch,
|
||||
version: 3
|
||||
}
|
||||
}
|
||||
]
|
||||
version: 3,
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
learningobject_hruid: "pn_werkingnotebooks2",
|
||||
learningobject_hruid: 'pn_werkingnotebooks2',
|
||||
language: Language.Dutch,
|
||||
version: 3,
|
||||
created_at: nowString,
|
||||
|
|
@ -152,30 +151,30 @@ export const testPartiallyDatabaseAndPartiallyDwengoApiLearningPath: LearningPat
|
|||
{
|
||||
default: true,
|
||||
next: {
|
||||
hruid: "pn_werkingnotebooks3",
|
||||
hruid: 'pn_werkingnotebooks3',
|
||||
language: Language.Dutch,
|
||||
version: 3
|
||||
}
|
||||
}
|
||||
]
|
||||
version: 3,
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
learningobject_hruid: "pn_werkingnotebooks3",
|
||||
learningobject_hruid: 'pn_werkingnotebooks3',
|
||||
language: Language.Dutch,
|
||||
version: 3,
|
||||
created_at: nowString,
|
||||
updatedAt: nowString,
|
||||
transitions: []
|
||||
}
|
||||
]
|
||||
}
|
||||
transitions: [],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
export const testLearningPathWithConditions: LearningPathDTO = {
|
||||
hruid: `${getEnvVar(envVars.UserContentPrefix)}test_conditions`,
|
||||
language: Language.English,
|
||||
title: 'Example learning path with conditional transitions',
|
||||
description: 'This learning path was made for the purpose of testing conditional transitions',
|
||||
keywords: "test",
|
||||
keywords: 'test',
|
||||
target_ages: [10, 11, 12, 13, 14, 15, 16, 17, 18],
|
||||
nodes: [
|
||||
{
|
||||
|
|
@ -193,8 +192,8 @@ export const testLearningPathWithConditions: LearningPathDTO = {
|
|||
//... we let the student do an extra exercise.
|
||||
hruid: testLearningObject01.hruid,
|
||||
language: testLearningObject01.language,
|
||||
version: testLearningObject01.version
|
||||
}
|
||||
version: testLearningObject01.version,
|
||||
},
|
||||
},
|
||||
{
|
||||
// If the answer to the first question was the second one (I can follow along):
|
||||
|
|
@ -203,10 +202,10 @@ export const testLearningPathWithConditions: LearningPathDTO = {
|
|||
//... we let the student right through to the final question.
|
||||
hruid: testLearningObjectEssayQuestion.hruid,
|
||||
language: testLearningObjectEssayQuestion.language,
|
||||
version: testLearningObjectEssayQuestion.version
|
||||
}
|
||||
}
|
||||
]
|
||||
version: testLearningObjectEssayQuestion.version,
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
learningobject_hruid: testLearningObject01.hruid,
|
||||
|
|
@ -220,10 +219,10 @@ export const testLearningPathWithConditions: LearningPathDTO = {
|
|||
next: {
|
||||
hruid: testLearningObjectEssayQuestion.hruid,
|
||||
language: testLearningObjectEssayQuestion.language,
|
||||
version: testLearningObjectEssayQuestion.version
|
||||
}
|
||||
}
|
||||
]
|
||||
version: testLearningObjectEssayQuestion.version,
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
learningobject_hruid: testLearningObjectEssayQuestion.hruid,
|
||||
|
|
@ -231,7 +230,7 @@ export const testLearningPathWithConditions: LearningPathDTO = {
|
|||
version: testLearningObjectEssayQuestion.version,
|
||||
created_at: nowString,
|
||||
updatedAt: nowString,
|
||||
transitions: []
|
||||
}
|
||||
]
|
||||
}
|
||||
transitions: [],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
|
|
|||
|
|
@ -24,5 +24,5 @@ export function makeTestStudents(em: EntityManager): Student[] {
|
|||
}
|
||||
|
||||
export function getTestleerling1(): Student {
|
||||
return testStudents.find(it => it.username === "testleerling1");
|
||||
return testStudents.find((it) => it.username === 'testleerling1');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,4 +62,3 @@ export function getTeacher04(): Teacher {
|
|||
export function getTestleerkracht1(): Teacher {
|
||||
return testleerkracht1;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue