regression: Do not throw an error when a required custom field is mis…

…sing on visitor to contact migration
RocketChat · Nov 27, 2024 · cf14131 · cf14131
1 parent fad7de4
commit cf14131
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/apps/meteor/app/livechat/server/lib/contacts/createContact.ts b/apps/meteor/app/livechat/server/lib/contacts/createContact.ts
@@ -15,6 +15,7 @@ export type CreateContactParams = {
 	contactManager?: string;
 	channels?: ILivechatContactChannel[];
 	importIds?: string[];
+	shouldValidateCustomFields?: boolean;
 };
 
 export async function createContact({
@@ -27,13 +28,15 @@ export async function createContact({
 	channels = [],
 	unknown,
 	importIds,
+	shouldValidateCustomFields = true,
 }: CreateContactParams): Promise<string> {
 	if (contactManager) {
 		await validateContactManager(contactManager);
 	}
 
-	const allowedCustomFields = await getAllowedCustomFields();
-	const customFields = validateCustomFields(allowedCustomFields, receivedCustomFields);
+	const customFields = shouldValidateCustomFields
+		? validateCustomFields(await getAllowedCustomFields(), receivedCustomFields)
+		: receivedCustomFields;
 
 	return LivechatContacts.insertContact({
 		name,

diff --git a/apps/meteor/app/livechat/server/lib/contacts/mapVisitorToContact.spec.ts b/apps/meteor/app/livechat/server/lib/contacts/mapVisitorToContact.spec.ts
@@ -53,6 +53,7 @@ const dataMap: [Partial<ILivechatVisitor>, IOmnichannelSource, CreateContactPara
 				},
 			],
 			customFields: undefined,
+			shouldValidateCustomFields: false,
 			contactManager: 'manager1',
 		},
 	],
@@ -87,6 +88,7 @@ const dataMap: [Partial<ILivechatVisitor>, IOmnichannelSource, CreateContactPara
 				},
 			],
 			customFields: undefined,
+			shouldValidateCustomFields: false,
 			contactManager: undefined,
 		},
 	],
@@ -130,6 +132,7 @@ const dataMap: [Partial<ILivechatVisitor>, IOmnichannelSource, CreateContactPara
 				},
 			],
 			customFields: undefined,
+			shouldValidateCustomFields: false,
 			lastChat: {
 				_id: 'last-chat-id',
 				ts: testDate,
@@ -175,6 +178,7 @@ const dataMap: [Partial<ILivechatVisitor>, IOmnichannelSource, CreateContactPara
 			customFields: {
 				customFieldId: 'customFieldValue',
 			},
+			shouldValidateCustomFields: false,
 			contactManager: undefined,
 		},
 	],

diff --git a/apps/meteor/app/livechat/server/lib/contacts/mapVisitorToContact.ts b/apps/meteor/app/livechat/server/lib/contacts/mapVisitorToContact.ts
@@ -33,6 +33,7 @@ export async function mapVisitorToContact(visitor: ILivechatVisitor, source: IOm
 				ignoreAdditionalFields: true,
 				ignoreValidationErrors: true,
 			}),
+		shouldValidateCustomFields: false,
 		lastChat: visitor.lastChat,
 		contactManager: visitor.contactManager?.username && (await getContactManagerIdByUsername(visitor.contactManager.username)),
 	};