fix(discriminator): don't copy discriminators property from base sc…

…hema Fix #6064
Automattic · Feb 12, 2018 · 36b2f3f · 36b2f3f
1 parent 0290187
commit 36b2f3f
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 1 deletion.
diff --git a/lib/services/model/discriminator.js b/lib/services/model/discriminator.js
@@ -62,7 +62,10 @@ module.exports = function discriminator(model, name, schema) {
       delete schema.paths._id;
       delete schema.tree._id;
     }
-    utils.merge(schema, baseSchema, { retainKeyOrder: true });
+    utils.merge(schema, baseSchema, {
+      retainKeyOrder: true,
+      omit: { discriminators: true }
+    });
 
     var obj = {};
     obj[key] = {

diff --git a/lib/utils.js b/lib/utils.js
@@ -418,6 +418,9 @@ exports.merge = function merge(to, from, options) {
   if (options.retainKeyOrder) {
     while (i < len) {
       key = keys[i++];
+      if (options.omit && options.omit[key]) {
+        continue;
+      }
       if (to[key] == null) {
         to[key] = from[key];
       } else if (exports.isObject(from[key])) {
@@ -429,6 +432,9 @@ exports.merge = function merge(to, from, options) {
   } else {
     while (len--) {
       key = keys[len];
+      if (options.omit && options.omit[key]) {
+        continue;
+      }
       if (to[key] == null) {
         to[key] = from[key];
       } else if (exports.isObject(from[key])) {

diff --git a/test/helpers/populate.getSchemaTypes.test.js b/test/helpers/populate.getSchemaTypes.test.js
@@ -59,4 +59,79 @@ describe('getSchemaTypes', function() {
 
     done();
   });
+
+  it('multiple embedded discriminators (gh-6064)', function(done) {
+    var ItemSchema = new Schema({
+      title: {
+        type: String,
+        required: true
+      }
+    }, {discriminatorKey: 'type'});
+
+    var ItemBookSchema = new Schema({
+      author: {
+        type: String,
+        ref: 'Ref1'
+      }
+    });
+
+    var ItemEBookSchema = new Schema({
+      author: {
+        type: String,
+        ref: 'Ref2'
+      }
+    });
+
+    var OtherItem = new Schema({ name: String });
+
+    var BundleSchema = new Schema({
+      level1: {
+        items: [{
+          type: ItemSchema,
+          required: false
+        }]
+      },
+      level2: {
+        items: [{
+          type: ItemSchema,
+          required: false
+        }]
+      }
+    });
+
+    BundleSchema.path('level1.items').discriminator('Book', ItemBookSchema);
+    BundleSchema.path('level1.items').discriminator('EBook', ItemEBookSchema);
+    BundleSchema.path('level1.items').discriminator('Other', OtherItem);
+
+    // HERE IS THE ADDED DISCRIMINATOR PATH
+    BundleSchema.path('level2.items').discriminator('Book', ItemBookSchema);
+    BundleSchema.path('level2.items').discriminator('EBook', ItemEBookSchema);
+    BundleSchema.path('level2.items').discriminator('Other', OtherItem);
+
+    var doc = {
+      level1: {
+        items: [
+          { type: 'Book', author: 'level 1 test 1' },
+          { type: 'EBook', author: 'level 1 test 2' }
+        ]
+      },
+      level2: {
+        items: [
+          { type: 'EBook', author: 'level 2 test 1' },
+          { type: 'Book', author: 'level 2 test 2' },
+          { type: 'Other' }
+        ]
+      }
+    };
+    var schemaTypes = getSchemaTypes(BundleSchema, doc, 'level2.items.author');
+
+    assert.ok(Array.isArray(schemaTypes));
+    // Make sure we only got the schema paths for Book and EBook, and none
+    // for the 'Other'
+    assert.equal(schemaTypes.length, 2);
+    assert.equal(schemaTypes[0].options.ref, 'Ref1');
+    assert.equal(schemaTypes[1].options.ref, 'Ref2');
+
+    done();
+  });
 });