stub mergeContact function

apps/meteor/ee/server/patches/mergeContacts.ts

@@ -1,36 +1,30 @@
-import type { ILivechatContact, ILivechatContactChannel } from '@rocket.chat/core-typings';
-import { License } from '@rocket.chat/license';
-import { LivechatContacts } from '@rocket.chat/models';
+import type { ILivechatContact, ILivechatContactChannel } from '@rocket.chat/core-typings';	
+import { License } from '@rocket.chat/license';	
+import { LivechatContacts } from '@rocket.chat/models';	
 
-import { hasLicense } from '../../../app/license/client';
+import { hasLicense } from '../../../app/license/client';	
 import { ContactMerger } from '../../../app/livechat/server/lib/ContactMerger';
 import { mergeContacts } from '../../../app/livechat/server/lib/Contacts';
 
-export const runMergeContacts = async (
-	_next: any,
-	contactId: string,
-	channel: ILivechatContactChannel,
-): Promise<ILivechatContact | null> => {
-	if (!(await hasLicense('contact-id-verification'))) {
-		return null;
-	}
-
-	const originalContact = (await LivechatContacts.findOneById(contactId)) as ILivechatContact;
+await License.onLicense('contact-id-verification', () => {
+	mergeContacts.patch(async (_next, contactId: string, channel: ILivechatContactChannel): Promise<ILivechatContact | null> => {
+		if (!(await hasLicense('contact-id-verification'))) {
+			return null;
+		}
 
-	const similarContacts: ILivechatContact[] = await LivechatContacts.findSimilarVerifiedContacts(channel, contactId);
+		const originalContact = (await LivechatContacts.findOneById(contactId)) as ILivechatContact;
 
-	if (!similarContacts.length) {
-		return originalContact;
-	}
+		const similarContacts: ILivechatContact[] = await LivechatContacts.findSimilarVerifiedContacts(channel, contactId);
 
-	for await (const similarContact of similarContacts) {
-		await ContactMerger.mergeContact(originalContact, similarContact);
-	}
+		if (!similarContacts.length) {
+			return originalContact;
+		}
 
-	await LivechatContacts.deleteMany({ _id: { $in: similarContacts.map((c) => c._id) } });
-	return LivechatContacts.findOneById(contactId);
-};
+		for await (const similarContact of similarContacts) {
+			await ContactMerger.mergeContact(originalContact, similarContact);
+		}
 
-await License.onLicense('contact-id-verification', () => {
-	mergeContacts.patch(runMergeContacts);
+		await LivechatContacts.deleteMany({ _id: { $in: similarContacts.map((c) => c._id) } });
+		return LivechatContacts.findOneById(contactId);
+	});
 });

apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/verifyContactChannel.spec.ts

@@ -2,8 +2,6 @@ import { expect } from 'chai';
 import proxyquire from 'proxyquire';
 import sinon from 'sinon';
 
-import { runMergeContacts } from '../../../../../../server/patches/mergeContacts';
-
 const modelsMock = {
 	LivechatContacts: {
 		findOneById: sinon.stub(),
@@ -37,7 +35,6 @@ describe('verifyContactChannel', () => {
 		modelsMock.LivechatContacts.deleteMany.reset();
 		modelsMock.LivechatVisitors.updateMany.reset();
 		modelsMock.LivechatContacts.updateContact.reset();
-		mergeContactsStub.callsFake((contactId, channel) => runMergeContacts(() => undefined, contactId, channel));
 
 		sinon.useFakeTimers(new Date().getTime());
 	});