Merge pull request #43 from zapier/feature-improve-id-checks

Improving ID checks
zapier · Jul 18, 2017 · b4673ec · b4673ec
2 parents d3d467f + 9f41a4f
commit b4673ec
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/app-middlewares/after/checks.js b/src/app-middlewares/after/checks.js
@@ -25,7 +25,7 @@ const checkOutput = (output) => {
   if (runChecks) {
     const rawResults = checks
       .filter((check) => {
-        return check.shouldRun(event.method);
+        return check.shouldRun(event.method, event.bundle);
       })
       .map((check) => {
         return check.run(event.method, output.results)

diff --git a/src/checks/example.js b/src/checks/example.js
@@ -8,7 +8,7 @@
 */
 const exampleChecker = {
   name: 'exampleChecker',
-  shouldRun: (method) => {
+  shouldRun: (method/*, bundle*/) => {
     return method && true;
   },
   run: (method, results) => {

diff --git a/src/checks/trigger-has-id.js b/src/checks/trigger-has-id.js
@@ -9,10 +9,13 @@ const isTrigger = require('./is-trigger');
 */
 const triggerHasId = {
   name: 'triggerHasId',
-  shouldRun: isTrigger,
+  shouldRun: (method, bundle) => {
+    // Hooks will have a bundle.cleanedRequest and we don't need to check they've got an id
+    return (isTrigger(method) && !bundle.cleanedRequest);
+  },
   run: (method, results) => {
     const missingIdResult = _.find(results, (result) => {
-      return _.isUndefined(result.id) || _.isNull(result.id);
+      return !result || _.isUndefined(result.id) || _.isNull(result.id);
     });
 
     if (missingIdResult) {

diff --git a/test/checks.js b/test/checks.js
@@ -30,6 +30,9 @@ describe('checks', () => {
     checks.triggerHasId.run(testMethod, [{id: 1}, {id: 2}]).length.should.eql(0);
     checks.triggerHasId.run(testMethod, [{game_id: 1}]).length.should.eql(1);
     checks.triggerHasId.run(testMethod, []).length.should.eql(0, 'blank array');
+    checks.triggerHasId.run(testMethod, [1]).length.should.eql(1);
+    checks.triggerHasId.run(testMethod, [{id: null}]).length.should.eql(1);
+    checks.triggerHasId.run(testMethod, [{}]).length.should.eql(1);
   });
 
   it('should check for unique ids via triggerHasUniqueIds', () => {