Patched datastream after hook to handle null uom field

Author: jscottsf

dist/server/services/datastream/hooks/index.js

@@ -326,7 +326,25 @@ exports.before = {
   remove: [auth.hooks.authenticate('jwt'), authHooks.restrictToRoles({
     roles: ['sys-admin']
   })]
-};
+
+  /**
+   * HACK: Ensure uom is not null since populate({schema: convertibleToUomsSchema}) blows chunks.
+   */
+};function discardIfFalse(field) {
+  return hook => {
+    const items = commonHooks.getItems(hook);
+
+    if (Array.isArray(items)) {
+      items.forEach(item => {
+        if (!item[field]) delete item[field];
+      });
+    } else if (typeof items === 'object') {
+      if (!items[field]) delete items[field];
+    }
+
+    return hook;
+  };
+}
 
 const uomSchema = {
   include: {
@@ -358,7 +376,7 @@ const preferredUomsSchema = {
 };
 
 exports.after = {
-  all: [commonHooks.populate({ schema: uomSchema }), commonHooks.populate({ schema: convertibleToUomsSchema }), commonHooks.populate({ schema: preferredUomsSchema })]
+  all: [commonHooks.populate({ schema: uomSchema }), discardIfFalse('uom'), commonHooks.populate({ schema: convertibleToUomsSchema }), commonHooks.populate({ schema: preferredUomsSchema })]
 
   // find: [],
   // get: [],

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "dendra-web-api",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "Dendra public facing REST API.",
   "license": "BSD-2-Clause-FreeBSD",
   "author": "J. Scott Smith <[email protected]>",
@@ -35,7 +35,7 @@
     "@dendra-science/api-hooks-common": "0.0.1",
     "@dendra-science/math": "0.0.1",
     "@dendra-science/utils": "0.0.1",
-    "ajv": "^5.5.0",
+    "ajv": "^5.5.1",
     "babel-runtime": "^6.26.0",
     "body-parser": "^1.18.2",
     "compression": "^1.7.1",
@@ -60,15 +60,15 @@
     "passport": "^0.4.0",
     "pug": "^2.0.0-rc.4",
     "request": "^2.83.0",
-    "sequelize": "^4.23.1",
+    "sequelize": "^4.27.0",
     "winston": "^2.4.0"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
     "babel-preset-es2015-node6": "^0.4.0",
     "chai": "^4.1.2",
-    "eslint": "^4.12.0",
+    "eslint": "^4.13.0",
     "eslint-config-standard": "^10.2.1",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-node": "^5.2.1",

package.json

@@ -380,6 +380,25 @@ exports.before = {
   ]
 }
 
+/**
+ * HACK: Ensure uom is not null since populate({schema: convertibleToUomsSchema}) blows chunks.
+ */
+function discardIfFalse (field) {
+  return (hook) => {
+    const items = commonHooks.getItems(hook)
+
+    if (Array.isArray(items)) {
+      items.forEach(item => {
+        if (!item[field]) delete item[field]
+      })
+    } else if (typeof items === 'object') {
+      if (!items[field]) delete items[field]
+    }
+
+    return hook
+  }
+}
+
 const uomSchema = {
   include: {
     service: 'uoms',
@@ -412,6 +431,7 @@ const preferredUomsSchema = {
 exports.after = {
   all: [
     commonHooks.populate({schema: uomSchema}),
+    discardIfFalse('uom'),
     commonHooks.populate({schema: convertibleToUomsSchema}),
     commonHooks.populate({schema: preferredUomsSchema})
   ]