From e660c185b53d1cb9883c6f089bc632fb6d739b2f Mon Sep 17 00:00:00 2001 From: Gerald Schmittinger Date: Mon, 3 Mar 2025 22:21:47 +0100 Subject: [PATCH] fix(backend): Forgot to adjust some files. --- backend/src/controllers/learningObjects.ts | 12 ++++-------- backend/src/controllers/learningPaths.ts | 9 +++------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/backend/src/controllers/learningObjects.ts b/backend/src/controllers/learningObjects.ts index e0a7cd4a..2455b49c 100644 --- a/backend/src/controllers/learningObjects.ts +++ b/backend/src/controllers/learningObjects.ts @@ -1,11 +1,7 @@ import { Request, Response } from 'express'; -import { - getLearningObjectById, - getLearningObjectIdsFromPath, - getLearningObjectsFromPath, -} from '../services/learning-content/dwengo-api/dwengo-api-learning-object-provider.js'; import { FALLBACK_LANG } from '../config.js'; import { FilteredLearningObject } from '../interfaces/learningContent'; +import learningObjectService from "../services/learning-content/learning-object-service"; export async function getAllLearningObjects( req: Request, @@ -23,9 +19,9 @@ export async function getAllLearningObjects( let learningObjects: FilteredLearningObject[] | string[]; if (full) { - learningObjects = await getLearningObjectsFromPath(hruid, language); + learningObjects = await learningObjectService.getLearningObjectsFromPath(hruid, language); } else { - learningObjects = await getLearningObjectIdsFromPath( + learningObjects = await learningObjectService.getLearningObjectIdsFromPath( hruid, language ); @@ -51,7 +47,7 @@ export async function getLearningObject( return; } - const learningObject = await getLearningObjectById(hruid, language); + const learningObject = await learningObjectService.getLearningObjectById(hruid, language); res.json(learningObject); } catch (error) { console.error('Error fetching learning object:', error); diff --git a/backend/src/controllers/learningPaths.ts b/backend/src/controllers/learningPaths.ts index f05532d4..af521157 100644 --- a/backend/src/controllers/learningPaths.ts +++ b/backend/src/controllers/learningPaths.ts @@ -1,10 +1,7 @@ import { Request, Response } from 'express'; import { themes } from '../data/themes.js'; import { FALLBACK_LANG } from '../config.js'; -import { - fetchLearningPaths, - searchLearningPaths, -} from '../services/learning-content/dwengo-api/dwengo-api-learning-path-provider.js'; +import learningPathService from "../services/learning-content/learning-path-service"; /** * Fetch learning paths based on query parameters. */ @@ -37,7 +34,7 @@ export async function getLearningPaths( return; } } else if (searchQuery) { - const searchResults = await searchLearningPaths( + const searchResults = await learningPathService.searchLearningPaths( searchQuery, language ); @@ -49,7 +46,7 @@ export async function getLearningPaths( }); } - const learningPaths = await fetchLearningPaths( + const learningPaths = await learningPathService.fetchLearningPaths( hruidList, language, `HRUIDs: ${hruidList.join(', ')}`