Extract and fix consumable validation

Author: Ante Borzić

lib/sync/sync-module-validator.js

@@ -8,7 +8,7 @@ const transform = require('lodash/transform');
 const utils = require('../utils');
 
 const { AttributeError, ConsumableError, DomainError, FkError, UniquenessError } = errors;
-const { findIndexViolations, findViolationsDuplicates, validateAssociation } = utils;
+const { findIndexViolations, findViolationsDuplicates, validateBelongsTo, validateConsumables } = utils;
 
 class SyncModuleValidator {
   constructor(syncModule) {
@@ -24,7 +24,6 @@ class SyncModuleValidator {
   }
 
   get associations() {
-    // TODO: add check for consumability
     const types = ['BelongsTo', 'BelongsToMany', 'HasMany'];
     const addJunction = it => this.Model.associations[it.as] ||
       this.Model.hasMany(it.target, it);
@@ -36,12 +35,12 @@ class SyncModuleValidator {
 
   async run(entries) {
     try {
+      await this.syncModule.errors.flush();
       await this.validateAttributes();
       await this.validateUniqueness();
-      this.validateFks();
+      await this.validateFks();
       await this.validateDependencies();
-      this.validateConsumables();
-      this.validateDomain();
+      await this.validateConsumables();
       return this.syncModule.errors.invalidate({ model: this.Model });
     } catch (err) {
       // TODO: throw real error here
@@ -86,7 +85,7 @@ class SyncModuleValidator {
     const associationType = 'BelongsTo';
     const associations = filter(this.associations, { associationType });
     const validateFk = (instance, association) => {
-      if (validateAssociation(instance, association)) return;
+      if (validateBelongsTo(instance, association)) return;
       return this.pushError(FkError, instance, association);
     };
     return this.overAssociations(associations, validateFk);
@@ -103,11 +102,12 @@ class SyncModuleValidator {
   }
 
   validateConsumables() {
+    const associations = filter(this.associations, 'options.consumable');
     const validateConsumable = (instance, association) => {
-      if (validateAssociation(instance, association)) return;
+      if (validateConsumables(instance, association)) return;
       return this.pushError(ConsumableError, instance, association);
     };
-    return this.overAssociations(this.associations, validateConsumable);
+    return this.overAssociations(associations, validateConsumable);
   }
 
   async validateDomain() {

lib/utils/index.js

@@ -3,3 +3,5 @@
 exports.findIndexViolations = require('./find-index-violations');
 exports.findViolationsDuplicates = require('./find-violations-duplicates');
 exports.Loader = require('./loader');
+exports.validateBelongsTo = require('./validate-belongs-to');
+exports.validateConsumables = require('./validate-consumables');

lib/utils/validate-belongs-to.js

@@ -0,0 +1,10 @@
+'use strict';
+
+function validateBelongsTo(instance, association) {
+  const { associationAccessor, identifier } = association;
+  const key = instance[identifier];
+  const value = instance[associationAccessor];
+  return !key || value;
+}
+
+module.exports = validateBelongsTo;

lib/utils/validate-association.js lib/utils/validate-consumables.jslib/utils/validate-association.js renamed to lib/utils/validate-consumables.js

@@ -1,8 +1,9 @@
 'use strict';
 
 const every = require('lodash/every');
+const get = require('lodash/get');
 
-function validateAssociation(instance, association) {
+function validateConsumables(instance, association) {
   const validators = {
     BelongsTo: validateBelongsTo,
     BelongsToMany: validateBelongsToMany,
@@ -11,13 +12,16 @@ function validateAssociation(instance, association) {
   return validators[association.associationType](instance, association);
 }
 
-module.exports = validateAssociation;
+module.exports = validateConsumables;
 
 function validateBelongsTo(instance, association) {
-  const { associationAccessor, identifier } = association;
+  const { associationAccessor, identifier, options } = association;
   const key = instance[identifier];
   const value = instance[associationAccessor];
-  return !key || value;
+  const isValid = !!get(value, 'isValid');
+  return options.optional
+    ? !key || isValid
+    : isValid;
 }
 
 function validateBelongsToMany(instance, association) {