Merge pull request #12947 from wassil/fix-discriminator-update

Fix discriminator type field update for custom discriminator model name
Automattic · Feb 3, 2023 · bcd3117 · bcd3117
2 parents e3ed34f + f1393ce
commit bcd3117
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/query.js b/lib/query.js
@@ -5100,7 +5100,9 @@ Query.prototype._castUpdate = function _castUpdate(obj, overwrite) {
   if (this._mongooseOptions.overwriteDiscriminatorKey &&
       obj[discriminatorKey] != null &&
       baseSchema.discriminators) {
-    const _schema = baseSchema.discriminators[obj[discriminatorKey]];
+    const _schema = Object.values(baseSchema.discriminators).find(
+      discriminator => discriminator.discriminatorMapping.value === obj[discriminatorKey]
+    );
     if (_schema != null) {
       schema = _schema;
     }

diff --git a/test/model.update.test.js b/test/model.update.test.js
@@ -3288,10 +3288,10 @@ describe('model: updateOne: ', function() {
       const baseModel = db.model('Test', baseSchema);
 
       const aSchema = Schema({ aThing: Number }, { _id: false, id: false });
-      const aModel = baseModel.discriminator('A', aSchema);
+      const aModel = baseModel.discriminator('discriminator-A', aSchema, 'A');
 
       const bSchema = new Schema({ bThing: String }, { _id: false, id: false });
-      const bModel = baseModel.discriminator('B', bSchema);
+      const bModel = baseModel.discriminator('discriminator-B', bSchema, 'B');
 
       // Model is created as a type A
       let doc = await baseModel.create({ type: 'A', aThing: 1 });