Separated out query for reuse and interactions-flow route

no longer uses sample data

src/api/routes/interactions-flow.js

@@ -1,12 +1,13 @@
 import { Router } from "express";
+import axios from "axios";
+import localStorage from "local-storage";
 import sampleFlow from "../../utils/sampleFlow.js";
-import sampleUDG from "../../utils/sampleUDGresponse.js";
 const router = Router();
 import { logger } from "../../utils/index.js";
+import { referenceIdQuery } from "../../utils/graphQueries.js";
 
 router.get("/", (req, res) => {
-
+  const data = {
-  var data = {
     nodes: [],
     links: [],
   };
@@ -19,11 +20,56 @@ router.get("/", (req, res) => {
     chain[filterNames[index] + "-" + filterNames[index + 1]] = true;
   }
 
-  sampleUDG.data.findContactsCompletedBetween.edges.forEach((value) => {
+  const startTime = new Date(
+    new Date().setFullYear(new Date().getFullYear() - 2)
+  );
+  var endTime = new Date();
+  // FIX for 'endTime' parameter cannot be later than one minute prior to now.
+  endTime.setMinutes(endTime.getMinutes() - 1);
+
+  const { host, tenant, token } = localStorage(req.query.authKey);
+
+  axios
+    .post(
+      `${host}/unified-data-gateway/${tenant}/graphql`,
+      JSON.stringify({
+        query: referenceIdQuery,
+        variables: { startTime, endTime },
+      }),
+      {
+        headers: {
+          Authorization: `OIDC_id_token ${token}`,
+          "Content-Type": "application/json",
+        },
+      }
+    )
+    .then((result) => {
+      if (result.data.errors && result.data.errors.length > 0) {
+        result.data.errors.forEach(function (error) {
+          logger.error("ERROR: Errors in results - " + error.message);
+        });
+
+        // TODO: Should keep errors for filteredContacts
+        result.data.errors = [];
+      }
+
+      if (!result.data.data.findContactsCompletedBetween) {
+        logger.debug("No findContactsCompletedBetween returned.");
+        res.send(data);
+        return;
+      }
+
+      result.data.data.findContactsCompletedBetween.edges.forEach((value) => {
+        // TODO: Should add INBOUND and OUTBOUND Nodes before Channel
         addNode(filter, "Channel", value.node.interaction.__typename, data);
 
         if (value.node.interaction.subChannel) {
-      addNode(filter, "SubChannel", value.node.interaction.subChannel, data);
+          addNode(
+            filter,
+            "SubChannel",
+            value.node.interaction.subChannel,
+            data
+          );
           if (chain["Channel-SubChannel"]) {
             addLink(
               data,
@@ -49,7 +95,11 @@ router.get("/", (req, res) => {
             addNode(filter, "Outcome", element.node.text, data);
 
             if (chain["Channel-Outcome"]) {
-          addLink(data, value.node.interaction.__typename, element.node.text);
+              addLink(
+                data,
+                value.node.interaction.__typename,
+                element.node.text
+              );
             }
 
             if (chain["SubChannel-Outcome"]) {
@@ -75,14 +125,15 @@ router.get("/", (req, res) => {
         }
       });
 
+      logger.debug(`Sending data: ${JSON.stringify(data, null, 2)}`);
+      res.send(data);
+    });
+
   if (req.query.useSampleData) {
     const data = sampleFlow(filter);
     res.send(data);
     return;
   }
-
-  logger.debug(`Sending data: ${JSON.stringify(data, null, 2)}`);
-  res.send(data);
 });
 
 function addLink(data, source, target) {

src/api/routes/unified-data-gateway.js

@@ -4,101 +4,29 @@ import { logger } from "../../utils/index.js";
 // import { URLSearchParams } from "url";
 import { inspect } from "util";
 import localStorage from "local-storage";
+import { referenceIdQuery } from "../../utils/graphQueries.js";
 
 const router = Router();
 
 router.get("/", (req, res, next) => {
-
   query(req.query.referenceId);
 
   function query(referenceId) {
     logger.info(`Executing Query with ${referenceId}`);
 
-    const query = `query ($startTime: DateTime, $endTime: DateTime) {
-      findContactsCompletedBetween(startTime: $startTime, endTime: $endTime, filter: {interactionTypes : EMAIL}) {
-       
-      totalCount
-      edges {
-        node {
-          systemId
-          startTime
-          endTime
-          direction
-          handledBy {
-              username
-              firstName
-              lastName
-              nickname
-              orgScope
-          }
-          activeDuration
-          notes {
-             totalCount
-                 edges {
-                     node {
-                        text
-                      }
-                  }
-              }
-          interaction {
-              systemId
-              locale
-              __typename
-              ... on Email {
-                  messageId
-                  threadId
-                  sentDate
-                  receivedDate
-                  subject
-                  fromAddress
-                  toAddresses
-                  ccAddresses
-                  bccAddresses
-                  detectedLanguage
-                  mailboxName
-                  attachmentCount
-                  isDuplicate
-              }
-          }
-          outcome {
-              totalCount
-                  edges {
-                      node {
-                          text
-                          isActive
-                          isVisible
-                      }
-                  }
-              }
-          customer {
-              totalCount
-                  edges {
-                      node {
-                          ref
-                          firstName
-                          lastName
-                      }
-                  }
-          }
-          queue {
-              name
-              orgScope
-          }
-        }
-      }
-    }
-  }`;
     const startTime = new Date(
       new Date().setFullYear(new Date().getFullYear() - 2)
     );
-    const endTime = new Date(new Date().setHours(new Date().getHours() - 1));
+    var endTime = new Date();
+    // FIX for 'endTime' parameter cannot be later than one minute prior to now.
+    endTime.setMinutes(endTime.getMinutes() - 1);
 
     const { host, tenant, token } = localStorage(req.query.authKey);
     axios
       .post(
         `${host}/unified-data-gateway/${tenant}/graphql`,
         JSON.stringify({
-          query,
+          query: referenceIdQuery,
           variables: { startTime, endTime },
         }),
         {
@@ -109,8 +37,6 @@ router.get("/", (req, res, next) => {
         }
       )
       .then((result) => {
-        const contacts = result.data.data.findContactsCompletedBetween.edges;
-
         if (result.data.errors && result.data.errors.length > 0) {
           result.data.errors.forEach(function (error) {
             logger.error("ERROR: Errors in results - " + error.message);
@@ -120,6 +46,8 @@ router.get("/", (req, res, next) => {
           result.data.errors = [];
         }
 
+        const contacts = result.data.data.findContactsCompletedBetween.edges;
+
         const filteredContacts = [];
         contacts.forEach(function (contact) {
           if (contact.node.interaction.__typename === "Email") {
@@ -204,7 +132,7 @@ router.get("/", (req, res, next) => {
       .catch((err) => {
         // bin the token on error
         req.session.destroy();
-        next(err)
+        next(err);
       });
   }
 });

src/utils/graphQueries.js

@@ -0,0 +1,74 @@
+export const referenceIdQuery = `query ($startTime: DateTime, $endTime: DateTime) {
+    findContactsCompletedBetween(startTime: $startTime, endTime: $endTime) {
+     
+    totalCount
+    edges {
+      node {
+        systemId
+        startTime
+        endTime
+        direction
+        handledBy {
+            username
+            firstName
+            lastName
+            nickname
+            orgScope
+        }
+        activeDuration
+        notes {
+           totalCount
+               edges {
+                   node {
+                      text
+                    }
+                }
+            }
+        interaction {
+            systemId
+            locale
+            __typename
+            ... on Email {
+                messageId
+                threadId
+                sentDate
+                receivedDate
+                subject
+                fromAddress
+                toAddresses
+                ccAddresses
+                bccAddresses
+                detectedLanguage
+                mailboxName
+                attachmentCount
+                isDuplicate
+            }
+        }
+        outcome {
+            totalCount
+                edges {
+                    node {
+                        text
+                        isActive
+                        isVisible
+                    }
+                }
+            }
+        customer {
+            totalCount
+                edges {
+                    node {
+                        ref
+                        firstName
+                        lastName
+                    }
+                }
+        }
+        queue {
+            name
+            orgScope
+        }
+      }
+    }
+  }
+}`;