set version if modified path and optCon is array

Automattic · Jun 13, 2023 · 40528ce · 40528ce
1 parent 848f8b7
commit 40528ce
Showing 1 changed file with 11 additions and 20 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -356,31 +356,12 @@ Model.prototype.$__handleSave = function(options, callback) {
     const optionsWithCustomValues = Object.assign({}, options, saveOptions);
     const where = this.$__where();
     const optimisticConcurrency = this.$__schema.options.optimisticConcurrency;
-    console.log('what is optimisticConcurrency', optimisticConcurrency)
     if (optimisticConcurrency) {
       const key = this.$__schema.options.versionKey;
       const val = this.$__getValue(key);
       if (val != null) {
         where[key] = val;
       }
-      if (Array.isArray(optimisticConcurrency) && optimisticConcurrency.every(x => typeof x === 'string')) {
-        const modPaths = this.modifiedPaths();
-        console.log('what is modPaths', modPaths)
-        for (let i = 0; i < optimisticConcurrency.length; i ++) {
-          if (modPaths.includes(optimisticConcurrency[i])) {
-            // apply optimistic concurrency?
-            this.constructor.collection.findOne(where, optionsWithCustomValues)
-            .then(documentExists => {
-              const matchedCount = !documentExists ? 0 : 1;
-              callback(null, { $where: where, matchedCount });
-            })
-            .catch(callback);
-          } else {
-            continue;
-          }
-        }
-        return;
-      }
     }
     this.constructor.collection.findOne(where, optionsWithCustomValues)
       .then(documentExists => {
@@ -737,7 +718,17 @@ Model.prototype.$__delta = function() {
 
   const optimisticConcurrency = this.$__schema.options.optimisticConcurrency;
   if (optimisticConcurrency) {
-    this.$__.version = dirty.length ? VERSION_ALL : VERSION_WHERE;
+    if (Array.isArray(optimisticConcurrency)) {
+      const modPaths = this.modifiedPaths();
+      for(let i = 0; i < modPaths.length; i++) {
+        if (modPaths.includes(optimisticConcurrency[i])) {
+          this.$__.version = dirty.length ? VERSION_ALL : VERSION_WHERE;
+          break;
+        }
+      }
+    } else {
+      this.$__.version = dirty.length ? VERSION_ALL : VERSION_WHERE;
+    }
   }
 
   if (!dirty.length && VERSION_ALL !== this.$__.version) {