make channels field required in contacts

RocketChat · Nov 18, 2024 · d504306 · d504306
1 parent 3466a03
commit d504306
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 15 deletions.
diff --git a/apps/meteor/app/livechat/server/lib/Helper.ts b/apps/meteor/app/livechat/server/lib/Helper.ts
@@ -109,7 +109,7 @@ export const createLivechatRoom = async (
 	if (!contact) {
 		throw new Error('error-invalid-contact');
 	}
-	const verified = Boolean(contact.channels?.some((channel) => isVerifiedChannelInSource(channel, _id, source)));
+	const verified = Boolean(contact.channels.some((channel) => isVerifiedChannelInSource(channel, _id, source)));
 
 	// TODO: Solve `u` missing issue
 	const room: InsertionModel<IOmnichannelRoom> = {

diff --git a/apps/meteor/app/livechat/server/lib/QueueManager.ts b/apps/meteor/app/livechat/server/lib/QueueManager.ts
@@ -209,7 +209,7 @@ export class QueueManager {
 			return false;
 		}
 
-		return Boolean(contact.channels?.some((channel) => isVerifiedChannelInSource(channel, room.v._id, room.source)));
+		return Boolean(contact.channels.some((channel) => isVerifiedChannelInSource(channel, room.v._id, room.source)));
 	}
 
 	static async requestRoom({

diff --git a/apps/meteor/app/livechat/server/lib/contacts/ContactMerger.ts b/apps/meteor/app/livechat/server/lib/contacts/ContactMerger.ts
@@ -124,7 +124,7 @@ export class ContactMerger {
 
 		contact.emails?.forEach(({ address: value }) => fields.add({ type: 'email', value }));
 		contact.phones?.forEach(({ phoneNumber: value }) => fields.add({ type: 'phone', value }));
-		contact.channels?.forEach((value) => fields.add({ type: 'channel', value }));
+		contact.channels.forEach((value) => fields.add({ type: 'channel', value }));
 
 		if (name) {
 			fields.add({ type: 'name', value: name });

diff --git a/apps/meteor/app/livechat/server/lib/contacts/createContact.ts b/apps/meteor/app/livechat/server/lib/contacts/createContact.ts
@@ -22,7 +22,7 @@ export async function createContact({
 	phones,
 	customFields: receivedCustomFields = {},
 	contactManager,
-	channels,
+	channels = [],
 	unknown,
 	importIds,
 }: CreateContactParams): Promise<string> {

diff --git a/apps/meteor/ee/server/patches/isAgentAvailableToTakeContactInquiry.ts b/apps/meteor/ee/server/patches/isAgentAvailableToTakeContactInquiry.ts
@@ -30,7 +30,7 @@ export const runIsAgentAvailableToTakeContactInquiry = async (
 		return { value: false, error: 'error-unknown-contact' };
 	}
 
-	const isContactVerified = (contact.channels?.filter((channel) => isVerifiedChannelInSource(channel, visitorId, source)) || []).length > 0;
+	const isContactVerified = (contact.channels.filter((channel) => isVerifiedChannelInSource(channel, visitorId, source)) || []).length > 0;
 	if (!isContactVerified && settings.get<boolean>('Livechat_Block_Unverified_Contacts')) {
 		return { value: false, error: 'error-unverified-contact' };
 	}

diff --git a/apps/meteor/ee/server/patches/mergeContacts.ts b/apps/meteor/ee/server/patches/mergeContacts.ts
@@ -19,7 +19,7 @@ export const runMergeContacts = async (
 		throw new Error('error-invalid-contact');
 	}
 
-	const channel = originalContact.channels?.find((channel: ILivechatContactChannel) => isSameChannel(channel.visitor, visitor));
+	const channel = originalContact.channels.find((channel: ILivechatContactChannel) => isSameChannel(channel.visitor, visitor));
 	if (!channel) {
 		throw new Error('error-invalid-channel');
 	}

diff --git a/apps/meteor/server/models/raw/LivechatContacts.ts b/apps/meteor/server/models/raw/LivechatContacts.ts
@@ -58,6 +58,12 @@ export class LivechatContactsRaw extends BaseRaw<ILivechatContact> implements IL
 				},
 				unique: false,
 			},
+			{
+				key: {
+					channels: 1,
+				},
+				unique: false,
+			},
 		];
 	}
 
@@ -126,14 +132,7 @@ export class LivechatContactsRaw extends BaseRaw<ILivechatContact> implements IL
 					],
 				},
 				{
-					$or: [
-						{
-							channels: { $exists: false },
-						},
-						{
-							channels: { $size: 0 },
-						},
-					],
+					channels: [],
 				},
 			],
 		};

diff --git a/packages/apps-engine/src/definition/livechat/ILivechatContact.ts b/packages/apps-engine/src/definition/livechat/ILivechatContact.ts
@@ -40,7 +40,7 @@ export interface ILivechatContact {
     unknown?: boolean;
     conflictingFields?: ILivechatContactConflictingField[];
     customFields?: Record<string, string | unknown>;
-    channels?: ILivechatContactChannel[];
+    channels: ILivechatContactChannel[];
     createdAt: Date;
     lastChat?: {
         _id: string;