diff --git a/backend/src/controllers/learning-objects.ts b/backend/src/controllers/learning-objects.ts index 18bf5f26..c4dd8d08 100644 --- a/backend/src/controllers/learning-objects.ts +++ b/backend/src/controllers/learning-objects.ts @@ -1,7 +1,7 @@ import { Request, Response } from 'express'; import { FALLBACK_LANG } from '../config.js'; import {FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier} from '../interfaces/learning-content'; -import learningObjectService from "../services/learning-content/learning-object-service"; +import learningObjectService from "../services/learning-objects/learning-object-service"; import {EnvVars, getEnvVar} from "../util/envvars"; import {Language} from "../entities/content/language"; import {BadRequestException} from "../exceptions"; diff --git a/backend/src/controllers/learning-paths.ts b/backend/src/controllers/learning-paths.ts index 593fd695..cb5ae07e 100644 --- a/backend/src/controllers/learning-paths.ts +++ b/backend/src/controllers/learning-paths.ts @@ -1,7 +1,7 @@ import { Request, Response } from 'express'; import { themes } from '../data/themes.js'; import { FALLBACK_LANG } from '../config.js'; -import learningPathService from "../services/learning-content/learning-path-service"; +import learningPathService from "../services/learning-paths/learning-path-service"; import {NotFoundException} from "../exceptions"; /** diff --git a/backend/src/services/learning-content/dwengo-api/dwengo-api-learning-object-provider.ts b/backend/src/services/learning-objects/dwengo-api-learning-object-provider.ts similarity index 94% rename from backend/src/services/learning-content/dwengo-api/dwengo-api-learning-object-provider.ts rename to backend/src/services/learning-objects/dwengo-api-learning-object-provider.ts index 981e073b..bef08dfe 100644 --- a/backend/src/services/learning-content/dwengo-api/dwengo-api-learning-object-provider.ts +++ b/backend/src/services/learning-objects/dwengo-api-learning-object-provider.ts @@ -1,13 +1,13 @@ -import { DWENGO_API_BASE } from '../../../config.js'; -import { fetchWithLogging } from '../../../util/apiHelper.js'; +import { DWENGO_API_BASE } from '../../config.js'; +import { fetchWithLogging } from '../../util/apiHelper.js'; import { FilteredLearningObject, LearningObjectIdentifier, LearningObjectMetadata, LearningObjectNode, LearningPathIdentifier, LearningPathResponse, -} from '../../../interfaces/learning-content.js'; -import dwengoApiLearningPathProvider from './dwengo-api-learning-path-provider.js'; -import {LearningObjectProvider} from "../learning-object-provider"; +} from '../../interfaces/learning-content.js'; +import dwengoApiLearningPathProvider from '../learning-paths/dwengo-api-learning-path-provider.js'; +import {LearningObjectProvider} from "./learning-object-provider"; /** * Helper function to convert the learning object metadata retrieved from the API to a FilteredLearningObject which diff --git a/backend/src/services/learning-content/learning-object-provider.ts b/backend/src/services/learning-objects/learning-object-provider.ts similarity index 100% rename from backend/src/services/learning-content/learning-object-provider.ts rename to backend/src/services/learning-objects/learning-object-provider.ts diff --git a/backend/src/services/learning-content/learning-object-service.ts b/backend/src/services/learning-objects/learning-object-service.ts similarity index 93% rename from backend/src/services/learning-content/learning-object-service.ts rename to backend/src/services/learning-objects/learning-object-service.ts index 4daedb79..587e8968 100644 --- a/backend/src/services/learning-content/learning-object-service.ts +++ b/backend/src/services/learning-objects/learning-object-service.ts @@ -3,7 +3,7 @@ import { LearningObjectIdentifier, LearningPathIdentifier } from "../../interfaces/learning-content"; -import dwengoApiLearningObjectProvider from "./dwengo-api/dwengo-api-learning-object-provider"; +import dwengoApiLearningObjectProvider from "./dwengo-api-learning-object-provider"; import {LearningObjectProvider} from "./learning-object-provider"; function getProvider(id: LearningObjectIdentifier): LearningObjectProvider { diff --git a/backend/src/services/learning-content/dwengo-api/dwengo-api-learning-path-provider.ts b/backend/src/services/learning-paths/dwengo-api-learning-path-provider.ts similarity index 88% rename from backend/src/services/learning-content/dwengo-api/dwengo-api-learning-path-provider.ts rename to backend/src/services/learning-paths/dwengo-api-learning-path-provider.ts index 5811398c..ae6dff0a 100644 --- a/backend/src/services/learning-content/dwengo-api/dwengo-api-learning-path-provider.ts +++ b/backend/src/services/learning-paths/dwengo-api-learning-path-provider.ts @@ -1,10 +1,10 @@ -import { fetchWithLogging } from '../../../util/apiHelper.js'; -import { DWENGO_API_BASE } from '../../../config.js'; +import { fetchWithLogging } from '../../util/apiHelper.js'; +import { DWENGO_API_BASE } from '../../config.js'; import { LearningPath, LearningPathResponse, -} from '../../../interfaces/learning-content.js'; -import {LearningPathProvider} from "../learning-path-provider"; +} from '../../interfaces/learning-content.js'; +import {LearningPathProvider} from "./learning-path-provider"; const dwengoApiLearningPathProvider: LearningPathProvider = { async fetchLearningPaths( diff --git a/backend/src/services/learning-content/learning-path-provider.ts b/backend/src/services/learning-paths/learning-path-provider.ts similarity index 100% rename from backend/src/services/learning-content/learning-path-provider.ts rename to backend/src/services/learning-paths/learning-path-provider.ts diff --git a/backend/src/services/learning-content/learning-path-service.ts b/backend/src/services/learning-paths/learning-path-service.ts similarity index 90% rename from backend/src/services/learning-content/learning-path-service.ts rename to backend/src/services/learning-paths/learning-path-service.ts index 0bb925bf..fd37cd38 100644 --- a/backend/src/services/learning-content/learning-path-service.ts +++ b/backend/src/services/learning-paths/learning-path-service.ts @@ -1,5 +1,5 @@ import {LearningPath, LearningPathResponse} from "../../interfaces/learning-content"; -import dwengoApiLearningPathProvider from "./dwengo-api/dwengo-api-learning-path-provider"; +import dwengoApiLearningPathProvider from "./dwengo-api-learning-path-provider"; /** * Service providing access to data about learning paths from the appropriate data source (database or Dwengo-api)