fixing merge errors

apps/server/src/infra/courses-client/dto/courses-common-cartridge-metadata.dto.ts

@@ -0,0 +1,16 @@
+export class CourseCommonCartridgeMetadataDto {
+	public id: string;
+
+	public courseName: string;
+
+	public creationDate?: string;
+
+	public copyRightOwners: Array<string>;
+
+	constructor(props: CourseCommonCartridgeMetadataDto) {
+		this.id = props.id;
+		this.courseName = props.courseName;
+		this.creationDate = props.creationDate;
+		this.copyRightOwners = props.copyRightOwners;
+	}
+}

apps/server/src/infra/courses-client/dto/index.ts

@@ -0,0 +1 @@
+export { CourseCommonCartridgeMetadataDto } from './courses-common-cartridge-metadata.dto';

apps/server/src/modules/common-cartridge/service/common-cartridge-export.service.spec.ts

@@ -51,7 +51,7 @@ describe('CommonCartridgeExportService', () => {
 		exportTasks: boolean,
 		exportColumnBoards: boolean
 	) => {
-		const courseMetadata: CourseCommonCartridgeMetadataDto = courseMetadataFactory.build();
+		const courseMetadata = courseMetadataFactory.build();
 		const lessons = lessonFactory.buildList(2);
 		const [lesson] = lessons;
 		lesson.courseId = courseMetadata.id;

apps/server/src/modules/common-cartridge/service/common-cartridge-export.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { CoursesClientAdapter } from '@infra/courses-client';
+import { CourseCommonCartridgeMetadataDto } from '@infra/courses-client/dto';
 import { BoardClientAdapter, BoardSkeletonDto, ColumnSkeletonDto } from '../common-cartridge-client/board-client';
 import { CardClientAdapter } from '../common-cartridge-client/card-client';
 import { CourseRoomsClientAdapter } from '../common-cartridge-client/room-client';

apps/server/src/modules/common-cartridge/service/common-cartridge.mapper.ts

@@ -1,5 +1,5 @@
 import sanitizeHtml from 'sanitize-html';
-import { CourseCommonCartridgeMetadataDto } from '../common-cartridge-client/course-client';
+import { CourseCommonCartridgeMetadataDto } from '@infra/courses-client/dto';
 import {
 	LessonContentDto,
 	LessonContentDtoComponentValues,

apps/server/src/modules/common-cartridge/testing/common-cartridge-dtos.factory.ts

@@ -1,6 +1,6 @@
 import { faker } from '@faker-js/faker';
 import { Factory } from 'fishery';
-import { CourseCommonCartridgeMetadataDto } from '../common-cartridge-client/course-client';
+import { CourseCommonCartridgeMetadataDto } from '@infra/courses-client/dto';
 import { LessonContentDto, LessonDto, LessonLinkedTaskDto } from '../common-cartridge-client/lesson-client/dto';
 import { BoardSkeletonDto, CardSkeletonDto, ColumnSkeletonDto } from '../common-cartridge-client/board-client';
 import { CardListResponseDto } from '../common-cartridge-client/card-client/dto/card-list-response.dto';