Merge pull request #14017 from Automattic/vkarpov15/gh-13973-2

fix(connection): retain modified status for documents created outside a transaction during transaction retries

Author: vkarpov15

lib/connection.js

@@ -563,6 +563,10 @@ function _resetSessionDocuments(session) {
       doc.$__.activePaths.states.modify = {};
     }
     for (const path of state.modifiedPaths) {
+      const currentState = doc.$__.activePaths.paths[path];
+      if (currentState != null) {
+        delete doc.$__.activePaths[currentState][path];
+      }
       doc.$__.activePaths.paths[path] = 'modify';
       doc.$__.activePaths.states.modify[path] = true;
     }

lib/document.js

@@ -53,6 +53,7 @@ const scopeSymbol = require('./helpers/symbols').scopeSymbol;
 const schemaMixedSymbol = require('./schema/symbols').schemaMixedSymbol;
 const parentPaths = require('./helpers/path/parentPaths');
 const getDeepestSubdocumentForPath = require('./helpers/document/getDeepestSubdocumentForPath');
+const sessionNewDocuments = require('./helpers/symbols').sessionNewDocuments;
 
 let DocumentArray;
 let MongooseArray;
@@ -1474,7 +1475,16 @@ Document.prototype.$set = function $set(path, val, type, options) {
 
     this.$__set(pathToMark, path, options, constructing, parts, schema, val, priorVal);
 
-    if (savedState != null && savedState.hasOwnProperty(savedStatePath) && utils.deepEqual(val, savedState[savedStatePath])) {
+    const isInTransaction = !!this.$__.session?.transaction;
+    const isModifiedWithinTransaction = this.$__.session &&
+      this.$__.session[sessionNewDocuments] &&
+      this.$__.session[sessionNewDocuments].has(this) &&
+      this.$__.session[sessionNewDocuments].get(this).modifiedPaths &&
+      !this.$__.session[sessionNewDocuments].get(this).modifiedPaths.has(savedStatePath);
+    if (savedState != null &&
+        savedState.hasOwnProperty(savedStatePath) &&
+        (!isInTransaction || isModifiedWithinTransaction) &&
+        utils.deepEqual(val, savedState[savedStatePath])) {
       this.unmarkModified(path);
     }
   }

test/docs/transactions.test.js

@@ -396,4 +396,29 @@ describe('transactions', function() {
     assert.equal(docs.length, 1);
     assert.equal(docs[0].name, 'test');
   });
+
+  it('transaction() retains modified status for documents created outside of the transaction then modified inside the transaction (gh-13973)', async function() {
+    db.deleteModel(/Test/);
+    const Test = db.model('Test', Schema({ status: String }));
+
+    await Test.createCollection();
+    await Test.deleteMany({});
+
+    const { _id } = await Test.create({ status: 'test' });
+    const doc = await Test.findById(_id);
+
+    let i = 0;
+    await db.transaction(async(session) => {
+      doc.status = 'test2';
+      assert.ok(doc.$isModified('status'));
+      await doc.save({ session });
+      if (++i < 3) {
+        throw new mongoose.mongo.MongoServerError({
+          errorLabels: ['TransientTransactionError']
+        });
+      }
+    });
+
+    assert.equal(i, 3);
+  });
 });