fixing imports

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

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

apps/server/src/modules/common-cartridge/common-cartridge.module.ts

@@ -1,4 +1,5 @@
 import { Configuration } from '@hpi-schul-cloud/commons';
+import { CoursesClientModule } from '@infra/courses-client';
 import { MikroOrmModule } from '@mikro-orm/nestjs';
 import { FilesStorageClientModule } from '@modules/files-storage-client';
 import { Module } from '@nestjs/common';
@@ -8,7 +9,6 @@ import { DB_PASSWORD, DB_URL, DB_USERNAME } from '@src/config';
 import { RabbitMQWrapperModule } from '@src/infra/rabbitmq';
 import { BoardClientModule } from './common-cartridge-client/board-client';
 import { CardClientModule } from './common-cartridge-client/card-client/card-client.module';
-import { CoursesClientModule } from './common-cartridge-client/course-client';
 import { LessonClientModule } from './common-cartridge-client/lesson-client/lesson-client.module';
 import { CourseRoomsModule } from './common-cartridge-client/room-client';
 import { CommonCartridgeExportService, CommonCartridgeImportService } from './service';
@@ -18,6 +18,7 @@ import { CommonCartridgeUc } from './uc/common-cartridge.uc';
 	imports: [
 		RabbitMQWrapperModule,
 		FilesStorageClientModule,
+		CoursesClientModule,
 		MikroOrmModule.forRoot({
 			...defaultMikroOrmOptions,
 			type: 'mongo',
@@ -32,13 +33,9 @@ import { CommonCartridgeUc } from './uc/common-cartridge.uc';
 		CourseRoomsModule.register({
 			basePath: `${Configuration.get('API_HOST') as string}/v3/`,
 		}),
-
 		CardClientModule.register({
 			basePath: `${Configuration.get('API_HOST') as string}/v3/`,
 		}),
-		CoursesClientModule.register({
-			basePath: `${Configuration.get('API_HOST') as string}/v3/`,
-		}),
 		LessonClientModule.register({
 			basePath: `${Configuration.get('API_HOST') as string}/v3/`,
 		}),

apps/server/src/modules/common-cartridge/controller/common-cartridge.controller.ts

@@ -25,7 +25,7 @@ export class CommonCartridgeController {
 	constructor(private readonly commonCartridgeUC: CommonCartridgeUc) {}
 
 	@Get('export/:parentId')
-	public async exportCourse(@Param() exportCourseParams: ExportCourseParams): Promise<CourseExportBodyResponse> {
+	public exportCourse(@Param() exportCourseParams: ExportCourseParams): Promise<CourseExportBodyResponse> {
 		return this.commonCartridgeUC.exportCourse(exportCourseParams.parentId);
 	}
 
@@ -44,6 +44,6 @@ export class CommonCartridgeController {
 		@UploadedFile(CommonCartridgeFileValidatorPipe)
 		file: Express.Multer.File
 	): Promise<void> {
-		return this.commonCartridgeUC.importCourse(file);
+		await this.commonCartridgeUC.importCourse(file.buffer);
 	}
 }

apps/server/src/modules/common-cartridge/controller/dto/common-cartridge-import-body.params.ts

@@ -7,5 +7,5 @@ export class CommonCartridgeImportBodyParams {
 		required: true,
 		description: 'The Common Cartridge file to import.',
 	})
-	file!: Express.Multer.File;
+	public file!: Express.Multer.File;
 }

apps/server/src/modules/common-cartridge/controller/dto/course-export-body.response.ts

@@ -1,12 +1,12 @@
-import { CourseCommonCartridgeMetadataDto } from '../../common-cartridge-client/course-client';
+import { CourseCommonCartridgeMetadataResponse } from '@infra/courses-client';
 import { CourseFileIdsResponse } from './common-cartridge.response';
 
 export class CourseExportBodyResponse {
-	courseFileIds?: CourseFileIdsResponse;
+	public courseFileIds?: CourseFileIdsResponse;
 
-	courseCommonCartridgeMetadata: CourseCommonCartridgeMetadataDto;
+	public courseCommonCartridgeMetadata: CourseCommonCartridgeMetadataResponse;
 
-	constructor(courseExportBodyResponse: CourseExportBodyResponse) {
+	constructor(courseExportBodyResponse: Readonly<CourseExportBodyResponse>) {
 		this.courseFileIds = courseExportBodyResponse.courseFileIds;
 		this.courseCommonCartridgeMetadata = courseExportBodyResponse.courseCommonCartridgeMetadata;
 	}

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

@@ -1,11 +1,11 @@
+import { CourseCommonCartridgeMetadataResponse, CoursesClientAdapter } from '@infra/courses-client';
 import { FileDto, FilesStorageClientAdapterService } from '@modules/files-storage-client';
 import { Injectable } from '@nestjs/common';
 import { BoardClientAdapter } from '../common-cartridge-client/board-client';
-import { CourseCommonCartridgeMetadataDto, CoursesClientAdapter } from '../common-cartridge-client/course-client';
-import { CourseRoomsClientAdapter } from '../common-cartridge-client/room-client';
-import { RoomBoardDto } from '../common-cartridge-client/room-client/dto/room-board.dto';
 import { CardClientAdapter } from '../common-cartridge-client/card-client/card-client.adapter';
 import { CardListResponseDto } from '../common-cartridge-client/card-client/dto/card-list-response.dto';
+import { CourseRoomsClientAdapter } from '../common-cartridge-client/room-client';
+import { RoomBoardDto } from '../common-cartridge-client/room-client/dto/room-board.dto';
 
 @Injectable()
 export class CommonCartridgeExportService {
@@ -23,7 +23,7 @@ export class CommonCartridgeExportService {
 		return courseFiles;
 	}
 
-	public async findCourseCommonCartridgeMetadata(courseId: string): Promise<CourseCommonCartridgeMetadataDto> {
+	public async findCourseCommonCartridgeMetadata(courseId: string): Promise<CourseCommonCartridgeMetadataResponse> {
 		const courseCommonCartridgeMetadata = await this.coursesClientAdapter.getCourseCommonCartridgeMetadata(courseId);
 
 		return courseCommonCartridgeMetadata;

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

@@ -1,19 +1,21 @@
+import { CoursesClientAdapter } from '@infra/courses-client';
 import { Injectable } from '@nestjs/common';
-import { CoursesClientAdapter } from '../common-cartridge-client/course-client';
 import { CommonCartridgeFileParser } from '../import/common-cartridge-file-parser';
+import { DEFAULT_FILE_PARSER_OPTIONS } from '../import/common-cartridge-import.types';
 
 @Injectable()
 export class CommonCartridgeImportService {
 	constructor(private readonly courseClient: CoursesClientAdapter) {}
 
-	public async importCourse(file: Express.Multer.File): Promise<void> {
-		const parser = new CommonCartridgeFileParser(file.buffer);
+	public async importFile(file: Buffer): Promise<void> {
+		const parser = new CommonCartridgeFileParser(file, DEFAULT_FILE_PARSER_OPTIONS);
 
 		await this.createCourse(parser);
 	}
 
-	private async createCourse(parser: CommonCartridgeFileParser): Promise<void> {
+	private createCourse(parser: CommonCartridgeFileParser): Promise<void> {
 		// TODO: better default name
+		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		const courseName = parser.getTitle() || 'Untitled Course';
 
 		throw new Error('Not implemented');

apps/server/src/modules/common-cartridge/uc/common-cartridge.uc.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@nestjs/common';
 import { EntityId } from '@shared/domain/types';
-import { CourseCommonCartridgeMetadataDto } from '../common-cartridge-client/course-client';
 import { CourseFileIdsResponse } from '../controller/dto';
 import { CourseExportBodyResponse } from '../controller/dto/course-export-body.response';
 import { CommonCartridgeImportService } from '../service';
@@ -16,8 +15,7 @@ export class CommonCartridgeUc {
 	public async exportCourse(courseId: EntityId): Promise<CourseExportBodyResponse> {
 		const files = await this.exportService.findCourseFileRecords(courseId);
 		const courseFileIds = new CourseFileIdsResponse(files.map((file) => file.id));
-		const courseCommonCartridgeMetadata: CourseCommonCartridgeMetadataDto =
-			await this.exportService.findCourseCommonCartridgeMetadata(courseId);
+		const courseCommonCartridgeMetadata = await this.exportService.findCourseCommonCartridgeMetadata(courseId);
 
 		const response = new CourseExportBodyResponse({
 			courseFileIds,
@@ -27,7 +25,7 @@ export class CommonCartridgeUc {
 		return response;
 	}
 
-	public async importCourse(file: Express.Multer.File): Promise<void> {
-		await this.importService.importCourse(file);
+	public async importCourse(file: Buffer): Promise<void> {
+		await this.importService.importFile(file);
 	}
 }