Merge branch 'main' into N21-1511-oauth-provider-refactoring

hpi-schul-cloud · Jan 15, 2024 · fde6ac7 · fde6ac7
2 parents 17b3d2f + 80bbe41
commit fde6ac7
Show file tree

Hide file tree

Showing 117 changed files with 2,932 additions and 1,232 deletions.
diff --git a/apps/server/src/apps/server.app.ts b/apps/server/src/apps/server.app.ts
@@ -23,6 +23,7 @@ import { join } from 'path';
 // register source-map-support for debugging
 import { install as sourceMapInstall } from 'source-map-support';
 
+import { ColumnBoardService } from '@modules/board';
 import { AppStartLoggable } from './helpers/app-start-loggable';
 import {
 	addPrometheusMetricsMiddlewaresIfEnabled,
@@ -87,6 +88,8 @@ async function bootstrap() {
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
 	feathersExpress.services['nest-group-service'] = nestApp.get(GroupService);
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
+	feathersExpress.services['nest-column-board-service'] = nestApp.get(ColumnBoardService);
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
 	feathersExpress.services['nest-system-rule'] = nestApp.get(SystemRule);
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
 	feathersExpress.services['nest-orm'] = orm;

diff --git a/apps/server/src/modules/board/board.module.ts b/apps/server/src/modules/board/board.module.ts
@@ -8,6 +8,7 @@ import { CourseRepo } from '@shared/repo';
 import { LoggerModule } from '@src/core/logger';
 import { DrawingElementAdapterService } from '@modules/tldraw-client/service/drawing-element-adapter.service';
 import { HttpModule } from '@nestjs/axios';
+import { ToolConfigModule } from '@modules/tool/tool-config.module';
 import { BoardDoRepo, BoardNodeRepo, RecursiveDeleteVisitor } from './repo';
 import {
 	BoardDoAuthorizableService,
@@ -29,6 +30,7 @@ import { ColumnBoardCopyService } from './service/column-board-copy.service';
 		UserModule,
 		ContextExternalToolModule,
 		HttpModule,
+		ToolConfigModule,
 	],
 	providers: [
 		BoardDoAuthorizableService,

diff --git a/apps/server/src/modules/board/service/board-do-copy-service/board-do-copy.service.spec.ts b/apps/server/src/modules/board/service/board-do-copy-service/board-do-copy.service.spec.ts
@@ -1,6 +1,8 @@
-import { createMock } from '@golevelup/ts-jest';
+import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { FileRecordParentType } from '@infra/rabbitmq';
 import { CopyElementType, CopyStatus, CopyStatusEnum } from '@modules/copy-helper';
+import { ContextExternalTool } from '@modules/tool/context-external-tool/domain';
+import { ContextExternalToolService } from '@modules/tool/context-external-tool/service';
 import { Test, TestingModule } from '@nestjs/testing';
 import {
 	Card,
@@ -9,9 +11,6 @@ import {
 	DrawingElement,
 	ExternalToolElement,
 	FileElement,
-	LinkElement,
-	RichTextElement,
-	SubmissionContainerElement,
 	isCard,
 	isColumn,
 	isColumnBoard,
@@ -21,11 +20,15 @@ import {
 	isLinkElement,
 	isRichTextElement,
 	isSubmissionContainerElement,
+	LinkElement,
+	RichTextElement,
+	SubmissionContainerElement,
 } from '@shared/domain/domainobject';
 import {
 	cardFactory,
 	columnBoardFactory,
 	columnFactory,
+	contextExternalToolFactory,
 	drawingElementFactory,
 	externalToolElementFactory,
 	fileElementFactory,
@@ -36,23 +39,43 @@ import {
 	submissionItemFactory,
 } from '@shared/testing';
 import { ObjectId } from 'bson';
+import { ToolFeatures } from '@modules/tool/tool-config';
 import { BoardDoCopyService } from './board-do-copy.service';
 import { SchoolSpecificFileCopyService } from './school-specific-file-copy.interface';
 
 describe('recursive board copy visitor', () => {
 	let module: TestingModule;
 	let service: BoardDoCopyService;
 
+	let contextExternalToolService: DeepMocked<ContextExternalToolService>;
+
 	beforeAll(async () => {
 		module = await Test.createTestingModule({
-			providers: [BoardDoCopyService],
+			providers: [
+				BoardDoCopyService,
+				{
+					provide: ContextExternalToolService,
+					useValue: createMock<ContextExternalToolService>(),
+				},
+				{
+					provide: ToolFeatures,
+					useValue: {
+						ctlToolsCopyEnabled: true,
+					},
+				},
+			],
 		}).compile();
 
 		service = module.get(BoardDoCopyService);
+		contextExternalToolService = module.get(ContextExternalToolService);
 
 		await setupEntities();
 	});
 
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
 	const setupfileCopyService = () => {
 		const fileCopyService = createMock<SchoolSpecificFileCopyService>();
 
@@ -711,61 +734,192 @@ describe('recursive board copy visitor', () => {
 		});
 	});
 
-	describe('when copying a external tool element', () => {
-		const setup = () => {
-			const original = externalToolElementFactory.build();
+	describe('when copying an external tool element', () => {
+		describe('when the element has no linked tool', () => {
+			const setup = () => {
+				const original = externalToolElementFactory.build();
 
-			return { original, ...setupfileCopyService() };
-		};
+				return { original, ...setupfileCopyService() };
+			};
 
-		const getExternalToolElementFromStatus = (status: CopyStatus): ExternalToolElement => {
-			const copy = status.copyEntity;
+			const getExternalToolElementFromStatus = (status: CopyStatus): ExternalToolElement => {
+				const copy = status.copyEntity;
 
-			expect(isExternalToolElement(copy)).toEqual(true);
+				expect(isExternalToolElement(copy)).toEqual(true);
 
-			return copy as ExternalToolElement;
-		};
+				return copy as ExternalToolElement;
+			};
 
-		it('should return a external tool element as copy', async () => {
-			const { original, fileCopyService } = setup();
+			it('should return a external tool element as copy', async () => {
+				const { original, fileCopyService } = setup();
 
-			const result = await service.copy({ original, fileCopyService });
+				const result = await service.copy({ original, fileCopyService });
 
-			expect(isExternalToolElement(result.copyEntity)).toEqual(true);
-		});
+				expect(isExternalToolElement(result.copyEntity)).toEqual(true);
+			});
 
-		it('should not copy tool', async () => {
-			const { original, fileCopyService } = setup();
+			it('should not copy tool', async () => {
+				const { original, fileCopyService } = setup();
 
-			const result = await service.copy({ original, fileCopyService });
-			const copy = getExternalToolElementFromStatus(result);
+				const result = await service.copy({ original, fileCopyService });
+				const copy = getExternalToolElementFromStatus(result);
 
-			expect(copy.contextExternalToolId).toBeUndefined();
-		});
+				expect(copy.contextExternalToolId).toBeUndefined();
+			});
 
-		it('should create new id', async () => {
-			const { original, fileCopyService } = setup();
+			it('should create new id', async () => {
+				const { original, fileCopyService } = setup();
 
-			const result = await service.copy({ original, fileCopyService });
-			const copy = getExternalToolElementFromStatus(result);
+				const result = await service.copy({ original, fileCopyService });
+				const copy = getExternalToolElementFromStatus(result);
 
-			expect(copy.id).not.toEqual(original.id);
-		});
+				expect(copy.id).not.toEqual(original.id);
+			});
 
-		it('should show status successful', async () => {
-			const { original, fileCopyService } = setup();
+			it('should show status successful', async () => {
+				const { original, fileCopyService } = setup();
 
-			const result = await service.copy({ original, fileCopyService });
+				const result = await service.copy({ original, fileCopyService });
 
-			expect(result.status).toEqual(CopyStatusEnum.SUCCESS);
+				expect(result.status).toEqual(CopyStatusEnum.SUCCESS);
+			});
+
+			it('should show type ExternalToolElement', async () => {
+				const { original, fileCopyService } = setup();
+
+				const result = await service.copy({ original, fileCopyService });
+
+				expect(result.type).toEqual(CopyElementType.EXTERNAL_TOOL_ELEMENT);
+			});
 		});
 
-		it('should show type RichTextElement', async () => {
-			const { original, fileCopyService } = setup();
+		describe('when the element has a linked tool and the feature is active', () => {
+			describe('when the linked tool exists', () => {
+				const setup = () => {
+					const originalTool: ContextExternalTool = contextExternalToolFactory.buildWithId();
+					const copiedTool: ContextExternalTool = contextExternalToolFactory.buildWithId();
 
-			const result = await service.copy({ original, fileCopyService });
+					const original: ExternalToolElement = externalToolElementFactory.build({
+						contextExternalToolId: originalTool.id,
+					});
+
+					contextExternalToolService.findById.mockResolvedValueOnce(originalTool);
+					contextExternalToolService.copyContextExternalTool.mockResolvedValueOnce(copiedTool);
+
+					return { original, ...setupfileCopyService(), copiedTool };
+				};
+
+				const getExternalToolElementFromStatus = (status: CopyStatus): ExternalToolElement => {
+					const copy = status.copyEntity;
+
+					expect(isExternalToolElement(copy)).toEqual(true);
+
+					return copy as ExternalToolElement;
+				};
+
+				it('should return a external tool element as copy', async () => {
+					const { original, fileCopyService } = setup();
+
+					const result = await service.copy({ original, fileCopyService });
+
+					expect(isExternalToolElement(result.copyEntity)).toEqual(true);
+				});
+
+				it('should copy tool', async () => {
+					const { original, fileCopyService, copiedTool } = setup();
+
+					const result = await service.copy({ original, fileCopyService });
+					const copy = getExternalToolElementFromStatus(result);
 
-			expect(result.type).toEqual(CopyElementType.EXTERNAL_TOOL_ELEMENT);
+					expect(copy.contextExternalToolId).toEqual(copiedTool.id);
+				});
+
+				it('should create new id', async () => {
+					const { original, fileCopyService } = setup();
+
+					const result = await service.copy({ original, fileCopyService });
+					const copy = getExternalToolElementFromStatus(result);
+
+					expect(copy.id).not.toEqual(original.id);
+				});
+
+				it('should show status successful', async () => {
+					const { original, fileCopyService } = setup();
+
+					const result = await service.copy({ original, fileCopyService });
+
+					expect(result.status).toEqual(CopyStatusEnum.SUCCESS);
+				});
+
+				it('should show type ExternalToolElement', async () => {
+					const { original, fileCopyService } = setup();
+
+					const result = await service.copy({ original, fileCopyService });
+
+					expect(result.type).toEqual(CopyElementType.EXTERNAL_TOOL_ELEMENT);
+				});
+			});
+
+			describe('when the linked tool does not exist anymore', () => {
+				const setup = () => {
+					const original: ExternalToolElement = externalToolElementFactory.build({
+						contextExternalToolId: new ObjectId().toHexString(),
+					});
+
+					contextExternalToolService.findById.mockResolvedValueOnce(null);
+
+					return { original, ...setupfileCopyService() };
+				};
+
+				const getExternalToolElementFromStatus = (status: CopyStatus): ExternalToolElement => {
+					const copy = status.copyEntity;
+
+					expect(isExternalToolElement(copy)).toEqual(true);
+
+					return copy as ExternalToolElement;
+				};
+
+				it('should return a external tool element as copy', async () => {
+					const { original, fileCopyService } = setup();
+
+					const result = await service.copy({ original, fileCopyService });
+
+					expect(isExternalToolElement(result.copyEntity)).toEqual(true);
+				});
+
+				it('should not try to copy the tool', async () => {
+					const { original, fileCopyService } = setup();
+
+					await service.copy({ original, fileCopyService });
+
+					expect(contextExternalToolService.copyContextExternalTool).not.toHaveBeenCalled();
+				});
+
+				it('should create new id', async () => {
+					const { original, fileCopyService } = setup();
+
+					const result = await service.copy({ original, fileCopyService });
+					const copy = getExternalToolElementFromStatus(result);
+
+					expect(copy.id).not.toEqual(original.id);
+				});
+
+				it('should show status fail', async () => {
+					const { original, fileCopyService } = setup();
+
+					const result = await service.copy({ original, fileCopyService });
+
+					expect(result.status).toEqual(CopyStatusEnum.FAIL);
+				});
+
+				it('should show type ExternalToolElement', async () => {
+					const { original, fileCopyService } = setup();
+
+					const result = await service.copy({ original, fileCopyService });
+
+					expect(result.type).toEqual(CopyElementType.EXTERNAL_TOOL_ELEMENT);
+				});
+			});
 		});
 	});
 

diff --git a/apps/server/src/modules/board/service/board-do-copy-service/board-do-copy.service.ts b/apps/server/src/modules/board/service/board-do-copy-service/board-do-copy.service.ts
@@ -1,6 +1,8 @@
+import { ContextExternalToolService } from '@modules/tool/context-external-tool/service';
 import { CopyStatus } from '@modules/copy-helper';
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
 import { AnyBoardDo } from '@shared/domain/domainobject';
+import { IToolFeatures, ToolFeatures } from '@modules/tool/tool-config';
 import { RecursiveCopyVisitor } from './recursive-copy.visitor';
 import { SchoolSpecificFileCopyService } from './school-specific-file-copy.interface';
 
@@ -11,8 +13,17 @@ export type BoardDoCopyParams = {
 
 @Injectable()
 export class BoardDoCopyService {
+	constructor(
+		@Inject(ToolFeatures) private readonly toolFeatures: IToolFeatures,
+		private readonly contextExternalToolService: ContextExternalToolService
+	) {}
+
 	public async copy(params: BoardDoCopyParams): Promise<CopyStatus> {
-		const visitor = new RecursiveCopyVisitor(params.fileCopyService);
+		const visitor = new RecursiveCopyVisitor(
+			params.fileCopyService,
+			this.contextExternalToolService,
+			this.toolFeatures
+		);
 
 		const result = await visitor.copy(params.original);