fix: contact custom attributes (#24)

chatwoot · Dec 19, 2023 · 2c35fd2 · 2c35fd2
1 parent a0bd051
commit 2c35fd2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/utils",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "Chatwoot utils",
   "private": false,
   "license": "MIT",

diff --git a/src/canned.ts b/src/canned.ts
@@ -3,6 +3,7 @@ import {
   Sender,
   Variables,
   CustomAttributes,
+  Contact,
 } from './types/conversation';
 const MESSAGE_VARIABLES_REGEX = /{{(.*?)}}/g;
 
@@ -28,15 +29,17 @@ export const getLastName = ({ user }: { user: Sender }) => {
 
 export const getMessageVariables = ({
   conversation,
+  contact
 }: {
   conversation: Conversation;
+  contact?: Contact;
 }) => {
   const {
     meta: { assignee, sender },
     id,
     custom_attributes: conversationCustomAttributes = {},
   } = conversation;
-  const { custom_attributes: contactCustomAttributes } = sender || {};
+  const { custom_attributes: contactCustomAttributes } = contact || {};
 
   const standardVariables = {
     'contact.name': capitalizeName(sender?.name || ''),

diff --git a/src/types/conversation.ts b/src/types/conversation.ts
@@ -17,6 +17,14 @@ export interface Sender {
   custom_attributes?: CustomAttributes;
 }
 
+export interface Contact {
+  id: number;
+  email?: string;
+  name?: string;
+  phone_number?: string;
+  custom_attributes?: CustomAttributes;
+}
+
 export interface Assignee {
   id: number;
   email?: string;

diff --git a/test/canned.test.ts b/test/canned.test.ts
@@ -98,7 +98,6 @@ describe('#getMessageVariables', () => {
           name: 'john Doe',
           email: 'john.doe@gmail.com',
           phone_number: '1234567890',
-          custom_attributes: { priority: 'high' },
         },
       },
       id: 1,
@@ -107,7 +106,15 @@ describe('#getMessageVariables', () => {
         car_year: '2022',
       },
     };
-    expect(getMessageVariables({ conversation })).toEqual({
+    const contact = {
+      id: 3,
+      name: 'john Doe',
+      email: 'john.doe@gmail.com',
+      phone_number: '1234567890',
+      custom_attributes: { priority: 'high' },
+    };
+
+    expect(getMessageVariables({ conversation, contact })).toEqual({
       'contact.name': 'John Doe',
       'contact.first_name': 'John',
       'contact.id': 3,