Merge branch 'main' into BC-4256-Integration-tldraw

hpi-schul-cloud · Oct 10, 2023 · 418e569 · 418e569
2 parents 4cdc81c + 2b27ebe
commit 418e569
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 29 deletions.
diff --git a/apps/server/src/modules/board/controller/api-test/content-element-update-content.spec.ts b/apps/server/src/modules/board/controller/api-test/content-element-update-content.spec.ts
@@ -11,6 +11,8 @@ import {
 	SubmissionContainerElementNode,
 } from '@shared/domain';
 import {
+	TestApiClient,
+	UserAndAccountTestFactory,
 	cardNodeFactory,
 	cleanupCollections,
 	columnBoardNodeFactory,
@@ -19,8 +21,6 @@ import {
 	fileElementNodeFactory,
 	richTextElementNodeFactory,
 	submissionContainerElementNodeFactory,
-	TestApiClient,
-	UserAndAccountTestFactory,
 } from '@shared/testing';
 import { ServerTestModule } from '@src/modules/server/server.module';
 
@@ -63,7 +63,10 @@ describe(`content element update content (api)`, () => {
 			const parentCard = cardNodeFactory.buildWithId({ parent: column });
 			const richTextElement = richTextElementNodeFactory.buildWithId({ parent: parentCard });
 			const fileElement = fileElementNodeFactory.buildWithId({ parent: parentCard });
-			const submissionContainerElement = submissionContainerElementNodeFactory.buildWithId({ parent: parentCard });
+			const submissionContainerElement = submissionContainerElementNodeFactory.buildWithId({
+				parent: parentCard,
+				dueDate: null,
+			});
 
 			const tomorrow = new Date(Date.now() + 86400000);
 			const submissionContainerElementWithDueDate = submissionContainerElementNodeFactory.buildWithId({
@@ -166,7 +169,6 @@ describe(`content element update content (api)`, () => {
 
 		it('should return status 204 (nothing changed) without dueDate parameter for submission container element', async () => {
 			const { loggedInClient, submissionContainerElement } = await setup();
-
 			const response = await loggedInClient.patch(`${submissionContainerElement.id}/content`, {
 				data: {
 					content: {},
@@ -177,7 +179,7 @@ describe(`content element update content (api)`, () => {
 			expect(response.statusCode).toEqual(204);
 		});
 
-		it('should not change dueDate value without dueDate parameter for submission container element', async () => {
+		it('should not change dueDate when not proviced in submission container element without dueDate', async () => {
 			const { loggedInClient, submissionContainerElement } = await setup();
 
 			await loggedInClient.patch(`${submissionContainerElement.id}/content`, {
@@ -187,11 +189,10 @@ describe(`content element update content (api)`, () => {
 				},
 			});
 			const result = await em.findOneOrFail(SubmissionContainerElementNode, submissionContainerElement.id);
-
-			expect(result.dueDate).toBeUndefined();
+			expect(result.dueDate).toBeNull();
 		});
 
-		it('should set dueDate value when dueDate parameter is provided for submission container element', async () => {
+		it('should set dueDate value when provided for submission container element', async () => {
 			const { loggedInClient, submissionContainerElement } = await setup();
 
 			const inThreeDays = new Date(Date.now() + 259200000);
@@ -207,18 +208,20 @@ describe(`content element update content (api)`, () => {
 			expect(result.dueDate).toEqual(inThreeDays);
 		});
 
-		it('should unset dueDate value when dueDate parameter is not provided for submission container element', async () => {
+		it('should unset dueDate value when dueDate parameter is null for submission container element', async () => {
 			const { loggedInClient, submissionContainerElementWithDueDate } = await setup();
 
 			await loggedInClient.patch(`${submissionContainerElementWithDueDate.id}/content`, {
 				data: {
-					content: {},
+					content: {
+						dueDate: null,
+					},
 					type: 'submissionContainer',
 				},
 			});
 			const result = await em.findOneOrFail(SubmissionContainerElementNode, submissionContainerElementWithDueDate.id);
 
-			expect(result.dueDate).toBeUndefined();
+			expect(result.dueDate).toBeNull();
 		});
 
 		it('should return status 400 for wrong date format for submission container element', async () => {

diff --git a/apps/server/src/modules/board/controller/dto/element/update-element-content.body.params.ts b/apps/server/src/modules/board/controller/dto/element/update-element-content.body.params.ts
@@ -56,6 +56,7 @@ export class SubmissionContainerContentBody {
 	@IsOptional()
 	@ApiPropertyOptional({
 		required: false,
+		nullable: true,
 		description: 'The point in time until when a submission can be handed in.',
 	})
 	dueDate?: Date;

diff --git a/...erver/src/modules/board/controller/mapper/submission-container-element-response.mapper.ts b/...erver/src/modules/board/controller/mapper/submission-container-element-response.mapper.ts
@@ -19,7 +19,7 @@ export class SubmissionContainerElementResponseMapper implements BaseResponseMap
 			timestamps: new TimestampsResponse({ lastUpdatedAt: element.updatedAt, createdAt: element.createdAt }),
 			type: ContentElementType.SUBMISSION_CONTAINER,
 			content: new SubmissionContainerElementContent({
-				dueDate: element.dueDate || null,
+				dueDate: element.dueDate,
 			}),
 		});
 

diff --git a/apps/server/src/modules/board/repo/board-do.builder-impl.ts b/apps/server/src/modules/board/repo/board-do.builder-impl.ts
@@ -128,12 +128,9 @@ export class BoardDoBuilderImpl implements BoardDoBuilder {
 			children: elements,
 			createdAt: boardNode.createdAt,
 			updatedAt: boardNode.updatedAt,
+			dueDate: boardNode.dueDate,
 		});
 
-		if (boardNode.dueDate) {
-			element.dueDate = boardNode.dueDate;
-		}
-
 		return element;
 	}
 

diff --git a/apps/server/src/modules/board/repo/recursive-save.visitor.ts b/apps/server/src/modules/board/repo/recursive-save.visitor.ts
@@ -130,12 +130,9 @@ export class RecursiveSaveVisitor implements BoardCompositeVisitor {
 			id: submissionContainerElement.id,
 			parent: parentData?.boardNode,
 			position: parentData?.position,
+			dueDate: submissionContainerElement.dueDate,
 		});
 
-		if (submissionContainerElement.dueDate) {
-			boardNode.dueDate = submissionContainerElement.dueDate;
-		}
-
 		this.createOrUpdateBoardNode(boardNode);
 		this.visitChildren(submissionContainerElement, boardNode);
 	}

diff --git a/apps/server/src/modules/board/service/content-element-update.visitor.ts b/apps/server/src/modules/board/service/content-element-update.visitor.ts
@@ -59,7 +59,8 @@ export class ContentElementUpdateVisitor implements BoardCompositeVisitor {
 
 	visitSubmissionContainerElement(submissionContainerElement: SubmissionContainerElement): void {
 		if (this.content instanceof SubmissionContainerContentBody) {
-			submissionContainerElement.dueDate = this.content.dueDate ?? undefined;
+			if (this.content.dueDate === undefined) return;
+			submissionContainerElement.dueDate = this.content.dueDate;
 		} else {
 			this.throwNotHandled(submissionContainerElement);
 		}

diff --git a/apps/server/src/modules/board/service/content-element.service.ts b/apps/server/src/modules/board/service/content-element.service.ts
@@ -47,7 +47,6 @@ export class ContentElementService {
 
 	async update(element: AnyContentElementDo, content: AnyElementContentBody): Promise<void> {
 		const updater = new ContentElementUpdateVisitor(content);
-
 		element.accept(updater);
 
 		const parent = await this.boardDoRepo.findParentOfId(element.id);

diff --git a/apps/server/src/modules/board/uc/element.uc.ts b/apps/server/src/modules/board/uc/element.uc.ts
@@ -31,7 +31,6 @@ export class ElementUc {
 		const element = await this.elementService.findById(elementId);
 
 		await this.checkPermission(userId, element, Action.write);
-
 		await this.elementService.update(element, content);
 	}
 

diff --git a/apps/server/src/shared/domain/domainobject/board/content-element.factory.ts b/apps/server/src/shared/domain/domainobject/board/content-element.factory.ts
@@ -65,6 +65,7 @@ export class ContentElementFactory {
 	private buildSubmissionContainer() {
 		const element = new SubmissionContainerElement({
 			id: new ObjectId().toHexString(),
+			dueDate: null,
 			children: [],
 			createdAt: new Date(),
 			updatedAt: new Date(),

diff --git a/apps/server/src/shared/domain/domainobject/board/submission-container-element.do.ts b/apps/server/src/shared/domain/domainobject/board/submission-container-element.do.ts
@@ -3,11 +3,11 @@ import { SubmissionItem } from './submission-item.do';
 import type { AnyBoardDo, BoardCompositeVisitor, BoardCompositeVisitorAsync } from './types';
 
 export class SubmissionContainerElement extends BoardComposite<SubmissionContainerElementProps> {
-	get dueDate(): Date | undefined {
+	get dueDate(): Date | null {
 		return this.props.dueDate;
 	}
 
-	set dueDate(value: Date | undefined) {
+	set dueDate(value: Date | null) {
 		this.props.dueDate = value;
 	}
 
@@ -26,7 +26,7 @@ export class SubmissionContainerElement extends BoardComposite<SubmissionContain
 }
 
 export interface SubmissionContainerElementProps extends BoardCompositeProps {
-	dueDate?: Date;
+	dueDate: Date | null;
 }
 
 export function isSubmissionContainerElement(reference: unknown): reference is SubmissionContainerElement {

diff --git a/apps/server/src/shared/domain/entity/boardnode/submission-container-element-node.entity.ts b/apps/server/src/shared/domain/entity/boardnode/submission-container-element-node.entity.ts
@@ -6,7 +6,7 @@ import { BoardDoBuilder, BoardNodeType } from './types';
 @Entity({ discriminatorValue: BoardNodeType.SUBMISSION_CONTAINER_ELEMENT })
 export class SubmissionContainerElementNode extends BoardNode {
 	@Property({ nullable: true })
-	dueDate?: Date;
+	dueDate: Date | null;
 
 	constructor(props: SubmissionContainerNodeProps) {
 		super(props);
@@ -22,5 +22,5 @@ export class SubmissionContainerElementNode extends BoardNode {
 }
 
 export interface SubmissionContainerNodeProps extends BoardNodeProps {
-	dueDate?: Date;
+	dueDate: Date | null;
 }
diff --git a/.../server/src/shared/testing/factory/boardnode/submission-container-element-node.factory.ts b/.../server/src/shared/testing/factory/boardnode/submission-container-element-node.factory.ts
@@ -6,5 +6,7 @@ export const submissionContainerElementNodeFactory = BaseFactory.define<
 	SubmissionContainerElementNode,
 	SubmissionContainerNodeProps
 >(SubmissionContainerElementNode, () => {
-	return {};
+	return {
+		dueDate: null,
+	};
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,6 @@ export class ElementUc { @@
     		const element = await this.elementService.findById(elementId);
     		await this.checkPermission(userId, element, Action.write);
     		await this.elementService.update(element, content);
     	}
@@ Expand Down @@