EW-1090: Fix for componentLernStoreImpl implemented

apps/server/src/modules/common-cartridge/common-cartridge-client/lesson-client/dto/component-lernstore-props.dto.ts

@@ -1,9 +1,13 @@
 import { ComponentLernstorePropsImpl } from '../lessons-api-client';
+import { LessonResourcesDto } from './lesson-resources.dto';
 
 export class ComponentLernstorePropsDto {
-	public resources: string[];
+	public resources: LessonResourcesDto[];
 
 	constructor(lernstoreContent: ComponentLernstorePropsImpl) {
-		this.resources = lernstoreContent.resources;
+		this.resources = [];
+		for (const resource of lernstoreContent.resources) {
+			this.resources.push(new LessonResourcesDto(resource));
+		}
 	}
 }

apps/server/src/modules/common-cartridge/common-cartridge-client/lesson-client/dto/lesson-resources.dto.ts

@@ -0,0 +1,21 @@
+import { LessonResources } from '../lessons-api-client';
+
+export class LessonResourcesDto {
+	client: string;
+
+	description: string;
+
+	merlinReference: string;
+
+	title: string;
+
+	url: string;
+
+	constructor(lessonResources: LessonResources) {
+		this.client = lessonResources.client;
+		this.description = lessonResources.description;
+		this.merlinReference = lessonResources.merlinReference;
+		this.title = lessonResources.title;
+		this.url = lessonResources.url;
+	}
+}

apps/server/src/modules/common-cartridge/common-cartridge-client/lesson-client/lessons-api-client/.openapi-generator/FILES

@@ -1,6 +1,5 @@
 .gitignore
 .npmignore
-.openapi-generator-ignore
 api.ts
 api/lesson-api.ts
 base.ts
@@ -15,10 +14,8 @@ models/component-lernstore-props-impl.ts
 models/component-nexboard-props-impl.ts
 models/component-text-props-impl.ts
 models/index.ts
-models/lesson-content-response-content.ts
 models/lesson-content-response.ts
 models/lesson-linked-task-response.ts
-models/lesson-metadata-list-response.ts
-models/lesson-metadata-response.ts
+models/lesson-resources.ts
 models/lesson-response.ts
 models/material-response.ts

apps/server/src/modules/common-cartridge/common-cartridge-client/lesson-client/lessons-api-client/api/lesson-api.ts

@@ -170,39 +170,13 @@ export const LessonApiFactory = function (configuration?: Configuration, basePat
     };
 };
 
-/**
- * LessonApi - interface
- * @export
- * @interface LessonApi
- */
-export interface LessonApiInterface {
-    /**
-     * 
-     * @param {string} lessonId The id of the lesson.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof LessonApiInterface
-     */
-    lessonControllerGetLesson(lessonId: string, options?: RawAxiosRequestConfig): AxiosPromise<LessonResponse>;
-
-    /**
-     * 
-     * @param {string} lessonId The id of the lesson.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof LessonApiInterface
-     */
-    lessonControllerGetLessonTasks(lessonId: string, options?: RawAxiosRequestConfig): AxiosPromise<Array<LessonLinkedTaskResponse>>;
-
-}
-
 /**
  * LessonApi - object-oriented interface
  * @export
  * @class LessonApi
  * @extends {BaseAPI}
  */
