added split option #801

erxes · Jun 26, 2020 · 3922218 · 3922218
1 parent a5f4a2c
commit 3922218
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 19 deletions.
diff --git a/engages-email-sender/src/sender.ts b/engages-email-sender/src/sender.ts
@@ -10,9 +10,7 @@ export const start = async data => {
   const { user, email, engageMessageId, customers } = data;
   const { content, subject, attachments } = email;
 
-  if (!(await Stats.findOne({ engageMessageId }))) {
-    await Stats.create({ engageMessageId });
-  }
+  await Stats.findOneAndUpdate({ engageMessageId }, { engageMessageId }, { upsert: true });
 
   const transporter = await createTransporter();
 

diff --git a/src/data/resolvers/mutations/engageUtils.ts b/src/data/resolvers/mutations/engageUtils.ts
@@ -17,6 +17,7 @@ import { debugBase } from '../../../debuggers';
 import { sendMessage } from '../../../messageBroker';
 import { MESSAGE_KINDS } from '../../constants';
 import { fetchBySegments } from '../../modules/segments/queryBuilder';
+import { chunkArray } from '../../utils';
 
 /**
  * Find customers
@@ -114,17 +115,6 @@ export const sendViaEmail = async (engageMessage: IEngageMessageDocument, custom
   const customerInfos: Array<{ _id: string; name: string; email: string; emailValidationStatus: string }> = [];
 
   const onFinishPiping = async () => {
-    const data = {
-      email: engageMessage.email,
-      customers: customerInfos,
-      user: {
-        email: user.email,
-        name: user.details && user.details.fullName,
-        position: user.details && user.details.position,
-      },
-      engageMessageId,
-    };
-
     if (engageMessage.kind === MESSAGE_KINDS.MANUAL && customerInfos.length === 0) {
       await EngageMessages.deleteOne({ _id: engageMessage._id });
       throw new Error('No customers found');
@@ -143,12 +133,25 @@ export const sendViaEmail = async (engageMessage: IEngageMessageDocument, custom
 
     await EngageMessages.setCustomersCount(engageMessage._id, 'validCustomersCount', customerInfos.length);
 
-    if (data.customers.length > 0) {
-      if (process.env.ENGAGE_ADMINS) {
-        data.customers = [...customerInfos, ...JSON.parse(process.env.ENGAGE_ADMINS)];
-      }
+    if (customerInfos.length > 0) {
+      const data: any = {
+        email: engageMessage.email,
+        customers: [],
+        user: {
+          email: user.email,
+          name: user.details && user.details.fullName,
+          position: user.details && user.details.position,
+        },
+        engageMessageId,
+      };
+
+      const chunks = chunkArray(customerInfos, 500);
 
-      await sendQueueMessage({ action: 'sendEngage', data });
+      for (const chunk of chunks) {
+        data.customers = chunk;
+
+        await sendQueueMessage({ action: 'sendEngage', data });
+      }
     }
   };
 

diff --git a/src/data/utils.ts b/src/data/utils.ts
@@ -976,3 +976,19 @@ export const getSubServiceDomain = ({ name }: { name: string }): string => {
 
   return defaultMappings[name];
 };
+
+export const chunkArray = (myArray, chunkSize: number) => {
+  let index = 0;
+
+  const arrayLength = myArray.length;
+  const tempArray: any[] = [];
+
+  for (index = 0; index < arrayLength; index += chunkSize) {
+    const myChunk = myArray.slice(index, index + chunkSize);
+
+    // Do something if you want with the group
+    tempArray.push(myChunk);
+  }
+
+  return tempArray;
+};