Minor updates and fixes (develop)

.travis.yml

@@ -13,6 +13,7 @@ before_install:
   - docker pull docker.elastic.co/elasticsearch/elasticsearch:6.4.2
   - docker ps -a
   - docker run -p 9200:9200 -p 9300:9300 -d -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:6.4.2
+  - until curl --silent -XGET --fail http://localhost:9200; do printf '.'; sleep 1; done
 
 services:
   - mongodb

lib/mongoosastic.js

@@ -35,6 +35,23 @@ function createEsClient (options) {
   return new elasticsearch.Client(esOptions)
 }
 
+function filterMappingFromMixed (props) {
+  const filteredMapping = {}
+  Object.keys(props).map((key) => {
+    const field = props[key]
+    if (field.type !== 'mixed') {
+      filteredMapping[key] = field
+      if (field.properties) {
+        filteredMapping[key].properties = filterMappingFromMixed(field.properties)
+        if (!Object.keys(filteredMapping[key].properties).length) {
+          delete filteredMapping[key].properties
+        }
+      }
+    }
+  })
+  return filteredMapping
+}
+
 function createMappingIfNotPresent (options, cb) {
   const client = options.client
   const indexName = options.indexName
@@ -46,6 +63,9 @@ function createMappingIfNotPresent (options, cb) {
   const completeMapping = {}
   completeMapping[typeName] = generator.generateMapping(schema)
 
+  const filtered = filterMappingFromMixed(completeMapping[typeName].properties)
+  completeMapping[typeName].properties = filtered
+
   if (properties) {
     Object.keys(properties).map(key => {
       completeMapping[typeName].properties[key] = properties[key]
@@ -64,7 +84,9 @@ function createMappingIfNotPresent (options, cb) {
         index: indexName,
         type: typeName,
         body: completeMapping
-      }, cb)
+      }, (err) => {
+        cb(err, completeMapping[typeName])
+      })
     }
     return client.indices.create({
       index: indexName,
@@ -78,7 +100,9 @@ function createMappingIfNotPresent (options, cb) {
         index: indexName,
         type: typeName,
         body: completeMapping
-      }, cb)
+      }, (err) => {
+        cb(err, completeMapping[typeName])
+      })
     })
   })
 }
@@ -355,7 +379,6 @@ function Mongoosastic (schema, pluginOpts) {
     let serialModel
     let cb = inCb
     let opts = inOpts
-    let _serialize = serialize
 
     if (arguments.length < 2) {
       cb = inOpts || nop
@@ -366,10 +389,6 @@ function Mongoosastic (schema, pluginOpts) {
       return this.unIndex(cb)
     }
 
-    if (typeof customSerialize === 'function') {
-      _serialize = customSerialize
-    }
-
     setIndexNameIfUnset(this.constructor.modelName)
 
     index = opts.index || indexName
@@ -378,7 +397,12 @@ function Mongoosastic (schema, pluginOpts) {
     /**
      * Serialize the model, and apply transformation
      */
-    serialModel = _serialize(this, mapping)
+    if (typeof customSerialize === 'function') {
+      serialModel = customSerialize(this, mapping)
+    } else {
+      serialModel = serialize(this.toObject(), mapping)
+    }
+
     if (transform) serialModel = transform(serialModel, this)
 
     const _opts = {

test/alternative-index-method-test.js

@@ -74,7 +74,7 @@ describe('Index Method', function () {
 
   // This does not work in elastic > 6.x
   // Indices created in 6.x only allow a single-type per index
-  it('should be able to index to alternative index and type', function (done) {
+  /* it('should be able to index to alternative index and type', function (done) {
     Tweet.findOne({
       message: 'I know kung-fu!'
     }, function (err, doc) {
@@ -98,5 +98,5 @@ describe('Index Method', function () {
         }, config.INDEXING_TIMEOUT)
       })
     })
-  })
+  }) */
 })

test/mapping-generator-test.js

@@ -377,6 +377,54 @@ describe('MappingGenerator', function () {
       should.not.exist(mapping.properties.name.properties.birthYear)
       done()
     })
+
+    // make this cleaner
+    it('should not map type mixed on mixed fields', function (done) {
+      // instead, Elastic should "guess" and set default mapping
+      const schema = new Schema({
+        string: String,
+        mixed_field: {
+          type: mongoose.Schema.Types.Mixed
+        },
+        mixed_arr_field: {
+          type: [mongoose.Schema.Types.Mixed]
+        },
+        obj_mixed: {
+          mixed: {
+            type: mongoose.Schema.Types.Mixed
+          }
+        }
+      })
+      const mongoosastic = require('../lib/mongoosastic')
+      schema.plugin(mongoosastic)
+
+      const MyModel = mongoose.model('MyModel', schema)
+
+      MyModel.createMapping((err, mapping) => {
+        if (err) console.log(err)
+        const doc = new MyModel({
+          string: 'test_string',
+          mixed_field: 'mixed',
+          mixed_arr_field: [1, 2],
+          obj_mixed: { mixed: 'nested mixed' }
+        })
+        const config = require('./config')
+        mongoose.connect(config.mongoUrl, config.mongoOpts, function () {
+          doc.save(() => {
+            setTimeout(() => {
+              MyModel.search({ query_string: { query: 'mixed' } }, (err, res) => {
+                res.hits.hits[0]._source.mixed_field.should.eql('mixed')
+                res.hits.hits[0]._source.mixed_arr_field.should.eql([1, 2])
+                res.hits.hits[0]._source.obj_mixed.mixed.should.eql('nested mixed')
+                doc.remove(() => {
+                  config.deleteIndexIfExists('mymodels', done)
+                })
+              })
+            }, config.INDEXING_TIMEOUT)
+          })
+        })
+      })
+    })
   })
 
   describe('elastic search fields', function () {

test/serialize-test.js

@@ -57,7 +57,7 @@ describe('serialize', function () {
       first: 'Jeffrey',
       last: 'Lebowski'
     }
-  })
+  }).toObject()
 
   it('should serialize a document with missing bits', function () {
     const serialized = serialize(millionnaire, mapping)