tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

fix(backend): Forgot to adjust some files.

Browse source
This commit is contained in:
Gerald Schmittinger 2025-03-03 22:21:47 +01:00
parent d7728ddd03
commit e660c185b5
2 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/src/controllers/learningObjects.ts
View file

@ -1,11 +1,7 @@
import { Request, Response } from 'express'; 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 { FALLBACK_LANG } from '../config.js';
import { FilteredLearningObject } from '../interfaces/learningContent'; import { FilteredLearningObject } from '../interfaces/learningContent';
import learningObjectService from "../services/learning-content/learning-object-service";
export async function getAllLearningObjects( export async function getAllLearningObjects(
req: Request, req: Request,
@ -23,9 +19,9 @@ export async function getAllLearningObjects(
let learningObjects: FilteredLearningObject[] | string[]; let learningObjects: FilteredLearningObject[] | string[];
if (full) { if (full) {
learningObjects = await getLearningObjectsFromPath(hruid, language); learningObjects = await learningObjectService.getLearningObjectsFromPath(hruid, language);
} else { } else {
learningObjects = await getLearningObjectIdsFromPath( learningObjects = await learningObjectService.getLearningObjectIdsFromPath(
hruid, hruid,
language language
); );
@ -51,7 +47,7 @@ export async function getLearningObject(
return; return;
} }
const learningObject = await getLearningObjectById(hruid, language); const learningObject = await learningObjectService.getLearningObjectById(hruid, language);
res.json(learningObject); res.json(learningObject);
} catch (error) { } catch (error) {
console.error('Error fetching learning object:', error); console.error('Error fetching learning object:', error);

9
backend/src/controllers/learningPaths.ts
View file

@ -1,10 +1,7 @@
import { Request, Response } from 'express'; import { Request, Response } from 'express';
import { themes } from '../data/themes.js'; import { themes } from '../data/themes.js';
import { FALLBACK_LANG } from '../config.js'; import { FALLBACK_LANG } from '../config.js';
import { import learningPathService from "../services/learning-content/learning-path-service";
fetchLearningPaths,
searchLearningPaths,
} from '../services/learning-content/dwengo-api/dwengo-api-learning-path-provider.js';
/** /**
* Fetch learning paths based on query parameters. * Fetch learning paths based on query parameters.
*/ */
@ -37,7 +34,7 @@ export async function getLearningPaths(
return; return;
} }
} else if (searchQuery) { } else if (searchQuery) {
const searchResults = await searchLearningPaths( const searchResults = await learningPathService.searchLearningPaths(
searchQuery, searchQuery,
language language
); );
@ -49,7 +46,7 @@ export async function getLearningPaths(
}); });
} }
const learningPaths = await fetchLearningPaths( const learningPaths = await learningPathService.fetchLearningPaths(
hruidList, hruidList,
language, language,
`HRUIDs: ${hruidList.join(', ')}` `HRUIDs: ${hruidList.join(', ')}`