texter todos: gather unassigned checks into a single query instead of per-assignment

src/extensions/dynamicassignment-batches/all-texters/index.js

@@ -11,7 +11,8 @@ export const requestNewBatchCount = async ({
   texter,
   r,
   cacheableData,
-  loaders
+  loaders,
+  hasAny
 }) => {
   // START WITH SOME BASE-LINE THINGS EVERY POLICY SHOULD HAVE
   if (!campaign.use_dynamic_assignment || campaign.is_archived) {
@@ -21,15 +22,24 @@ export const requestNewBatchCount = async ({
     return 0;
   }
 
-  const availableCount = await r.getCount(
-    r
-      .knex("campaign_contact")
-      .where({
-        campaign_id: campaign.id,
-        is_opted_out: false,
-        message_status: "needsMessage"
-      })
-      .whereNull("assignment_id")
-  );
+  const countQuery = r
+    .knex("campaign_contact")
+    .where({
+      campaign_id: campaign.id,
+      is_opted_out: false,
+      message_status: "needsMessage"
+    })
+    .whereNull("assignment_id");
+
+  let availableCount = 0;
+  if (hasAny) {
+    availableCount = assignment.hasOwnProperty("hasUnassigned")
+      ? assignment.hasUnassigned
+      : (await countQuery.select("id").first())
+      ? 1
+      : 0;
+  } else {
+    availableCount = await r.getCount(countQuery);
+  }
   return availableCount;
 };

src/extensions/dynamicassignment-batches/finished-replies/index.js

@@ -11,7 +11,8 @@ export const requestNewBatchCount = async ({
   texter,
   r,
   cacheableData,
-  loaders
+  loaders,
+  hasAny
 }) => {
   // START WITH SOME BASE-LINE THINGS EVERY POLICY SHOULD HAVE
   if (!campaign.use_dynamic_assignment || campaign.is_archived) {
@@ -20,16 +21,25 @@ export const requestNewBatchCount = async ({
   if (assignment.max_contacts === 0 || !campaign.batch_size) {
     return 0;
   }
-  const availableCount = await r.getCount(
-    r
-      .knex("campaign_contact")
-      .where({
-        campaign_id: campaign.id,
-        is_opted_out: false,
-        message_status: "needsMessage"
-      })
-      .whereNull("assignment_id")
-  );
+  const countQuery = r
+    .knex("campaign_contact")
+    .where({
+      campaign_id: campaign.id,
+      is_opted_out: false,
+      message_status: "needsMessage"
+    })
+    .whereNull("assignment_id");
+
+  let availableCount = 0;
+  if (hasAny) {
+    availableCount = assignment.hasOwnProperty("hasUnassigned")
+      ? assignment.hasUnassigned
+      : (await countQuery.select("id").first())
+      ? 1
+      : 0;
+  } else {
+    availableCount = await r.getCount(countQuery);
+  }
   // Make sure they don't have any needsResponse(s)
   if (availableCount) {
     const hasOpenReplies = await getContacts(
@@ -42,11 +52,12 @@ export const requestNewBatchCount = async ({
       organization,
       campaign,
       true // forCount=true because we don't care about ordering
-    ).first();
+    )
+      .select("campaign_contact.id")
+      .first();
     if (hasOpenReplies) {
       return 0;
     }
   }
-
   return availableCount;
 };

src/extensions/dynamicassignment-batches/vetted-takeconversations/index.js

@@ -12,7 +12,8 @@ export const requestNewBatchCount = async ({
   texter,
   r,
   cacheableData,
-  loaders
+  loaders,
+  hasAny
 }) => {
   // START WITH SOME BASE-LINE THINGS EVERY POLICY SHOULD HAVE
   if (campaign.is_archived) {
@@ -30,7 +31,6 @@ export const requestNewBatchCount = async ({
   if (!isVetted) {
     return 0;
   }
-
   const availableCount = await r.getCount(
     r
       .knex("campaign_contact")

src/extensions/dynamicassignment-batches/vetted-texters/index.js

@@ -11,7 +11,8 @@ export const requestNewBatchCount = async ({
   texter,
   r,
   cacheableData,
-  loaders
+  loaders,
+  hasAny
 }) => {
   // START WITH SOME BASE-LINE THINGS EVERY POLICY SHOULD HAVE
   if (!campaign.use_dynamic_assignment || campaign.is_archived) {
@@ -39,16 +40,24 @@ export const requestNewBatchCount = async ({
       return 0;
     }
   }
+  const countQuery = r
+    .knex("campaign_contact")
+    .where({
+      campaign_id: campaign.id,
+      is_opted_out: false,
+      message_status: "needsMessage"
+    })
+    .whereNull("assignment_id");
+  let availableCount = 0;
+  if (hasAny) {
+    availableCount = assignment.hasOwnProperty("hasUnassigned")
+      ? assignment.hasUnassigned
+      : (await countQuery.select("id").first())
+      ? 1
+      : 0;
+  } else {
+    availableCount = await r.getCount(countQuery);
+  }
 
-  const availableCount = await r.getCount(
-    r
-      .knex("campaign_contact")
-      .where({
-        campaign_id: campaign.id,
-        is_opted_out: false,
-        message_status: "needsMessage"
-      })
-      .whereNull("assignment_id")
-  );
   return availableCount;
 };

src/server/api/assignment.js

@@ -161,6 +161,21 @@ export function getContacts(
   return query;
 }
 
+// Used for Assignment.contactsCount to get a cross-section of timezone/status counts
+const filterCount = (assignment, statusFilter, offsetFilter) =>
+  Object.keys(assignment.tzStatusCounts) // .entries post-node10.x
+    .map(m => ({ status: m, offsets: assignment.tzStatusCounts[m] }))
+    .filter(statusFilter)
+    .map(({ offsets }) =>
+      offsets
+        .filter(offsetFilter)
+        .map(x => Number(x.count))
+        .reduce((a, b) => {
+          return a + b;
+        }, 0)
+    )
+    .reduce((a, b) => a + b, 0);
+
 export const resolvers = {
   Assignment: {
     ...mapFieldsToModel(["id", "maxContacts"], Assignment),
@@ -194,6 +209,7 @@ export const resolvers = {
       const organization = await loaders.organization.load(
         campaign.organization_id
       );
+
       const policies = getDynamicAssignmentBatchPolicies({
         organization,
         campaign
@@ -209,7 +225,8 @@ export const resolvers = {
         organization,
         campaign,
         assignment,
-        texter: user
+        texter: user,
+        hasAny: true
       });
       const suggestedCount = Math.min(
         assignment.max_contacts || campaign.batch_size,
@@ -261,22 +278,10 @@ export const resolvers = {
           organization,
           contactsFilter && contactsFilter.validTimezone
         );
-        const filterCount = (statusFilter, offsetFilter) =>
-          Object.keys(assignment.tzStatusCounts) // .entries post-node10.x
-            .map(m => ({ status: m, offsets: assignment.tzStatusCounts[m] }))
-            .filter(statusFilter)
-            .map(({ offsets }) =>
-              offsets
-                .filter(offsetFilter)
-                .map(x => Number(x.count))
-                .reduce((a, b) => {
-                  return a + b;
-                }, 0)
-            )
-            .reduce((a, b) => a + b, 0);
         if (contactsFilter && !contactsFilter.messageStatus) {
           // ASSUME: invalidTimezones
           const invalidTzCount = filterCount(
+            assignment,
             ({ status }) =>
               status === "needsMessage" || status === "needsResponse",
             offset => invalidOffsets.indexOf(offset.tz) !== -1
@@ -290,12 +295,14 @@ export const resolvers = {
           contactsFilter.validTimezone
         ) {
           const validStatusCount = filterCount(
+            assignment,
             ({ status }) => status === contactsFilter.messageStatus,
             offset => validOffsets.indexOf(offset.tz) !== -1
           );
           return validStatusCount;
         } else if (!contactsFilter) {
           return filterCount(
+            assignment,
             status => true,
             offset => true
           );

src/server/api/user.js

@@ -255,7 +255,8 @@ export const resolvers = {
         "assignment.created_at",
         "assignment_feedback.feedback",
         "assignment_feedback.is_acknowledged",
-        "assignment_feedback.creator_id"
+        "assignment_feedback.creator_id",
+        "campaign.use_dynamic_assignment"
       ];
       let query = r
         .knexReadOnly("assignment")
@@ -315,11 +316,38 @@ export const resolvers = {
             )
           );
         const result = await query;
-
+        const campaignIds = result
+          .filter(a => a.use_dynamic_assignment)
+          .map(a => a.campaign_id);
+        const campaignsWithUnassigned = {};
+        let hasUnassigned = [];
+        if (campaignIds.length) {
+          hasUnassigned = await r
+            .knex("campaign_contact")
+            .where({
+              is_opted_out: false,
+              message_status: "needsMessage"
+            })
+            .whereNull("assignment_id")
+            .whereIn("campaign_id", campaignIds)
+            .select("campaign_id")
+            .groupBy("campaign_id")
+            .havingRaw("count(1) > 0");
+          hasUnassigned.forEach(c => {
+            campaignsWithUnassigned[c.campaign_id] = 1;
+          });
+        }
         const assignments = {};
         for (const assn of result) {
           if (!assignments[assn.id]) {
-            assignments[assn.id] = { ...assn, tzStatusCounts: {} };
+            assignments[assn.id] = {
+              ...assn,
+              tzStatusCounts: {}
+            };
+            if (assn.use_dynamic_assignment && campaignIds.length) {
+              assignments[assn.id].hasUnassigned =
+                campaignsWithUnassigned[assn.campaign_id] || 0;
+            }
           }
           if (!assignments[assn.id].tzStatusCounts[assn.message_status]) {
             assignments[assn.id].tzStatusCounts[assn.message_status] = [];