Fix collection name in tldraw db

hpi-schul-cloud · Nov 17, 2023 · 862a309 · 862a309
1 parent 74bf209
commit 862a309
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/apps/server/src/config/database.config.ts b/apps/server/src/config/database.config.ts
@@ -4,9 +4,10 @@ interface GlobalConstants {
 	DB_URL: string;
 	DB_PASSWORD?: string;
 	DB_USERNAME?: string;
+	TLDRAW_DB_URL: string;
 }
 
 const usedGlobals: GlobalConstants = globals;
 
 /** Database URL */
-export const { DB_URL, DB_PASSWORD, DB_USERNAME } = usedGlobals;
+export const { DB_URL, DB_PASSWORD, DB_USERNAME, TLDRAW_DB_URL } = usedGlobals;
diff --git a/apps/server/src/modules/tldraw/tldraw.module.ts b/apps/server/src/modules/tldraw/tldraw.module.ts
@@ -1,6 +1,6 @@
 import { Module, NotFoundException } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
-import { createConfigModuleOptions, DB_PASSWORD, DB_USERNAME, DB_URL } from '@src/config';
+import { createConfigModuleOptions, DB_PASSWORD, DB_USERNAME, TLDRAW_DB_URL } from '@src/config';
 import { CoreModule } from '@src/core';
 import { Logger } from '@src/core/logger';
 import { MikroOrmModule, MikroOrmModuleSyncOptions } from '@mikro-orm/nestjs';
@@ -30,7 +30,7 @@ const defaultMikroOrmOptions: MikroOrmModuleSyncOptions = {
 		MikroOrmModule.forRoot({
 			...defaultMikroOrmOptions,
 			type: 'mongo',
-			clientUrl: DB_URL,
+			clientUrl: TLDRAW_DB_URL,
 			password: DB_PASSWORD,
 			user: DB_USERNAME,
 			entities: [TldrawDrawing],

diff --git a/config/default.schema.json b/config/default.schema.json
@@ -1395,7 +1395,7 @@
 				"SOCKET_PORT": 3345,
 				"PING_TIMEOUT": 10000,
 				"GC_ENABLED": true,
-				"DB_COLLECTION_NAME": "drawing",
+				"DB_COLLECTION_NAME": "drawings",
 				"DB_FLUSH_SIZE": 400,
 				"DB_MULTIPLE_COLLECTIONS": false
 			}

diff --git a/config/globals.js b/config/globals.js
@@ -24,12 +24,15 @@ switch (NODE_ENV) {
 }
 
 let defaultDbUrl = null;
+let defaultTldrawDbUrl = null;
 switch (NODE_ENV) {
 	case ENVIRONMENTS.TEST:
 		defaultDbUrl = 'mongodb://127.0.0.1:27017/schulcloud-test';
+		defaultTldrawDbUrl = 'mongodb://127.0.0.1:27017/tldraw-test';
 		break;
 	default:
 		defaultDbUrl = 'mongodb://127.0.0.1:27017/schulcloud';
+		defaultTldrawDbUrl = 'mongodb://127.0.0.1:27017/tldraw';
 }
 
 const globals = {
@@ -104,6 +107,9 @@ const globals = {
 
 	// calendar
 	CALENDAR_URI: process.env.CALENDAR_URI,
+
+	// tldraw
+	TLDRAW_DB_URL: process.env.TLDRAW_DB_URL || defaultTldrawDbUrl,
 };
 
 // validation /////////////////////////////////////////////////

diff --git a/config/test.json b/config/test.json
@@ -73,7 +73,7 @@
 		"SOCKET_PORT": 3346,
 		"PING_TIMEOUT": 1,
 		"GC_ENABLED": true,
-		"DB_COLLECTION_NAME": "drawing",
+		"DB_COLLECTION_NAME": "drawings",
 		"DB_FLUSH_SIZE": 400,
 		"DB_MULTIPLE_COLLECTIONS": false
 	}