Merge pull request #262 from DivanteLtd/release/v1.9

Release/v1.9.4

Author: lukeromanowicz

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.9.4] - 2019.06.03
+- extension schemas for order as not required anymore - @EmilsM, @lukeromanowicz (#259, #263)
+
 ## [1.9.3] - 2019.05.27
 - Change min postal code length in user profile to 3 so it's sames as in orders - @lukeromanowicz (#253)
 

src/api/order.js

@@ -4,6 +4,7 @@ import { merge } from 'lodash';
 import PlatformFactory from '../platform/factory';
 
 const Ajv = require('ajv'); // json validator
+const fs = require('fs');
 const kue = require('kue');
 const jwa = require('jwa');
 const hmac = jwa('HS256');
@@ -29,7 +30,10 @@ export default ({ config, db }) => resource({
 		require('ajv-keywords')(ajv, 'regexp');
 
 		const orderSchema = require('../models/order.schema.js')
-		const orderSchemaExtension = require('../models/order.schema.extension.json')
+		let orderSchemaExtension = {}
+		if(fs.existsSync('../models/order.schema.extension.json')) {
+			orderSchemaExtension = require('../models/order.schema.extension.json')
+		}
 		const validate = ajv.compile(merge(orderSchema, orderSchemaExtension));
 
 		if (!validate(req.body)) { // schema validation of upcoming order

src/api/user.js

@@ -5,6 +5,7 @@ import jwt from 'jwt-simple';
 import { merge } from 'lodash';
 
 const Ajv = require('ajv'); // json validator
+const fs = require('fs');
 
 function addUserGroupToken(config, result) {
   /**
@@ -38,7 +39,10 @@ export default ({config, db}) => {
 
 		const ajv = new Ajv();
 		const userRegisterSchema = require('../models/userRegister.schema.json')
-		const userRegisterSchemaExtension = require('../models/userRegister.schema.extension.json')
+		let userRegisterSchemaExtension = {};
+		if(fs.existsSync('../models/userRegister.schema.extension.json')) {
+			userRegisterSchemaExtension = require('../models/userRegister.schema.extension.json');
+		}
 		const validate = ajv.compile(merge(userRegisterSchema, userRegisterSchemaExtension))
 
 		if (!validate(req.body)) { // schema validation of upcoming order
@@ -171,7 +175,10 @@ export default ({config, db}) => {
 	userApi.post('/me', (req, res) => {
 		const ajv = new Ajv();
 		const userProfileSchema = require('../models/userProfile.schema.json')
-		const userProfileSchemaExtension = require('../models/userProfile.schema.extension.json')
+		let userProfileSchemaExtension = {};
+		if(fs.existsSync('../models/userProfile.schema.extension.json')) {
+			userProfileSchemaExtension = require('../models/userProfile.schema.extension.json');
+		}
 		const validate = ajv.compile(merge(userProfileSchema, userProfileSchemaExtension))
 
 		if (req.body.customer && req.body.customer.groupToken) {

src/platform/magento2/o2m.js

@@ -10,10 +10,14 @@ redisClient.on('error', function (err) { // workaround for https://github.com/No
 });
 const countryMapper = require('../../lib/countrymapper')
 const Ajv = require('ajv'); // json validator
+const fs = require('fs');
 const ajv = new Ajv(); // validator
 const merge = require('lodash/merge')
 const orderSchema = require('../../models/order.schema.js')
-const orderSchemaExtension = require('../../models/order.schema.extension.json')
+let orderSchemaExtension = {}
+if(fs.existsSync('../../models/order.schema.extension.json')) {
+  orderSchemaExtension = require('../../models/order.schema.extension.json')
+}
 const validate = ajv.compile(merge(orderSchema, orderSchemaExtension));
 
 function isNumeric(val) {