From 699ebf62b89ad5b7c42cc64c2a153d0e17f140b1 Mon Sep 17 00:00:00 2001 From: Gerald Schmittinger Date: Wed, 12 Mar 2025 19:45:18 +0100 Subject: [PATCH] fix(backend): Commentaar in PR geaddresseerd. --- .../dwengo-api-learning-object-provider.ts | 5 +++-- .../learning-objects/learning-object-service.test.ts | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/backend/src/services/learning-objects/dwengo-api-learning-object-provider.ts b/backend/src/services/learning-objects/dwengo-api-learning-object-provider.ts index 8bd1e0de..37e68c07 100644 --- a/backend/src/services/learning-objects/dwengo-api-learning-object-provider.ts +++ b/backend/src/services/learning-objects/dwengo-api-learning-object-provider.ts @@ -65,14 +65,15 @@ async function fetchLearningObjects(learningPathId: LearningPathIdentifier, full return nodes.map((node) => node.learningobject_hruid); } - return await Promise.all( + const objects = await Promise.all( nodes.map(async (node) => dwengoApiLearningObjectProvider.getLearningObjectById({ hruid: node.learningobject_hruid, language: learningPathId.language, }) ) - ).then((objects) => objects.filter((obj): obj is FilteredLearningObject => obj !== null)); + ); + return objects.filter((obj): obj is FilteredLearningObject => obj !== null); } catch (error) { logger.error('❌ Error fetching learning objects:', error); return []; diff --git a/backend/tests/services/learning-objects/learning-object-service.test.ts b/backend/tests/services/learning-objects/learning-object-service.test.ts index f748d9f3..d80262df 100644 --- a/backend/tests/services/learning-objects/learning-object-service.test.ts +++ b/backend/tests/services/learning-objects/learning-object-service.test.ts @@ -10,7 +10,6 @@ import { EnvVars, getEnvVar } from '../../../src/util/envvars'; import { LearningPath } from '../../../src/entities/content/learning-path.entity'; import learningPathExample from '../../test-assets/learning-paths/pn-werking-example'; -const TEST_LEARNING_OBJECT_TITLE = 'Test title'; const EXPECTED_DWENGO_LEARNING_OBJECT_TITLE = 'Werken met notebooks'; const DWENGO_TEST_LEARNING_OBJECT_ID: LearningObjectIdentifier = { hruid: 'pn_werkingnotebooks', @@ -78,11 +77,12 @@ describe('LearningObjectService', () => { const result = await learningObjectService.getLearningObjectHTML(DWENGO_TEST_LEARNING_OBJECT_ID); expect(result).not.toBeNull(); - const htmlFromDwengoApi = await fetch( + const responseFromDwengoApi = await fetch( getEnvVar(EnvVars.LearningContentRepoApiBaseUrl) + `/learningObject/getRaw?hruid=${DWENGO_TEST_LEARNING_OBJECT_ID.hruid}&language=${DWENGO_TEST_LEARNING_OBJECT_ID.language}&version=${DWENGO_TEST_LEARNING_OBJECT_ID.version}` - ).then((it) => it.text()); - expect(result).toEqual(htmlFromDwengoApi); + ); + const responseHtml = await responseFromDwengoApi.text(); + expect(result).toEqual(responseHtml); } ); it('returns null when queried with a non-existing identifier', async () => {