chore: move common files to core-services (#33341)

RocketChat · Sep 24, 2024 · a4fcd99 · a4fcd99
1 parent 1f89f78
commit a4fcd99
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 60 deletions.
diff --git a/_templates/service/new/service.ejs.t b/_templates/service/new/service.ejs.t
@@ -1,22 +1,18 @@
 ---
 to: ee/apps/<%= name %>/src/service.ts
 ---
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 
 const PORT = process.env.PORT || <%= h.random() %>;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 

diff --git a/ee/apps/account-service/src/service.ts b/ee/apps/account-service/src/service.ts
@@ -1,19 +1,15 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 
 const PORT = process.env.PORT || 3033;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 

diff --git a/ee/apps/authorization-service/src/service.ts b/ee/apps/authorization-service/src/service.ts
@@ -1,19 +1,15 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 
 const PORT = process.env.PORT || 3034;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 

diff --git a/ee/apps/ddp-streamer/src/service.ts b/ee/apps/ddp-streamer/src/service.ts
@@ -1,16 +1,12 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 

diff --git a/ee/apps/omnichannel-transcript/src/service.ts b/ee/apps/omnichannel-transcript/src/service.ts
@@ -1,20 +1,16 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 
 const PORT = process.env.PORT || 3036;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 

diff --git a/ee/apps/presence-service/src/service.ts b/ee/apps/presence-service/src/service.ts
@@ -1,19 +1,15 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 
 const PORT = process.env.PORT || 3031;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 

diff --git a/ee/apps/queue-worker/src/service.ts b/ee/apps/queue-worker/src/service.ts
@@ -1,20 +1,16 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 
 const PORT = process.env.PORT || 3038;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 

diff --git a/ee/apps/stream-hub-service/src/service.ts b/ee/apps/stream-hub-service/src/service.ts
@@ -1,11 +1,9 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
 import { broker } from '@rocket.chat/network-broker';
-import type { Document } from 'mongodb';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 import { DatabaseWatcher } from '../../../../apps/meteor/server/database/DatabaseWatcher';
 import { StreamHub } from './StreamHub';
 
@@ -14,9 +12,7 @@ const PORT = process.env.PORT || 3035;
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 

diff --git a/packages/core-services/src/index.ts b/packages/core-services/src/index.ts
@@ -75,6 +75,8 @@ export {
 	AnalyticsOverviewDataResult,
 } from './types/IOmnichannelAnalyticsService';
 
+export { getConnection, getTrashCollection } from './lib/mongo';
+
 export {
 	AutoUpdateRecord,
 	FindVoipRoomsParams,

diff --git a/apps/meteor/ee/server/services/mongo.ts → packages/core-services/src/lib/mongo.ts b/apps/meteor/ee/server/services/mongo.ts → packages/core-services/src/lib/mongo.ts
@@ -5,16 +5,6 @@ const { MONGO_URL = 'mongodb://localhost:27017/rocketchat' } = process.env;
 
 const name = /^mongodb:\/\/.*?(?::[0-9]+)?\/([^?]*)/.exec(MONGO_URL)?.[1];
 
-export enum Collections {
-	Subscriptions = 'rocketchat_subscription',
-	UserSession = 'usersSessions',
-	User = 'users',
-	Trash = 'rocketchat__trash',
-	Messages = 'rocketchat_message',
-	Rooms = 'rocketchat_room',
-	Settings = 'rocketchat_settings',
-}
-
 function connectDb(options?: MongoClientOptions): Promise<MongoClient> {
 	const client = new MongoClient(MONGO_URL, options);
 
@@ -44,9 +34,9 @@ export const getConnection = ((): ((options?: MongoClientOptions) => Promise<Db>
 	};
 })();
 
-export async function getCollection<T extends Document>(name: Collections): Promise<Collection<T>> {
+export async function getTrashCollection<T extends Document>(): Promise<Collection<T>> {
 	if (!db) {
 		db = await getConnection();
 	}
-	return db.collection<T>(name);
+	return db.collection<T>('rocketchat__trash');
 }