fix issues after merge

apps/server/src/modules/tldraw/controller/tldraw.ws.ts

@@ -82,6 +82,6 @@ export class TldrawWs implements OnGatewayInit, OnGatewayConnection {
 
 	private closeClientAndLogError(client: WebSocket, code: WsCloseCodeEnum, data: string, err: Error): void {
 		client.close(code, data);
-		this.logger.warning(new WebsocketCloseErrorLoggable(err, `(${code}) ${data}`));
+		this.logger.warning(new WebsocketCloseErrorLoggable(`(${code}) ${data}`, err));
 	}
 }

apps/server/src/modules/tldraw/entities/tldraw-drawing.entity.spec.ts

@@ -14,12 +14,6 @@ describe('tldraw entity', () => {
 
 				expect(tldraw).toBeInstanceOf(TldrawDrawing);
 			});
-
-			it('should throw with empty docName', () => {
-				const call = () => tldrawEntityFactory.build({ docName: '' });
-
-				expect(call).toThrow();
-			});
 		});
 	});
 });

apps/server/src/modules/tldraw/entities/tldraw-drawing.entity.ts

@@ -1,6 +1,5 @@
 import { Entity, Index, Property } from '@mikro-orm/core';
-import { BadRequestException } from '@nestjs/common';
-import { BaseEntity } from '@shared/domain/entity';
+import { BaseEntity } from '@shared/domain/entity/base.entity';
 
 export interface TldrawDrawingProps {
 	_id?: string;
@@ -35,7 +34,6 @@ export class TldrawDrawing extends BaseEntity {
 
 	constructor(props: TldrawDrawingProps) {
 		super();
-		if (!props.docName) throw new BadRequestException('Tldraw element should have name.');
 		this.docName = props.docName;
 		this.version = props.version;
 		this.value = props.value;

apps/server/src/modules/tldraw/loggable/websocket-close-error.loggable.spec.ts

@@ -6,7 +6,7 @@ describe('WebsocketCloseErrorLoggable', () => {
 			const error = new Error('test');
 			const errorMessage = 'message';
 
-			const loggable = new WebsocketCloseErrorLoggable(error, errorMessage);
+			const loggable = new WebsocketCloseErrorLoggable(errorMessage, error);
 			return { loggable, error, errorMessage };
 		};
 

apps/server/src/modules/tldraw/loggable/websocket-close-error.loggable.ts

@@ -1,7 +1,7 @@
 import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger';
 
 export class WebsocketCloseErrorLoggable implements Loggable {
-	constructor(private readonly error: Error, private readonly message: string) {}
+	constructor(private readonly message: string, private readonly error: Error) {}
 
 	getLogMessage(): LogMessage | ErrorLogMessage | ValidationErrorLogMessage {
 		return {

apps/server/src/modules/tldraw/service/tldraw.ws.service.ts

@@ -89,7 +89,9 @@ export class TldrawWsService {
 		try {
 			ws.close();
 		} catch (err) {
-			this.logger.warning(new WebsocketCloseErrorLoggable(err as Error));
+			this.logger.warning(
+				new WebsocketCloseErrorLoggable('Error while closing websocket, it may already be closed', err as Error)
+			);
 		}
 	}
 

apps/server/src/modules/tldraw/tldraw.module.ts

@@ -10,7 +10,7 @@ import { Dictionary, IPrimaryKey } from '@mikro-orm/core';
 import { AuthorizationModule } from '@modules/authorization';
 import { config } from './config';
 import { TldrawDrawing } from './entities';
-import { TldrawController } from './controller/tldraw.controller';
+import { TldrawController } from './controller';
 import { TldrawService } from './service';
 import { TldrawBoardRepo, TldrawRepo, YMongodb } from './repo';