Chore: Upgrade mongodb typings (#27424)

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
RocketChat · Dec 5, 2022 · af3ec69 · af3ec69
1 parent 410ce05
commit af3ec69
Show file tree

Hide file tree

Showing 35 changed files with 1,109 additions and 200 deletions.
diff --git a/apps/meteor/app/api/server/v1/channels.ts b/apps/meteor/app/api/server/v1/channels.ts
@@ -270,7 +270,6 @@ API.v1.addRoute(
 				return API.v1.unauthorized();
 			}
 
-			// @ts-expect-error recursive types are causing issues here
 			const { cursor, totalCount } = Messages.findPaginated(ourQuery, {
 				sort: sort || { ts: -1 },
 				skip: offset,

diff --git a/apps/meteor/app/apps/server/storage/AppGridFSSourceStorage.ts b/apps/meteor/app/apps/server/storage/AppGridFSSourceStorage.ts
@@ -1,6 +1,6 @@
 import { MongoInternals } from 'meteor/mongo';
-import { ObjectId } from 'mongodb';
-import type { GridFSBucket, GridFSBucketWriteStream } from 'mongodb';
+import type { GridFSBucketWriteStream } from 'mongodb';
+import { ObjectId, GridFSBucket } from 'mongodb';
 import type { IAppStorageItem } from '@rocket.chat/apps-engine/server/storage';
 import { AppSourceStorage } from '@rocket.chat/apps-engine/server/storage';
 
@@ -14,7 +14,6 @@ export class AppGridFSSourceStorage extends AppSourceStorage {
 	constructor() {
 		super();
 
-		const { GridFSBucket } = MongoInternals.NpmModules.mongodb.module;
 		const { db } = MongoInternals.defaultRemoteCollectionDriver().mongo;
 
 		this.bucket = new GridFSBucket(db, {

diff --git a/apps/meteor/app/livechat/server/api/lib/inquiries.ts b/apps/meteor/app/livechat/server/api/lib/inquiries.ts
@@ -58,7 +58,6 @@ export async function findInquiries({
 		],
 	};
 
-	// @ts-ignore - LivechatInquiry has a ref to messages
 	const { cursor, totalCount } = LivechatInquiry.findPaginated(filter, options);
 
 	const [inquiries, total] = await Promise.all([cursor.toArray(), totalCount]);

diff --git a/apps/meteor/app/livechat/server/api/lib/transfer.ts b/apps/meteor/app/livechat/server/api/lib/transfer.ts
@@ -13,7 +13,6 @@ export async function findLivechatTransferHistory({
 	rid: string;
 	pagination: { offset: number; count: number; sort: Record<string, number> };
 }): Promise<PaginatedResult<{ history: IOmnichannelSystemMessage['transferData'][] }>> {
-	// @ts-ignore - Messages destroys everything it touches
 	const { cursor, totalCount } = Messages.findPaginated(
 		{ rid, t: 'livechat_transfer_history' },
 		{

diff --git a/apps/meteor/app/livechat/server/business-hour/AbstractBusinessHour.ts b/apps/meteor/app/livechat/server/business-hour/AbstractBusinessHour.ts
@@ -2,6 +2,7 @@ import moment from 'moment-timezone';
 import type { ILivechatBusinessHour, ILivechatDepartment } from '@rocket.chat/core-typings';
 import type { ILivechatBusinessHoursModel, IUsersModel } from '@rocket.chat/model-typings';
 import { LivechatBusinessHours, Users } from '@rocket.chat/models';
+import type { UpdateFilter } from 'mongodb';
 
 import type { IWorkHoursCronJobsWrapper } from '../../../../server/models/raw/LivechatBusinessHours';
 
@@ -62,7 +63,9 @@ export abstract class AbstractBusinessHourType {
 		businessHourData.active = Boolean(businessHourData.active);
 		businessHourData = this.convertWorkHours(businessHourData);
 		if (businessHourData._id) {
-			await this.BusinessHourRepository.updateOne({ _id: businessHourData._id }, { $set: businessHourData });
+			await this.BusinessHourRepository.updateOne({ _id: businessHourData._id }, {
+				$set: businessHourData,
+			} as UpdateFilter<ILivechatBusinessHour>); // TODO: Remove this cast when TypeScript is updated
 			return businessHourData._id;
 		}
 		const { insertedId } = await this.BusinessHourRepository.insertOne(businessHourData);

diff --git a/apps/meteor/app/ui/client/lib/ChatMessages.ts b/apps/meteor/app/ui/client/lib/ChatMessages.ts
@@ -379,16 +379,15 @@ export class ChatMessages {
 			readMessage.readNow(rid);
 			readMessage.refreshUnreadMark(rid);
 
-			const message = await onClientBeforeSendMessage({
+			const message = (await onClientBeforeSendMessage({
 				_id: Random.id(),
 				rid,
 				tshow,
 				tmid,
 				msg,
-			});
+			})) as IMessage;
 
 			try {
-				// @ts-ignore
 				await this.processMessageSend(message);
 				this.quotedMessages.clear();
 			} catch (error) {
@@ -405,8 +404,7 @@ export class ChatMessages {
 
 			try {
 				if (message.attachments && message.attachments?.length > 0) {
-					// @ts-ignore
-					await this.processMessageEditing({ _id: this.editing.id, rid, msg: '' });
+					await this.processMessageEditing({ _id: this.editing.id, rid, msg: '' } as IMessage);
 					return;
 				}
 

diff --git a/apps/meteor/ee/server/lib/registerServiceModels.ts b/apps/meteor/ee/server/lib/registerServiceModels.ts
@@ -28,28 +28,24 @@ import { EmailInboxRaw } from '../../../server/models/raw/EmailInbox';
 import { PbxEventsRaw } from '../../../server/models/raw/PbxEvents';
 
 // TODO add trash param to appropiate model instances
-export function registerServiceModels(db: Db, trash?: Collection): void {
+export function registerServiceModels(db: Db, trash?: Collection<RocketChatRecordDeleted<any>>): void {
 	registerModel('IRolesModel', () => new RolesRaw(db));
 	registerModel('IRoomsModel', () => new RoomsRaw(db));
-	registerModel('ISettingsModel', () => new SettingsRaw(db, trash as unknown as Collection<RocketChatRecordDeleted<ISetting>>));
-	registerModel(
-		'ISubscriptionsModel',
-		() => new SubscriptionsRaw(db, trash as unknown as Collection<RocketChatRecordDeleted<ISubscription>>),
-	);
+	registerModel('ISettingsModel', () => new SettingsRaw(db, trash as Collection<RocketChatRecordDeleted<ISetting>>));
+	registerModel('ISubscriptionsModel', () => new SubscriptionsRaw(db, trash as Collection<RocketChatRecordDeleted<ISubscription>>));
 	registerModel('ITeamModel', () => new TeamRaw(db));
 	registerModel('ITeamMemberModel', () => new TeamMemberRaw(db));
 	registerModel('IUsersModel', () => new UsersRaw(db));
 
-	// @ts-ignore-error
 	registerModel('IMessagesModel', () => new MessagesRaw(db));
 
 	registerModel(
 		'ILivechatInquiryModel',
-		() => new LivechatInquiryRaw(db, trash as unknown as Collection<RocketChatRecordDeleted<ILivechatInquiryRecord>>),
+		() => new LivechatInquiryRaw(db, trash as Collection<RocketChatRecordDeleted<ILivechatInquiryRecord>>),
 	);
 	registerModel(
 		'ILivechatDepartmentAgentsModel',
-		() => new LivechatDepartmentAgentsRaw(db, trash as unknown as Collection<RocketChatRecordDeleted<ILivechatDepartmentAgents>>),
+		() => new LivechatDepartmentAgentsRaw(db, trash as Collection<RocketChatRecordDeleted<ILivechatDepartmentAgents>>),
 	);
 	registerModel('IUsersSessionsModel', () => new UsersSessionsRaw(db));
 	registerModel('IPermissionsModel', () => new PermissionsRaw(db));

diff --git a/apps/meteor/ee/server/models/raw/LivechatRooms.ts b/apps/meteor/ee/server/models/raw/LivechatRooms.ts
@@ -23,7 +23,6 @@ declare module '@rocket.chat/model-typings' {
 	}
 }
 
-// Note: Expect a circular dependency error here 😓
 export class LivechatRoomsRawEE extends LivechatRoomsRaw implements ILivechatRoomsModel {
 	async unsetAllPredictedVisitorAbandonment(): Promise<void> {
 		return this.updateMany(

diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
@@ -40,7 +40,7 @@
 		"jaeger-client": "^3.19.0",
 		"mem": "^8.1.1",
 		"moleculer": "^0.14.21",
-		"mongodb": "^4.3.1",
+		"mongodb": "^4.12.1",
 		"nats": "^2.6.1",
 		"pino": "^7.11.0",
 		"sodium-native": "^3.3.0",

diff --git a/apps/meteor/package.json b/apps/meteor/package.json
@@ -333,7 +333,7 @@
 		"moleculer": "^0.14.21",
 		"moment": "^2.29.4",
 		"moment-timezone": "^0.5.34",
-		"mongodb": "^4.3.1",
+		"mongodb": "^4.12.1",
 		"mongodb-memory-server": "^7.6.3",
 		"nats": "^2.6.1",
 		"node-dogstatsd": "^0.0.7",