Merge branch 'main' into EW-1029

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

@@ -21,6 +21,7 @@ export {
 	UserWithBoardRoles,
 	isCard,
 	isColumn,
+	isColumnBoard,
 	isDrawingElement,
 	isLinkElement,
 	isRichTextElement,

apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-group-external-uuid-strategy.service.ts

@@ -1,6 +1,7 @@
-import { Injectable } from '@nestjs/common';
-import { CourseService } from '@modules/learnroom';
+import { type AnyBoardNode, BoardExternalReferenceType, BoardNodeService, isColumnBoard } from '@modules/board';
 import { Group, GroupService } from '@modules/group';
+import { CourseService } from '@modules/learnroom';
+import { Injectable } from '@nestjs/common';
 import { Course } from '@shared/domain/entity';
 import { ToolContextType } from '../../../common/enum';
 import { ContextExternalToolLaunchable } from '../../../context-external-tool/domain';
@@ -9,28 +10,46 @@ import { AutoParameterStrategy } from './auto-parameter.strategy';
 
 @Injectable()
 export class AutoGroupExternalUuidStrategy implements AutoParameterStrategy {
-	constructor(private readonly courseService: CourseService, private readonly groupService: GroupService) {}
+	constructor(
+		private readonly courseService: CourseService,
+		private readonly groupService: GroupService,
+		private readonly boardNodeService: BoardNodeService
+	) {}
 
 	async getValue(
 		_schoolExternalTool: SchoolExternalTool,
 		contextExternalTool: ContextExternalToolLaunchable
 	): Promise<string | undefined> {
-		if (contextExternalTool.contextRef.type !== ToolContextType.COURSE) {
-			return undefined;
+		switch (contextExternalTool.contextRef.type) {
+			case ToolContextType.BOARD_ELEMENT: {
+				const boardElement: AnyBoardNode = await this.boardNodeService.findById(contextExternalTool.contextRef.id);
+				const board: AnyBoardNode = await this.boardNodeService.findRoot(boardElement);
+
+				if (!isColumnBoard(board) || board.context.type !== BoardExternalReferenceType.Course) {
+					return undefined;
+				}
+
+				const uuid: string | undefined = await this.getExternalUuidFromCourse(board.context.id);
+
+				return uuid;
+			}
+			case ToolContextType.COURSE: {
+				const uuid: string | undefined = await this.getExternalUuidFromCourse(contextExternalTool.contextRef.id);
+
+				return uuid;
+			}
+			default: {
+				return undefined;
+			}
 		}
+	}
 
-		const courseId = contextExternalTool.contextRef.id;
+	private async getExternalUuidFromCourse(courseId: string): Promise<string | undefined> {
 		const course: Course = await this.courseService.findById(courseId);
 
 		const syncedGroup: Group | undefined = await this.getSyncedGroup(course);
-		if (!syncedGroup) {
-			return undefined;
-		}
 
-		const groupUuid = syncedGroup.externalSource?.externalId;
-		if (!groupUuid) {
-			return undefined;
-		}
+		const groupUuid = syncedGroup?.externalSource?.externalId;
 
 		return groupUuid;
 	}
@@ -42,6 +61,7 @@ export class AutoGroupExternalUuidStrategy implements AutoParameterStrategy {
 		}
 
 		const syncedGroup = await this.groupService.findById(syncedGroupId);
+
 		return syncedGroup;
 	}
 }