Merge pull request #31 from pmould/replaceLodashMergeForWhereMerge

Replace lodash merge with merge-options

lib/api/services/SequelizeService.ts

@@ -1,6 +1,8 @@
 import { FabrixService as Service } from '@fabrix/fabrix/dist/common'
 
-import { defaults, omitBy, isArray, isObject, isString, isNil, merge } from 'lodash'
+import { defaults, omitBy, isArray, isObject, isString, isNil } from 'lodash'
+
+const merge = require('merge-options')
 
 export class SequelizeService extends Service {
   /**

package.json

@@ -63,6 +63,7 @@
     "@types/lodash": "^4.14.109",
     "@types/node": "~10.3.4",
     "@types/sequelize": "^4.27.31",
+    "merge-options": "^1.0.1",
     "mocha": "^5",
     "nyc": "^13.1.0",
     "pg": "^6.4.2",

test/unit/services/SequelizeService.test.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const assert = require('assert')
+const sequelize = require('sequelize')
 
 describe('api.services.SequelizeService', () => {
   it.skip('should do stringify sort', (done) => {
@@ -66,6 +67,21 @@ describe('api.services.SequelizeService', () => {
     assert.equal(newOptions.where.created_at, 'now')
     done()
   })
+  it('should merge wheres with operator symbol', (done) => {
+    const newOptions = global.app.services.SequelizeService.mergeOptionDefaults({
+      where: {}
+    }, {
+      where: {
+        name: {
+          [sequelize.Op.in]: [1, 2, 3]
+      }}
+    })
+    assert.equal(newOptions.where.name[sequelize.Op.in][0], 1)
+    assert.equal(newOptions.where.name[sequelize.Op.in][1], 2)
+    assert.equal(newOptions.where.name[sequelize.Op.in][2], 3)
+    done()
+  })
+
   it('should merge limit', (done) => {
     const newOptions = global.app.services.SequelizeService.mergeOptionDefaults({
       limit: null