Merge branch 'main' into N21-1598-change-ctl-counting

hpi-schul-cloud · Jan 15, 2024 · 7cee2c5 · 7cee2c5
2 parents 2be4261 + 80bbe41
commit 7cee2c5
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 12 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/service/column-board.service.spec.ts b/apps/server/src/modules/board/service/column-board.service.spec.ts
@@ -67,12 +67,13 @@ describe(ColumnBoardService.name, () => {
 		const board = columnBoardFactory.build();
 		const boardId = board.id;
 		const column = columnFactory.build();
+		const courseId = new ObjectId().toHexString();
 		const externalReference: BoardExternalReference = {
-			id: new ObjectId().toHexString(),
+			id: courseId,
 			type: BoardExternalReferenceType.Course,
 		};
 
-		return { board, boardId, column, externalReference };
+		return { board, boardId, column, courseId, externalReference };
 	};
 
 	describe('findById', () => {
@@ -239,6 +240,28 @@ describe(ColumnBoardService.name, () => {
 		});
 	});
 
+	describe('deleteByCourseId', () => {
+		describe('when deleting by courseId', () => {
+			it('should call boardDoRepo.findIdsByExternalReference to find the board ids', async () => {
+				const { boardId, courseId, externalReference } = setup();
+
+				boardDoRepo.findIdsByExternalReference.mockResolvedValue([boardId]);
+
+				await service.deleteByCourseId(courseId);
+
+				expect(boardDoRepo.findIdsByExternalReference).toHaveBeenCalledWith(externalReference);
+			});
+
+			it('should call boardDoService.deleteWithDescendants to delete the board', async () => {
+				const { board, courseId } = setup();
+
+				await service.deleteByCourseId(courseId);
+
+				expect(boardDoService.deleteWithDescendants).toHaveBeenCalledWith(board);
+			});
+		});
+	});
+
 	describe('updateTitle', () => {
 		describe('when updating the title', () => {
 			it('should call the service', async () => {

diff --git a/apps/server/src/modules/board/service/column-board.service.ts b/apps/server/src/modules/board/service/column-board.service.ts
@@ -4,6 +4,7 @@ import { NotFoundLoggableException } from '@shared/common/loggable-exception';
 import {
 	AnyBoardDo,
 	BoardExternalReference,
+	BoardExternalReferenceType,
 	Card,
 	Column,
 	ColumnBoard,
@@ -73,6 +74,25 @@ export class ColumnBoardService {
 		await this.boardDoService.deleteWithDescendants(board);
 	}
 
+	async deleteByCourseId(courseId: EntityId): Promise<void> {
+		const columnBoardsId = await this.findIdsByExternalReference({
+			type: BoardExternalReferenceType.Course,
+			id: courseId,
+		});
+
+		const deletePromises = columnBoardsId.map((columnBoardId) => this.deleteColumnBoardById(columnBoardId));
+
+		await Promise.all(deletePromises);
+	}
+
+	private async deleteColumnBoardById(id: EntityId): Promise<void> {
+		const columnBoardToDeletion = await this.boardDoRepo.findByClassAndId(ColumnBoard, id);
+
+		if (columnBoardToDeletion) {
+			await this.boardDoService.deleteWithDescendants(columnBoardToDeletion);
+		}
+	}
+
 	async updateTitle(board: ColumnBoard, title: string): Promise<void> {
 		board.title = title;
 		await this.boardDoRepo.save(board);

diff --git a/src/services/user-group/hooks/courses.js b/src/services/user-group/hooks/courses.js
@@ -127,6 +127,11 @@ const deleteWholeClassFromCourse = (hook) => {
 		});
 };
 
+const removeColumnBoard = async (context) => {
+	const courseId = context.id;
+	await context.app.service('nest-column-board-service').deleteByCourseId(courseId);
+};
+
 /**
  * remove all substitution teacher which are also teachers
  * @param hook - contains and request body
@@ -185,6 +190,7 @@ const restrictChangesToArchivedCourse = async (context) => {
 module.exports = {
 	addWholeClassToCourse,
 	deleteWholeClassFromCourse,
+	removeColumnBoard,
 	removeSubstitutionDuplicates,
 	courseInviteHook,
 	patchPermissionHook,

diff --git a/src/services/user-group/hooks/index.js b/src/services/user-group/hooks/index.js
@@ -7,6 +7,7 @@ const restrictToUsersOwnCourses = globalHooks.ifNotLocal(globalHooks.restrictToU
 const {
 	addWholeClassToCourse,
 	deleteWholeClassFromCourse,
+	removeColumnBoard,
 	courseInviteHook,
 	patchPermissionHook,
 	restrictChangesToArchivedCourse,
@@ -63,5 +64,5 @@ exports.after = {
 	create: [addWholeClassToCourse],
 	update: [],
 	patch: [addWholeClassToCourse],
-	remove: [],
+	remove: [removeColumnBoard],
 };
diff --git a/src/services/user-group/services/courses.js b/src/services/user-group/services/courses.js
@@ -23,6 +23,7 @@ const restrictToUsersOwnCoursesIfNotLocal = ifNotLocal(restrictToUsersOwnCourses
 const {
 	addWholeClassToCourse,
 	deleteWholeClassFromCourse,
+	removeColumnBoard,
 	courseInviteHook,
 	patchPermissionHook,
 	restrictChangesToArchivedCourse,
@@ -134,7 +135,7 @@ const courseHooks = {
 		create: [addWholeClassToCourse],
 		update: [],
 		patch: [addWholeClassToCourse],
-		remove: [],
+		remove: [removeColumnBoard],
 	},
 };
 

diff --git a/test/services/courses/services/courses.test.js b/test/services/courses/services/courses.test.js
@@ -61,15 +61,15 @@ describe('course service', () => {
 		}
 	});
 
-	it('teacher can DELETE course', async () => {
-		const teacher = await testObjects.createTestUser({ roles: ['teacher'] });
-		const course = await testObjects.createTestCourse({ name: 'course', teacherIds: [teacher._id] });
-		const params = await testObjects.generateRequestParamsFromUser(teacher);
-		params.query = {};
+	// it('teacher can DELETE course', async () => {
+	// 	const teacher = await testObjects.createTestUser({ roles: ['teacher'] });
+	// 	const course = await testObjects.createTestCourse({ name: 'course', teacherIds: [teacher._id] });
+	// 	const params = await testObjects.generateRequestParamsFromUser(teacher);
+	// 	params.query = {};
 
-		const result = await courseService.remove(course._id, params);
-		expect(result).to.not.be.undefined;
-	});
+	// 	const result = await courseService.remove(course._id, params);
+	// 	expect(result).to.not.be.undefined;
+	// });
 
 	it('substitution teacher can not DELETE course', async () => {
 		try {