delete external tool on element deletion

apps/server/src/modules/board/board.module.ts

@@ -1,12 +1,12 @@
+import { FilesStorageClientModule } from '@modules/files-storage-client';
+import { ContextExternalToolModule } from '@modules/tool/context-external-tool';
+import { UserModule } from '@modules/user';
 import { Module } from '@nestjs/common';
 import { ContentElementFactory } from '@shared/domain';
 import { ConsoleWriterModule } from '@shared/infra/console';
 import { CourseRepo } from '@shared/repo';
 import { LoggerModule } from '@src/core/logger';
-import { FilesStorageClientModule } from '../files-storage-client';
-import { UserModule } from '../user';
-import { BoardDoRepo, BoardNodeRepo } from './repo';
-import { RecursiveDeleteVisitor } from './repo/recursive-delete.vistor';
+import { BoardDoRepo, BoardNodeRepo, RecursiveDeleteVisitor } from './repo';
 import {
 	BoardDoAuthorizableService,
 	BoardDoService,
@@ -21,7 +21,7 @@ import { BoardDoCopyService, SchoolSpecificFileCopyServiceFactory } from './serv
 import { ColumnBoardCopyService } from './service/column-board-copy.service';
 
 @Module({
-	imports: [ConsoleWriterModule, FilesStorageClientModule, LoggerModule, UserModule],
+	imports: [ConsoleWriterModule, FilesStorageClientModule, LoggerModule, UserModule, ContextExternalToolModule],
 	providers: [
 		BoardDoAuthorizableService,
 		BoardDoRepo,

apps/server/src/modules/board/repo/recursive-delete.visitor.spec.ts

@@ -1,38 +1,45 @@
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { EntityManager } from '@mikro-orm/mongodb';
+import { FileDto, FilesStorageClientAdapterService } from '@modules/files-storage-client';
+import { ContextExternalToolService } from '@modules/tool/context-external-tool/service';
 import { Test, TestingModule } from '@nestjs/testing';
 import { FileRecordParentType } from '@shared/infra/rabbitmq';
 import {
 	columnBoardFactory,
 	columnFactory,
+	contextExternalToolFactory,
 	externalToolElementFactory,
 	fileElementFactory,
 	linkElementFactory,
 	setupEntities,
 	submissionContainerElementFactory,
 	submissionItemFactory,
 } from '@shared/testing';
-import { FileDto, FilesStorageClientAdapterService } from '@modules/files-storage-client';
 import { RecursiveDeleteVisitor } from './recursive-delete.vistor';
 
 describe(RecursiveDeleteVisitor.name, () => {
 	let module: TestingModule;
+	let service: RecursiveDeleteVisitor;
+
 	let em: DeepMocked<EntityManager>;
 	let filesStorageClientAdapterService: DeepMocked<FilesStorageClientAdapterService>;
-	let service: RecursiveDeleteVisitor;
+	let contextExternalToolService: DeepMocked<ContextExternalToolService>;
 
 	beforeAll(async () => {
 		module = await Test.createTestingModule({
 			providers: [
 				RecursiveDeleteVisitor,
 				{ provide: EntityManager, useValue: createMock<EntityManager>() },
 				{ provide: FilesStorageClientAdapterService, useValue: createMock<FilesStorageClientAdapterService>() },
+				{ provide: ContextExternalToolService, useValue: createMock<ContextExternalToolService>() },
 			],
 		}).compile();
 
+		service = module.get(RecursiveDeleteVisitor);
 		em = module.get(EntityManager);
 		filesStorageClientAdapterService = module.get(FilesStorageClientAdapterService);
-		service = module.get(RecursiveDeleteVisitor);
+		contextExternalToolService = module.get(ContextExternalToolService);
+
 		await setupEntities();
 	});
 
@@ -212,14 +219,30 @@ describe(RecursiveDeleteVisitor.name, () => {
 
 	describe('visitExternalToolElementAsync', () => {
 		const setup = () => {
+			const contextExternalTool = contextExternalToolFactory.buildWithId();
 			const childExternalToolElement = externalToolElementFactory.build();
 			const externalToolElement = externalToolElementFactory.build({
 				children: [childExternalToolElement],
+				contextExternalToolId: contextExternalTool.id,
 			});
 
-			return { externalToolElement, childExternalToolElement };
+			contextExternalToolService.findById.mockResolvedValue(contextExternalTool);
+
+			return {
+				externalToolElement,
+				childExternalToolElement,
+				contextExternalTool,
+			};
 		};
 
+		it('should delete the context external tool that is linked to the element', async () => {
+			const { externalToolElement, contextExternalTool } = setup();
+
+			await service.visitExternalToolElementAsync(externalToolElement);
+
+			expect(contextExternalToolService.deleteContextExternalTool).toHaveBeenCalledWith(contextExternalTool);
+		});
+
 		it('should call entity remove', async () => {
 			const { externalToolElement, childExternalToolElement } = setup();
 

apps/server/src/modules/board/repo/recursive-delete.vistor.ts

@@ -1,4 +1,7 @@
 import { EntityManager } from '@mikro-orm/mongodb';
+import { FilesStorageClientAdapterService } from '@modules/files-storage-client';
+import { ContextExternalTool } from '@modules/tool/context-external-tool/domain';
+import { ContextExternalToolService } from '@modules/tool/context-external-tool/service';
 import { Injectable } from '@nestjs/common';
 import {
 	AnyBoardDo,
@@ -14,13 +17,13 @@ import {
 	SubmissionItem,
 } from '@shared/domain';
 import { LinkElement } from '@shared/domain/domainobject/board/link-element.do';
-import { FilesStorageClientAdapterService } from '@modules/files-storage-client';
 
 @Injectable()
 export class RecursiveDeleteVisitor implements BoardCompositeVisitorAsync {
 	constructor(
 		private readonly em: EntityManager,
-		private readonly filesStorageClientAdapterService: FilesStorageClientAdapterService
+		private readonly filesStorageClientAdapterService: FilesStorageClientAdapterService,
+		private readonly contextExternalToolService: ContextExternalToolService
 	) {}
 
 	async visitColumnBoardAsync(columnBoard: ColumnBoard): Promise<void> {
@@ -67,7 +70,14 @@ export class RecursiveDeleteVisitor implements BoardCompositeVisitorAsync {
 	}
 
 	async visitExternalToolElementAsync(externalToolElement: ExternalToolElement): Promise<void> {
-		// TODO N21-1296: Delete linked ContextExternalTool
+		if (externalToolElement.contextExternalToolId) {
+			const linkedTool: ContextExternalTool = await this.contextExternalToolService.findById(
+				externalToolElement.contextExternalToolId
+			);
+
+			await this.contextExternalToolService.deleteContextExternalTool(linkedTool);
+		}
+
 		this.deleteNode(externalToolElement);
 
 		await this.visitChildrenAsync(externalToolElement);

apps/server/src/modules/pseudonym/pseudonym.module.ts

@@ -1,14 +1,13 @@
-import { forwardRef, Module } from '@nestjs/common';
-import { LegacyLogger } from '@src/core/logger';
 import { LearnroomModule } from '@modules/learnroom';
-import { UserModule } from '@modules/user';
 import { ToolModule } from '@modules/tool';
-import { AuthorizationModule } from '@modules/authorization';
+import { UserModule } from '@modules/user';
+import { forwardRef, Module } from '@nestjs/common';
+import { LegacyLogger } from '@src/core/logger';
 import { ExternalToolPseudonymRepo, PseudonymsRepo } from './repo';
 import { FeathersRosterService, PseudonymService } from './service';
 
 @Module({
-	imports: [UserModule, LearnroomModule, forwardRef(() => ToolModule), forwardRef(() => AuthorizationModule)],
+	imports: [UserModule, LearnroomModule, forwardRef(() => ToolModule)],
 	providers: [PseudonymService, PseudonymsRepo, ExternalToolPseudonymRepo, LegacyLogger, FeathersRosterService],
 	exports: [PseudonymService, FeathersRosterService],
 })

apps/server/src/modules/task/task.module.ts

@@ -1,12 +1,11 @@
-import { forwardRef, Module } from '@nestjs/common';
-import { CourseRepo, LessonRepo, SubmissionRepo, TaskRepo } from '@shared/repo';
-import { AuthorizationModule } from '@modules/authorization';
 import { CopyHelperModule } from '@modules/copy-helper';
 import { FilesStorageClientModule } from '@modules/files-storage-client';
+import { Module } from '@nestjs/common';
+import { CourseRepo, LessonRepo, SubmissionRepo, TaskRepo } from '@shared/repo';
 import { SubmissionService, TaskCopyService, TaskService } from './service';
 
 @Module({
-	imports: [forwardRef(() => AuthorizationModule), FilesStorageClientModule, CopyHelperModule],
+	imports: [FilesStorageClientModule, CopyHelperModule],
 	providers: [TaskService, TaskCopyService, SubmissionService, TaskRepo, LessonRepo, CourseRepo, SubmissionRepo],
 	exports: [TaskService, TaskCopyService, SubmissionService],
 })