-export class LessonApi extends BaseAPI implements LessonApiInterface {
+export class LessonApi extends BaseAPI {
     /**
      * 
      * @param {string} lessonId The id of the lesson.

apps/server/src/modules/common-cartridge/common-cartridge-client/lesson-client/lessons-api-client/base.ts

@@ -19,7 +19,7 @@ import type { Configuration } from './configuration';
 import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
 import globalAxios from 'axios';
 
-export const BASE_PATH = "http://localhost/api/v3".replace(/\/+$/, "");
+export const BASE_PATH = "http://localhost:3030/api/v3".replace(/\/+$/, "");
 
 /**
  *

apps/server/src/modules/common-cartridge/common-cartridge-client/lesson-client/lessons-api-client/models/component-lernstore-props-impl.ts

@@ -13,6 +13,9 @@
  */
 
 
+// May contain unused imports in some cases
+// @ts-ignore
+import type { LessonResources } from './lesson-resources';
 
 /**
  * 
@@ -22,9 +25,9 @@
 export interface ComponentLernstorePropsImpl {
     /**
      * resources of a Lernstore component
-     * @type {Array<string>}
+     * @type {Array<LessonResources>}
      * @memberof ComponentLernstorePropsImpl
      */
-    'resources': Array<string>;
+    'resources': Array<LessonResources>;
 }
 

apps/server/src/modules/common-cartridge/common-cartridge-client/lesson-client/lessons-api-client/models/index.ts

@@ -5,9 +5,7 @@ export * from './component-lernstore-props-impl';
 export * from './component-nexboard-props-impl';
 export * from './component-text-props-impl';
 export * from './lesson-content-response';
-export * from './lesson-content-response-content';
 export * from './lesson-linked-task-response';
-export * from './lesson-metadata-list-response';
-export * from './lesson-metadata-response';
+export * from './lesson-resources';
 export * from './lesson-response';
 export * from './material-response';

apps/server/src/modules/common-cartridge/common-cartridge-client/lesson-client/lessons-api-client/models/lesson-content-response.ts

@@ -53,7 +53,7 @@ export interface LessonContentResponse {
      * @type {string}
      * @memberof LessonContentResponse
      */
-    'component': LessonContentResponseComponent;
+    'component': LessonContentResponseComponentEnum;
     /**
      * 
      * @type {boolean}
@@ -62,15 +62,15 @@ export interface LessonContentResponse {
     'hidden': boolean;
 }
 
-export const LessonContentResponseComponent = {
-    ETHERPAD: 'Etherpad',
-    GEO_GEBRA: 'geoGebra',
-    INTERNAL: 'internal',
-    RESOURCES: 'resources',
-    TEXT: 'text',
-    NEX_BOARD: 'neXboard'
+export const LessonContentResponseComponentEnum = {
+    Etherpad: 'Etherpad',
+    GeoGebra: 'geoGebra',
+    Internal: 'internal',
+    Lernstore: 'lernstore',
+    Text: 'text',
+    NeXboard: 'neXboard'
 } as const;
 
-export type LessonContentResponseComponent = typeof LessonContentResponseComponent[keyof typeof LessonContentResponseComponent];
+export type LessonContentResponseComponentEnum = typeof LessonContentResponseComponentEnum[keyof typeof LessonContentResponseComponentEnum];
 
 

apps/server/src/modules/common-cartridge/common-cartridge-client/lesson-client/lessons-api-client/models/lesson-linked-task-response.ts

@@ -37,7 +37,7 @@ export interface LessonLinkedTaskResponse {
      * @type {string}
      * @memberof LessonLinkedTaskResponse
      */
-    'descriptionInputFormat': LessonLinkedTaskResponseDescriptionInputFormat;
+    'descriptionInputFormat': LessonLinkedTaskResponseDescriptionInputFormatEnum;
     /**
      * 
      * @type {string}
@@ -94,13 +94,13 @@ export interface LessonLinkedTaskResponse {
     'finishedIds': Array<string>;
 }
 
-export const LessonLinkedTaskResponseDescriptionInputFormat = {
-    PLAIN_TEXT: 'plainText',
-    RICH_TEXT_CK5_SIMPLE: 'richTextCk5Simple',
-    RICH_TEXT_CK4: 'richTextCk4',
-    RICH_TEXT_CK5: 'richTextCk5'
+export const LessonLinkedTaskResponseDescriptionInputFormatEnum = {
+    PlainText: 'plainText',
+    RichTextCk5Simple: 'richTextCk5Simple',
+    RichTextCk4: 'richTextCk4',
+    RichTextCk5: 'richTextCk5'
 } as const;
 
-export type LessonLinkedTaskResponseDescriptionInputFormat = typeof LessonLinkedTaskResponseDescriptionInputFormat[keyof typeof LessonLinkedTaskResponseDescriptionInputFormat];
+export type LessonLinkedTaskResponseDescriptionInputFormatEnum = typeof LessonLinkedTaskResponseDescriptionInputFormatEnum[keyof typeof LessonLinkedTaskResponseDescriptionInputFormatEnum];
 
 

apps/server/src/modules/common-cartridge/common-cartridge-client/lesson-client/lessons-api-client/models/lesson-resources.ts

@@ -0,0 +1,54 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Schulcloud-Verbund-Software Server API
+ * This is v3 of Schulcloud-Verbund-Software Server. Checkout /docs for v1.
+ *
+ * The version of the OpenAPI document: 3.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+/**
+ * 
+ * @export
+ * @interface LessonResources
+ */
+export interface LessonResources {
+    /**
+     * client
+     * @type {string}
+     * @memberof LessonResources
+     */
+    'client': string;
+    /**
+     * description
+     * @type {string}
+     * @memberof LessonResources
+     */
+    'description': string;
+    /**
+     * merlinReference
+     * @type {string}
+     * @memberof LessonResources
+     */
+    'merlinReference': string;
+    /**
+     * title
+     * @type {string}
+     * @memberof LessonResources
+     */
+    'title': string;
+    /**
+     * url
+     * @type {string}
+     * @memberof LessonResources
+     */
+    'url': string;
+}
+

apps/server/src/modules/common-cartridge/common-cartridge-client/lesson-client/mapper/lesson-dto.mapper.spec.ts

@@ -4,14 +4,14 @@ import {
 	LessonContentResponse,
 	LessonResponse,
 	LessonLinkedTaskResponse,
-	LessonLinkedTaskResponseDescriptionInputFormat,
+	LessonLinkedTaskResponseDescriptionInputFormatEnum,
 	ComponentEtherpadPropsImpl,
 	ComponentGeogebraPropsImpl,
 	ComponentInternalPropsImpl,
 	ComponentTextPropsImpl,
 	ComponentLernstorePropsImpl,
 	ComponentNexboardPropsImpl,
-	LessonContentResponseComponent,
+	LessonContentResponseComponentEnum,
 } from '../lessons-api-client';
 import { LessonDtoMapper } from './lesson-dto.mapper';
 import { LessonDto } from '../dto';
@@ -183,11 +183,11 @@ describe('LessonDtoMapper', () => {
 		describe('when mapping LessonResponse to lesson DTO with lernstore content', () => {
 			const setup = () => {
 				const lessonContentResponse: LessonContentResponse = {
-					content: { resources: [faker.internet.url(), faker.lorem.text()] } as ComponentLernstorePropsImpl,
+					content: { resources: [faker.internet.url(), faker.lorem.text()] } as unknown as ComponentLernstorePropsImpl,
 					_id: faker.string.uuid(),
 					id: faker.string.uuid(),
 					title: faker.lorem.sentence(),
-					component: faker.helpers.arrayElement(['resources']),
+					component: faker.helpers.arrayElement(['lernstore']),
 					hidden: faker.datatype.boolean(),
 				};
 
@@ -212,7 +212,7 @@ describe('LessonDtoMapper', () => {
 				const result = LessonDtoMapper.mapToLessonDto(lessonResponse);
 
 				expect(result).toBeInstanceOf(LessonDto);
-				expect(result.contents[0].component).toEqual('resources');
+				expect(result.contents[0].component).toEqual('lernstore');
 				expect(result.contents[0].content).toBeInstanceOf(ComponentLernstorePropsDto);
 			});
 		});
@@ -271,7 +271,7 @@ describe('LessonDtoMapper', () => {
 					_id: faker.string.uuid(),
 					id: faker.string.uuid(),
 					title: faker.lorem.sentence(),
-					component: faker.helpers.arrayElement(['unknown']) as unknown as LessonContentResponseComponent,
+					component: faker.helpers.arrayElement(['unknown']) as unknown as LessonContentResponseComponentEnum,
 					hidden: faker.datatype.boolean(),
 				};
 
@@ -306,7 +306,7 @@ describe('LessonDtoMapper', () => {
 				const lessonLinkedTaskResponse: LessonLinkedTaskResponse = {
 					name: faker.lorem.sentence(),
 					description: faker.lorem.sentence(),
-					descriptionInputFormat: LessonLinkedTaskResponseDescriptionInputFormat.PLAIN_TEXT,
+					descriptionInputFormat: LessonLinkedTaskResponseDescriptionInputFormatEnum.PlainText,
 					availableDate: faker.date.recent().toString(),
 					dueDate: faker.date.future().toString(),
 					private: faker.datatype.boolean(),

apps/server/src/modules/common-cartridge/common-cartridge-client/lesson-client/mapper/lesson-dto.mapper.ts

@@ -13,7 +13,7 @@ import {
 	ComponentNexboardPropsImpl,
 	ComponentTextPropsImpl,
 	LessonContentResponse,
-	LessonContentResponseComponent,
+	LessonContentResponseComponentEnum,
 	LessonLinkedTaskResponse,
 	LessonResponse,
 	MaterialResponse,
@@ -73,47 +73,47 @@ export class LessonDtoMapper {
 
 	private static mapToLessenContentDto(lessonContentResponse: LessonContentResponse): LessonContentDto | null {
 		switch (lessonContentResponse.component) {
-			case LessonContentResponseComponent.TEXT:
+			case LessonContentResponseComponentEnum.Text:
 				return new LessonContentDto({
 					id: lessonContentResponse.id,
 					title: lessonContentResponse.title,
 					component: lessonContentResponse.component,
 					hidden: lessonContentResponse.hidden,
 					content: new ComponentTextPropsDto(lessonContentResponse.content as ComponentTextPropsImpl),
 				});
-			case LessonContentResponseComponent.ETHERPAD:
+			case LessonContentResponseComponentEnum.Etherpad:
 				return new LessonContentDto({
 					id: lessonContentResponse.id,
 					title: lessonContentResponse.title,
 					component: lessonContentResponse.component,
 					hidden: lessonContentResponse.hidden,
 					content: new ComponentEtherpadPropsDto(lessonContentResponse.content as ComponentEtherpadPropsImpl),
 				});
-			case LessonContentResponseComponent.GEO_GEBRA:
+			case LessonContentResponseComponentEnum.GeoGebra:
 				return new LessonContentDto({
 					id: lessonContentResponse.id,
 					title: lessonContentResponse.title,
 					component: lessonContentResponse.component,
 					hidden: lessonContentResponse.hidden,
 					content: new ComponentGeogebraPropsDto(lessonContentResponse.content as ComponentGeogebraPropsImpl),
 				});
-			case LessonContentResponseComponent.INTERNAL:
+			case LessonContentResponseComponentEnum.Internal:
 				return new LessonContentDto({
 					id: lessonContentResponse.id,
 					title: lessonContentResponse.title,
 					component: lessonContentResponse.component,
 					hidden: lessonContentResponse.hidden,
 					content: new ComponentInternalPropsDto(lessonContentResponse.content as ComponentInternalPropsImpl),
 				});
-			case LessonContentResponseComponent.RESOURCES:
+			case LessonContentResponseComponentEnum.Lernstore:
 				return new LessonContentDto({
 					id: lessonContentResponse.id,
 					title: lessonContentResponse.title,
 					component: lessonContentResponse.component,
 					hidden: lessonContentResponse.hidden,
 					content: new ComponentLernstorePropsDto(lessonContentResponse.content as ComponentLernstorePropsImpl),
 				});
-			case LessonContentResponseComponent.NEX_BOARD:
+			case LessonContentResponseComponentEnum.NeXboard:
 				return new LessonContentDto({
 					id: lessonContentResponse.id,
 					title: lessonContentResponse.title,