fix(populate): handle virtual populate with embedded discriminator un…

…der single nested subdoc Fix #6571
Automattic · Jun 10, 2018 · 6909d30 · 6909d30
1 parent 512e090
commit 6909d30
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/lib/services/populate/getSchemaTypes.js b/lib/services/populate/getSchemaTypes.js
@@ -20,7 +20,7 @@ module.exports = function getSchemaTypes(schema, doc, path) {
     return pathschema;
   }
 
-  function search(parts, schema) {
+  function search(parts, schema, subdoc) {
     let p = parts.length + 1;
     let foundschema;
     let trypath;
@@ -38,8 +38,9 @@ module.exports = function getSchemaTypes(schema, doc, path) {
           let schemas = null;
           if (doc != null && foundschema.schema != null && foundschema.schema.discriminators != null) {
             const discriminators = foundschema.schema.discriminators;
-            const keys = mpath.get(trypath + '.' + foundschema.schema.options.discriminatorKey,
-              doc);
+            const discriminatorKeyPath = trypath + '.' +
+              foundschema.schema.options.discriminatorKey;
+            const keys = mpath.get(discriminatorKeyPath, subdoc) || [];
             schemas = Object.keys(discriminators).
               reduce(function(cur, discriminator) {
                 if (keys.indexOf(discriminator) !== -1) {
@@ -63,7 +64,7 @@ module.exports = function getSchemaTypes(schema, doc, path) {
                 return foundschema;
               }
               // comments.$.comments.$.title
-              ret = search(parts.slice(p + 1), schema);
+              ret = search(parts.slice(p + 1), schema, mpath.get(trypath, subdoc));
               if (ret) {
                 ret.$isUnderneathDocArray = ret.$isUnderneathDocArray ||
                   !foundschema.schema.$isSingleNested;
@@ -74,7 +75,7 @@ module.exports = function getSchemaTypes(schema, doc, path) {
             if (schemas != null && schemas.length > 0) {
               ret = [];
               for (var i = 0; i < schemas.length; ++i) {
-                let _ret = search(parts.slice(p), schemas[i]);
+                let _ret = search(parts.slice(p), schemas[i], mpath.get(trypath, subdoc));
                 if (_ret != null) {
                   _ret.$isUnderneathDocArray = _ret.$isUnderneathDocArray ||
                     !foundschema.schema.$isSingleNested;
@@ -86,7 +87,7 @@ module.exports = function getSchemaTypes(schema, doc, path) {
               }
               return ret;
             } else {
-              ret = search(parts.slice(p), foundschema.schema);
+              ret = search(parts.slice(p), foundschema.schema, mpath.get(trypath, subdoc));
 
               if (ret) {
                 ret.$isUnderneathDocArray = ret.$isUnderneathDocArray ||
@@ -111,5 +112,5 @@ module.exports = function getSchemaTypes(schema, doc, path) {
       parts[i] = '0';
     }
   }
-  return search(parts, schema);
+  return search(parts, schema, doc);
 };