BC-11250 - Fix Admin Page Tool Deletion Issue

apps/server/src/modules/tool/common/service/common-tool-delete.service.ts

@@ -60,12 +60,14 @@ export class CommonToolDeleteService {
 		externalTool: ExternalTool,
 		schoolExternalTool: SchoolExternalTool
 	): Promise<void> {
-		await this.schoolExternalToolRepo.deleteById(schoolExternalTool.id);
-
 		const contextExternalTools: ContextExternalTool[] = await this.contextExternalToolRepo.find({
 			schoolToolRef: { schoolToolId: schoolExternalTool.id },
 		});
 
+		// we have to wait with deleting the school external tool until the context external tools are populated,
+		// otherwise the context external tools won't be found due to the missing reference
+		await this.schoolExternalToolRepo.deleteById(schoolExternalTool.id);
+
 		const promises: Promise<void>[] = contextExternalTools.map(async (contextExternalTool) => {
 			await this.deleteContextExternalToolInternal(externalTool, contextExternalTool);
 		});

apps/server/src/modules/tool/context-external-tool/repo/mikro-orm/context-external-tool.scope.spec.ts

@@ -44,7 +44,7 @@ describe('CourseExternalToolScope', () => {
 
 				scope.bySchoolToolId(schoolExternalToolEntity.id);
 
-				expect(scope.query).toEqual({ schoolTool: schoolExternalToolEntity.id });
+				expect(scope.query).toEqual({ schoolTool: new ObjectId(schoolExternalToolEntity.id) });
 			});
 		});
 	});

apps/server/src/modules/tool/context-external-tool/repo/mikro-orm/context-external-tool.scope.ts

@@ -15,7 +15,7 @@ export class ContextExternalToolScope extends Scope<ContextExternalToolEntity> {
 
 	public bySchoolToolId(schoolToolId: EntityId | undefined): ContextExternalToolScope {
 		if (schoolToolId !== undefined) {
-			this.addQuery({ schoolTool: schoolToolId });
+			this.addQuery({ schoolTool: new ObjectId(schoolToolId) });
 		}
 		return this;
 	}