refactor(models): Use Messages Raw model (4/N)

apps/meteor/app/federation/server/endpoints/dispatch.js

@@ -271,7 +271,7 @@ const eventHandlers = {
 				try {
 					Messages.insert(denormalizedMessage);
 
-					processThreads(denormalizedMessage, room);
+					await processThreads(denormalizedMessage, room);
 
 					// Notify users
 					await notifyUsersOnMessage(denormalizedMessage, room);

apps/meteor/app/lib/server/functions/deleteMessage.ts

@@ -24,7 +24,7 @@ export async function deleteMessage(message: IMessage, user: IUser): Promise<voi
 	}
 
 	if (deletedMsg.tmid) {
-		MessagesSync.decreaseReplyCountById(deletedMsg.tmid, -1);
+		await Messages.decreaseReplyCountById(deletedMsg.tmid, -1);
 	}
 
 	const files = (message.files || [message.file]).filter(Boolean); // Keep compatibility with old messages

apps/meteor/app/lib/server/functions/deleteUser.ts

@@ -40,7 +40,7 @@ export async function deleteUser(userId: string, confirmRelinquish = false): Pro
 				Messages.findFilesByUserId(userId).forEach(function ({ file }: { file: FileProp }) {
 					store.deleteById(file._id);
 				});
-				Messages.removeByUserId(userId);
+				await MessagesRaw.removeByUserId(userId);
 				break;
 			case 'Unlink':
 				const rocketCat = Users.findOneById('rocket.cat');

apps/meteor/app/lib/server/functions/relinquishRoomOwnerships.ts

@@ -1,7 +1,7 @@
-import { Roles } from '@rocket.chat/models';
+import { Messages, Roles } from '@rocket.chat/models';
 
 import { FileUpload } from '../../../file-upload/server';
-import { Subscriptions, Messages, Rooms } from '../../../models/server';
+import { Subscriptions, Rooms } from '../../../models/server';
 import type { SubscribedRoomsForUserWithDetails } from './getRoomsWithSingleOwner';
 
 const bulkRoomCleanUp = async (rids: string[]): Promise<unknown> => {

apps/meteor/app/livechat/server/hooks/processRoomAbandonment.js

@@ -1,9 +1,9 @@
 import moment from 'moment';
-import { LivechatBusinessHours, LivechatDepartment } from '@rocket.chat/models';
+import { LivechatBusinessHours, LivechatDepartment, Messages } from '@rocket.chat/models';
 
 import { settings } from '../../../settings/server';
 import { callbacks } from '../../../../lib/callbacks';
-import { LivechatRooms, Messages } from '../../../models/server';
+import { LivechatRooms } from '../../../models/server';
 import { businessHourManager } from '../business-hour';
 
 const getSecondsWhenOfficeHoursIsDisabled = (room, agentLastMessage) =>
@@ -58,15 +58,15 @@ const getSecondsSinceLastAgentResponse = async (room, agentLastMessage) => {
 
 callbacks.add(
 	'livechat.closeRoom',
-	async (params) => {
+	async function (params) {
 		const { room } = params;
 
 		const closedByAgent = room.closer !== 'visitor';
 		const wasTheLastMessageSentByAgent = room.lastMessage && !room.lastMessage.token;
 		if (!closedByAgent || !wasTheLastMessageSentByAgent) {
 			return params;
 		}
-		const agentLastMessage = Messages.findAgentLastMessageByVisitorLastMessageTs(room._id, room.v.lastMessageTs);
+		const agentLastMessage = await Messages.findAgentLastMessageByVisitorLastMessageTs(room._id, room.v.lastMessageTs);
 		if (!agentLastMessage) {
 			return params;
 		}

apps/meteor/app/models/server/models/Messages.js

@@ -212,19 +212,6 @@ export class Messages extends Base {
 		return this.find(query, options);
 	}
 
-	findForUpdates(roomId, timestamp, options) {
-		const query = {
-			_hidden: {
-				$ne: true,
-			},
-			rid: roomId,
-			_updatedAt: {
-				$gt: timestamp,
-			},
-		};
-		return this.find(query, options);
-	}
-
 	findVisibleByRoomIdBeforeTimestampNotContainingTypes(roomId, timestamp, types, options, showThreadMessages = true, inclusive = false) {
 		const query = {
 			_hidden: {
@@ -565,10 +552,6 @@ export class Messages extends Base {
 		return this.remove(query);
 	}
 
-	removeByRoomIds(rids) {
-		return this.remove({ rid: { $in: rids } });
-	}
-
 	findThreadsByRoomIdPinnedTimestampAndUsers({ rid, pinned, ignoreDiscussion = true, ts, users = [] }, options) {
 		const query = {
 			rid,
@@ -592,16 +575,6 @@ export class Messages extends Base {
 		return this.find(query, options);
 	}
 
-	removeByUserId(userId) {
-		const query = { 'u._id': userId };
-
-		return this.remove(query);
-	}
-
-	getMessageByFileId(fileID) {
-		return this.findOne({ 'file._id': fileID });
-	}
-
 	setVisibleMessagesAsRead(rid, until) {
 		return this.update(
 			{
@@ -628,186 +601,6 @@ export class Messages extends Base {
 		);
 	}
 
-	setAsReadById(_id) {
-		return this.update(
-			{
-				_id,
-			},
-			{
-				$unset: {
-					unread: 1,
-				},
-			},
-		);
-	}
-
-	findVisibleUnreadMessagesByRoomAndDate(rid, after) {
-		const query = {
-			unread: true,
-			rid,
-			$or: [
-				{
-					tmid: { $exists: false },
-				},
-				{
-					tshow: true,
-				},
-			],
-		};
-
-		if (after) {
-			query.ts = { $gt: after };
-		}
-
-		return this.find(query, {
-			fields: {
-				_id: 1,
-			},
-		});
-	}
-
-	findUnreadThreadMessagesByDate(tmid, userId, after) {
-		const query = {
-			'u._id': { $ne: userId },
-			'unread': true,
-			tmid,
-			'tshow': { $exists: false },
-		};
-
-		if (after) {
-			query.ts = { $gt: after };
-		}
-
-		return this.find(query, {
-			fields: {
-				_id: 1,
-			},
-		});
-	}
-
-	// //////////////////////////////////////////////////////////////////
-	// threads
-
-	countThreads() {
-		return this.find({ tcount: { $exists: true } }).count();
-	}
-
-	removeThreadRefByThreadId(tmid) {
-		const query = { tmid };
-		const update = {
-			$unset: {
-				tmid: 1,
-			},
-		};
-		return this.update(query, update, { multi: true });
-	}
-
-	updateRepliesByThreadId(tmid, replies, ts) {
-		const query = {
-			_id: tmid,
-		};
-
-		const update = {
-			$addToSet: {
-				replies: {
-					$each: replies,
-				},
-			},
-			$set: {
-				tlm: ts,
-			},
-			$inc: {
-				tcount: 1,
-			},
-		};
-
-		return this.update(query, update);
-	}
-
-	getThreadFollowsByThreadId(tmid) {
-		const msg = this.findOneById(tmid, { fields: { replies: 1 } });
-		return msg && msg.replies;
-	}
-
-	getFirstReplyTsByThreadId(tmid) {
-		return this.findOne({ tmid }, { fields: { ts: 1 }, sort: { ts: 1 } });
-	}
-
-	unsetThreadByThreadId(tmid) {
-		const query = {
-			_id: tmid,
-		};
-
-		const update = {
-			$unset: {
-				tcount: 1,
-				tlm: 1,
-				replies: 1,
-			},
-		};
-
-		return this.update(query, update);
-	}
-
-	updateThreadLastMessageAndCountByThreadId(tmid, tlm, tcount) {
-		const query = {
-			_id: tmid,
-		};
-
-		const update = {
-			$set: {
-				tlm,
-			},
-			$inc: {
-				tcount,
-			},
-		};
-
-		return this.update(query, update);
-	}
-
-	addThreadFollowerByThreadId(tmid, userId) {
-		const query = {
-			_id: tmid,
-		};
-
-		const update = {
-			$addToSet: {
-				replies: userId,
-			},
-		};
-
-		return this.update(query, update);
-	}
-
-	removeThreadFollowerByThreadId(tmid, userId) {
-		const query = {
-			_id: tmid,
-		};
-
-		const update = {
-			$pull: {
-				replies: userId,
-			},
-		};
-
-		return this.update(query, update);
-	}
-
-	findThreadsByRoomId(rid, skip, limit) {
-		return this.find({ rid, tcount: { $exists: true } }, { sort: { tlm: -1 }, skip, limit });
-	}
-
-	findAgentLastMessageByVisitorLastMessageTs(roomId, visitorLastMessageTs) {
-		const query = {
-			rid: roomId,
-			ts: { $gt: visitorLastMessageTs },
-			token: { $exists: false },
-		};
-
-		return this.findOne(query, { sort: { ts: 1 } });
-	}
-
 	findAllImportedMessagesWithFilesToDownload() {
 		const query = {
 			'_importFile.downloadUrl': {
@@ -826,16 +619,6 @@ export class Messages extends Base {
 
 		return this.find(query);
 	}
-
-	decreaseReplyCountById(_id, inc = -1) {
-		const query = { _id };
-		const update = {
-			$inc: {
-				tcount: inc,
-			},
-		};
-		return this.update(query, update);
-	}
 }
 
 export default new Messages();