feat(customer/company): merge customFieldsData

erxes · Nov 11, 2019 · b4f3e46 · b4f3e46
1 parent d36ff05
commit b4f3e46
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/db/models/Companies.ts b/src/db/models/Companies.ts
@@ -162,6 +162,7 @@ export const loadClass = () => {
       await this.checkDuplication(companyFields, companyIds);
 
       let scopeBrandIds: string[] = [];
+      let customFieldsData = {};
       let tagIds: string[] = [];
       let names: string[] = [];
       let emails: string[] = [];
@@ -180,6 +181,9 @@ export const loadClass = () => {
           // Merging scopeBrandIds
           scopeBrandIds = [...scopeBrandIds, ...(companyObj.scopeBrandIds || [])];
 
+          // merge custom fields data
+          customFieldsData = { ...customFieldsData, ...(companyObj.customFieldsData || {}) };
+
           // Merging company's tag into 1 array
           tagIds = tagIds.concat(companyTags);
 
@@ -208,6 +212,7 @@ export const loadClass = () => {
       const company = await Companies.createCompany({
         ...companyFields,
         scopeBrandIds,
+        customFieldsData,
         tagIds,
         mergedIds: companyIds,
         names,

diff --git a/src/db/models/Customers.ts b/src/db/models/Customers.ts
@@ -261,6 +261,7 @@ export const loadClass = () => {
 
       let scopeBrandIds: string[] = [];
       let tagIds: string[] = [];
+      let customFieldsData = {};
 
       let emails: string[] = [];
       let phones: string[] = [];
@@ -273,14 +274,16 @@ export const loadClass = () => {
         phones.push(customerFields.primaryPhone);
       }
 
-      // Merging customer tags and companies
       for (const customerId of customerIds) {
         const customerObj = await Customers.findOne({ _id: customerId });
 
         if (customerObj) {
           // get last customer's integrationId
           customerFields.integrationId = customerObj.integrationId;
 
+          // merge custom fields data
+          customFieldsData = { ...customFieldsData, ...(customerObj.customFieldsData || {}) };
+
           // Merging scopeBrandIds
           scopeBrandIds = [...scopeBrandIds, ...(customerObj.scopeBrandIds || [])];
 
@@ -309,6 +312,7 @@ export const loadClass = () => {
       const customer = await this.createCustomer({
         ...customerFields,
         scopeBrandIds,
+        customFieldsData,
         tagIds,
         mergedIds: customerIds,
         emails,