chore: split Contacts.ts file and its tests into separate files for e…

…very function (#33698)
RocketChat · Oct 22, 2024 · b4acee8 · b4acee8
1 parent c11a62a
commit b4acee8
Show file tree

Hide file tree

Showing 46 changed files with 1,241 additions and 861 deletions.
diff --git a/apps/meteor/app/api/server/lib/maybeMigrateLivechatRoom.ts b/apps/meteor/app/api/server/lib/maybeMigrateLivechatRoom.ts
@@ -2,7 +2,7 @@ import { isOmnichannelRoom, type IRoom } from '@rocket.chat/core-typings';
 import { Rooms } from '@rocket.chat/models';
 import type { FindOptions } from 'mongodb';
 
-import { migrateVisitorIfMissingContact } from '../../../livechat/server/lib/Contacts';
+import { migrateVisitorIfMissingContact } from '../../../livechat/server/lib/contacts/migrateVisitorIfMissingContact';
 
 export async function maybeMigrateLivechatRoom(room: IRoom | null, options: FindOptions<IRoom> = {}): Promise<IRoom | null> {
 	if (!room || !isOmnichannelRoom(room)) {

diff --git a/apps/meteor/app/apps/server/bridges/contact.ts b/apps/meteor/app/apps/server/bridges/contact.ts
@@ -4,7 +4,8 @@ import { ContactBridge } from '@rocket.chat/apps-engine/server/bridges';
 import type { IVisitor } from '@rocket.chat/core-typings';
 import { LivechatContacts } from '@rocket.chat/models';
 
-import { addContactEmail, verifyContactChannel } from '../../../livechat/server/lib/Contacts';
+import { addContactEmail } from '../../../livechat/server/lib/contacts/addContactEmail';
+import { verifyContactChannel } from '../../../livechat/server/lib/contacts/verifyContactChannel';
 
 export class AppContactBridge extends ContactBridge {
 	constructor(private readonly orch: IAppServerOrchestrator) {

diff --git a/apps/meteor/app/importer/server/classes/converters/ContactConverter.ts b/apps/meteor/app/importer/server/classes/converters/ContactConverter.ts
@@ -1,7 +1,9 @@
 import type { IImportContact, IImportContactRecord } from '@rocket.chat/core-typings';
 import { LivechatVisitors } from '@rocket.chat/models';
 
-import { createContact, getAllowedCustomFields, validateCustomFields } from '../../../../livechat/server/lib/Contacts';
+import { createContact } from '../../../../livechat/server/lib/contacts/createContact';
+import { getAllowedCustomFields } from '../../../../livechat/server/lib/contacts/getAllowedCustomFields';
+import { validateCustomFields } from '../../../../livechat/server/lib/contacts/validateCustomFields';
 import { RecordConverter } from './RecordConverter';
 
 export class ContactConverter extends RecordConverter<IImportContactRecord> {

diff --git a/apps/meteor/app/livechat/server/api/lib/visitors.ts b/apps/meteor/app/livechat/server/api/lib/visitors.ts
@@ -4,7 +4,8 @@ import type { FindOptions } from 'mongodb';
 
 import { callbacks } from '../../../../../lib/callbacks';
 import { canAccessRoomAsync } from '../../../../authorization/server/functions/canAccessRoom';
-import { migrateVisitorToContactId, getContactIdByVisitorId } from '../../lib/Contacts';
+import { getContactIdByVisitorId } from '../../lib/contacts/getContactIdByVisitorId';
+import { migrateVisitorToContactId } from '../../lib/contacts/migrateVisitorToContactId';
 
 export async function findVisitorInfo({ visitorId }: { visitorId: IVisitor['_id'] }) {
 	const visitor = await LivechatVisitors.findOneEnabledById(visitorId);

diff --git a/apps/meteor/app/livechat/server/api/v1/contact.ts b/apps/meteor/app/livechat/server/api/v1/contact.ts
@@ -13,7 +13,12 @@ import { Meteor } from 'meteor/meteor';
 
 import { API } from '../../../../api/server';
 import { getPaginationItems } from '../../../../api/server/helpers/getPaginationItems';
-import { getContactHistory, Contacts, createContact, getContact, updateContact, getContacts } from '../../lib/Contacts';
+import { createContact } from '../../lib/contacts/createContact';
+import { getContact } from '../../lib/contacts/getContact';
+import { getContactHistory } from '../../lib/contacts/getContactHistory';
+import { getContacts } from '../../lib/contacts/getContacts';
+import { registerContact } from '../../lib/contacts/registerContact';
+import { updateContact } from '../../lib/contacts/updateContact';
 
 API.v1.addRoute(
 	'omnichannel/contact',
@@ -36,7 +41,7 @@ API.v1.addRoute(
 				}),
 			});
 
-			const contact = await Contacts.registerContact(this.bodyParams);
+			const contact = await registerContact(this.bodyParams);
 
 			return API.v1.success({ contact });
 		},