some cleanup

apps/server/src/modules/board/controller/element.controller.ts

@@ -134,7 +134,7 @@ export class ElementController {
 			bodyParams.completed
 		);
 		const mapper = SubmissionItemResponseMapper.getInstance();
-		const response = mapper.mapSubmissionsToResponse(submissionItem);
+		const response = mapper.mapSubmissionItemToResponse(submissionItem);
 
 		return response;
 	}

apps/server/src/modules/board/controller/mapper/submission-item-response.mapper.ts

@@ -1,8 +1,8 @@
 import {
 	FileElement,
-	isContent,
 	isFileElement,
 	isRichTextElement,
+	isSubmissionItemContent,
 	RichTextElement,
 	SubmissionItem,
 	UserBoardRoles,
@@ -26,7 +26,7 @@ export class SubmissionItemResponseMapper {
 
 	public mapToResponse(submissionItems: SubmissionItem[], users: UserBoardRoles[]): SubmissionsResponse {
 		const submissionItemsResponse: SubmissionItemResponse[] = submissionItems.map((item) =>
-			this.mapSubmissionsToResponse(item)
+			this.mapSubmissionItemToResponse(item)
 		);
 		const usersResponse: UserDataResponse[] = users.map((user) => this.mapUsersToResponse(user));
 
@@ -35,8 +35,8 @@ export class SubmissionItemResponseMapper {
 		return response;
 	}
 
-	public mapSubmissionsToResponse(submissionItem: SubmissionItem): SubmissionItemResponse {
-		const children: (FileElement | RichTextElement)[] = submissionItem.children.filter(isContent);
+	public mapSubmissionItemToResponse(submissionItem: SubmissionItem): SubmissionItemResponse {
+		const children: (FileElement | RichTextElement)[] = submissionItem.children.filter(isSubmissionItemContent);
 		const result = new SubmissionItemResponse({
 			completed: submissionItem.completed,
 			id: submissionItem.id,

apps/server/src/modules/board/service/content-element.service.ts

@@ -7,7 +7,6 @@ import {
 	ContentElementType,
 	EntityId,
 	isAnyContentElement,
-	SubmissionContainerElement,
 	SubmissionItem,
 } from '@shared/domain';
 import { AnyElementContentBody } from '../controller/dto';
@@ -43,16 +42,6 @@ export class ContentElementService {
 		return parent;
 	}
 
-	async findSubmissionContainerElement(elementId: EntityId): Promise<SubmissionContainerElement> {
-		const element = await this.boardDoRepo.findById(elementId);
-
-		if (!(element instanceof SubmissionContainerElement)) {
-			throw new NotFoundException(`There is no '${element.constructor.name}' with this id`);
-		}
-
-		return element;
-	}
-
 	async create(parent: Card | SubmissionItem, type: ContentElementType): Promise<AnyContentElementDo> {
 		const element = this.contentElementFactory.build(type);
 		parent.addChild(element);

apps/server/src/modules/board/uc/submission-item.uc.ts

@@ -13,6 +13,8 @@ import {
 	ContentElementType,
 	EntityId,
 	FileElement,
+	isFileElement,
+	isRichTextElement,
 	isSubmissionContainerElement,
 	isSubmissionItem,
 	RichTextElement,
@@ -91,8 +93,12 @@ export class SubmissionItemUc {
 		// await this.checkPermission(userId, submissionItem, Action.write);
 
 		const element = await this.elementService.create(submissionItem, type);
-		// TODO
-		return element as FileElement | RichTextElement;
+
+		if (!isFileElement(element) && !isRichTextElement(element)) {
+			throw new UnprocessableEntityException();
+		}
+
+		return element;
 	}
 
 	private async isAuthorizedStudent(userId: EntityId, boardDo: AnyBoardDo): Promise<boolean> {

apps/server/src/shared/domain/domainobject/board/submission-item.do.ts

@@ -1,24 +1,8 @@
-import {
-	EntityId,
-	FileElement,
-	isFileElement,
-	isRichTextElement,
-	isSumbmissionItem,
-	RichTextElement,
-} from '@shared/domain';
+import { EntityId, FileElement, isFileElement, isRichTextElement, RichTextElement } from '@shared/domain';
 import { BoardComposite, BoardCompositeProps } from './board-composite.do';
 import type { AnyBoardDo, BoardCompositeVisitor, BoardCompositeVisitorAsync } from './types';
 
 export class SubmissionItem extends BoardComposite<SubmissionItemProps> {
-	/* get children(): (RichTextElement | FileElement)[] {
-		const { children } = this.props;
-		if (!children) return [];
-
-		const filteredChildren = children.filter(isFileElement || isRichTextElement);
-
-		return filteredChildren;
-	} */
-
 	get completed(): boolean {
 		return this.props.completed;
 	}
@@ -35,10 +19,8 @@ export class SubmissionItem extends BoardComposite<SubmissionItemProps> {
 		this.props.userId = value;
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	isAllowedAsChild(child: AnyBoardDo): boolean {
-		// Currently submission-item rejects any children, will open in the future
-		const allowed = child instanceof FileElement || child instanceof RichTextElement;
+		const allowed = isFileElement(child) || isRichTextElement(child);
 
 		return allowed;
 	}
@@ -60,3 +42,6 @@ export interface SubmissionItemProps extends BoardCompositeProps {
 export function isSubmissionItem(reference: unknown): reference is SubmissionItem {
 	return reference instanceof SubmissionItem;
 }
+
+export const isSubmissionItemContent = (element: AnyBoardDo): element is RichTextElement | FileElement =>
+	isRichTextElement(element) || isFileElement(element);

apps/server/src/shared/domain/domainobject/board/types/any-board-do.ts

@@ -5,5 +5,3 @@ import { SubmissionItem } from '../submission-item.do';
 import { AnyContentElementDo } from './any-content-element-do';
 
 export type AnyBoardDo = ColumnBoard | Column | Card | AnyContentElementDo | SubmissionItem;
-
-export const isSumbmissionItem = (element: AnyBoardDo): element is SubmissionItem => element instanceof SubmissionItem;

apps/server/src/shared/domain/domainobject/board/types/any-content-element-do.ts

@@ -22,6 +22,3 @@ export const isAnyContentElement = (element: AnyBoardDo): element is AnyContentE
 
 	return result;
 };
-
-export const isContent = (element: AnyBoardDo): element is RichTextElement | FileElement =>
-	element instanceof RichTextElement || element instanceof FileElement;

apps/server/src/shared/domain/entity/boardnode/types/any-board-node.ts

@@ -2,11 +2,19 @@ import {
 	CardNode,
 	ColumnBoardNode,
 	ColumnNode,
+	ExternalToolElement,
 	FileElementNode,
+	LinkElementNode,
 	RichTextElementNode,
 	SubmissionContainerElementNode,
 	SubmissionItemNode,
 } from '@shared/domain';
 
-export type AnyElementNode = FileElementNode | RichTextElementNode | SubmissionContainerElementNode;
+export type AnyElementNode =
+	| FileElementNode
+	| RichTextElementNode
+	| SubmissionContainerElementNode
+	| ExternalToolElement
+	| LinkElementNode;
+
 export type AnyBoardNode = ColumnBoardNode | ColumnNode | CardNode | AnyElementNode | SubmissionItemNode;