@foxtware/mineral 0.1.23 → 0.1.25

package/api/peoplevox/peoplevox.utils.js

@@ -6,6 +6,7 @@ const {
   FetchClient,
   appendUrlToBase,
   logDeep,
+  objectToArray,
 } = require('../utils');
 const { withPeoplevoxSession } = require('../peoplevox/peoplevox.sessions');
 
@@ -70,7 +71,7 @@ const useSoapEnvelope = async (state) => {
     sessionId,
   });
 
-  !HOSTED && logDeep({ envelopeXml });
+  // !HOSTED && logDeep({ envelopeXml });
 
   return {
     requestPayload: {
@@ -214,6 +215,64 @@ const peoplevoxClient = new FetchClient({
   ],
 });
 
+const packageItemsToPackages = (packageItems) => {
+  const peoplevoxPackagesByKey = {};
+
+  for (const item of packageItems) {
+
+    // Do all destructuring here
+    const {
+      'Despatch number': despatchNumber,
+      'Package number': packageNumber,
+      'Package tracking number': trackingNumber,
+      'Package despatch timestamp': despatchTimestamp,
+      'Package carrier name': carrierName,
+      'Package service type code': serviceTypeCode,
+      'Sales order number': salesOrderNumber,
+      'Site reference': siteReference,
+      'Sales order item code': salesOrderItemCode,
+      'Sales order item line': salesOrderItemLine,
+      'Sales order item quantity ordered': salesOrderItemQuantityOrdered,
+      'Item code': itemCode,
+      'Item quantity': itemQuantity,
+    } = item;
+
+    /* 
+      Dedupe by tracking number, since peoplevox returns a row per item
+      (not per package). Fall back to despatchNumber:packageNumber for
+      packages without a tracking number, so they don't all collapse together.
+    */
+    const packageKey = trackingNumber || `${ despatchNumber }:${ packageNumber }`;
+
+    if (!peoplevoxPackagesByKey[packageKey]) {
+      peoplevoxPackagesByKey[packageKey] = {
+        despatchNumber,
+        packageNumber,
+        trackingNumber,
+        despatchTimestamp,
+        carrierName,
+        serviceTypeCode,
+        salesOrderNumber,
+        siteReference,
+        items: [],
+      };
+    }
+
+    peoplevoxPackagesByKey[packageKey].items.push({
+      salesOrderItemCode,
+      salesOrderItemLine,
+      salesOrderItemQuantityOrdered,
+      itemCode,
+      itemQuantity,
+    });
+  }
+
+  const packages = objectToArray(peoplevoxPackagesByKey, { keyProp: 'packageKey' });
+
+  return packages;
+};
+
 module.exports = {
   peoplevoxClient,
+  packageItemsToPackages,
 };

package/api/shopify/shopifyMutationDo.js

@@ -60,7 +60,7 @@ const shopifyMutationDo = async (
     ...clientOptions,
   });
 
-  logDeep(response);
+  // logDeep(response);
   return response;
 };
 

package/api/shopify/shopifyOrdersGet.js

@@ -1,18 +1,17 @@
 const { ArgsWarden } = require('../utils');
 const { credsValidator } = require('../validators');
-const { shopifyClient } = require('./shopify.utils');
+const { shopifyGet, shopifyGetter } = require('./shopifyGet');
 
 const argsWarden = new ArgsWarden([
   ['credsPayload', credsValidator],
 ]);
 
 const shopifyOrdersGet = async (
+  returnGetter, // Always bound
+
   credsPayload,
   {
-    first = 50,
-    after,
-    query,
-    apiVersion,
+    ...getterOptions // e.g. limit
   } = {},
 ) => {
 
@@ -23,52 +22,17 @@ const shopifyOrdersGet = async (
     return rejectResponse;
   }
 
-  const response = await shopifyClient.fetch({
-    requestPayload: {
-      method: 'post',
-      body: {
-        query: `
-        query OrdersGet(
-          $first: Int!,
-          $after: String,
-          $query: String
-        ) {
-          orders(
-            first: $first,
-            after: $after,
-            query: $query
-          ) {
-            edges {
-              node {
-                id
-                name
-                createdAt
-                displayFinancialStatus
-                displayFulfillmentStatus
-              }
-            }
-          }
-        }
-      `,
-        variables: {
-          first,
-          after,
-          query,
-        },
-      },
-    },
-    context: {
-      credsPayload,
-      apiVersion,
-      resultPath: 'data.orders',
+  const getterArgs = [
+    credsPayload, 
+    'order', 
+    {
+      ...getterOptions,
     },
-  });
-
-  if (!response.ok) {
-    return response;
-  }
+  ];
 
-  return response;
+  return returnGetter
+    ? shopifyGetter(...getterArgs)
+    : shopifyGet(...getterArgs);
 };
 
 const funcApiConfig = {
@@ -76,6 +40,7 @@ const funcApiConfig = {
 };
 
 module.exports = {
-  shopifyOrdersGet,
+  shopifyOrdersGet: (...args) => shopifyOrdersGet(false, ...args),
+  shopifyOrdersGetter: (...args) => shopifyOrdersGet(true, ...args),
   funcApiConfig,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foxtware/mineral",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "bin": {
     "mineral": "bin/mineral.js"
   },