Add updated version of multi-save fix

This is adapted from #249, I’m just pushing to see if it
fixes the problems in the application I’m updating.

Author: backspace

addon/adapters/pouch.js

@@ -7,6 +7,7 @@ import { bind } from '@ember/runloop';
 import { on } from '@ember/object/evented';
 import { classify, camelize } from '@ember/string';
 import { pluralize } from 'ember-inflector';
+import { v4 } from 'uuid';
 //import BelongsToRelationship from 'ember-data/-private/system/relationships/state/belongs-to';
 
 import {
@@ -15,6 +16,22 @@ import {
   configFlagDisabled,
 } from '../utils';
 
+function getRevFromSaveResult(records) {
+  let rev = null;
+  try {
+    rev = records[Object.keys(records)[0]][0].rev;
+    if (!rev || Object.keys(records).length > 1) {
+      // eslint-disable-next-line no-console
+      console.warn(
+        `getRevFromSaveResult going to return ${rev}, but that may not be correct`
+      );
+    }
+  } catch (e) {
+    throw Error(`Could not determine rev`);
+  }
+  return rev;
+}
+
 //BelongsToRelationship.reopen({
 //  findRecord() {
 //    return this._super().catch(() => {
@@ -516,29 +533,60 @@ export default class PouchAdapter extends RESTAdapter.extend({
     });
   },
 
+  generateIdForRecord: function (/* store, type, inputProperties */) {
+    return v4();
+  },
+
   createdRecords: null,
-  createRecord: async function (store, type, record) {
-    await this._init(store, type);
-    var data = this._recordToData(store, type, record);
+  createRecord: async function (store, type, snapshot) {
+    const record = snapshot.record;
+    if (record._emberPouchSavePromise) {
+      console.log('found save promise');
+      const changes = record.changedAttributes();
+      record._emberPouchSavePromise = record._emberPouchSavePromise.then(
+        (records) => {
+          // If there have been changes since the document was created then we should update the record now
+          if (Object.keys(changes).length > 0) {
+            // Include latest rev to indicate that we're aware that data has changed since original request
+            // (otherwise a document update conflict error would be thrown by the DB)
+            snapshot._attributes.rev = getRevFromSaveResult(records);
+            return this.updateRecord(store, type, snapshot);
+          }
+          return records;
+        }
+      );
+      return record._emberPouchSavePromise;
+    }
+
+    this._init(store, type);
+    var data = this._recordToData(store, type, snapshot);
     let rel = this.db.rel;
 
     let id = data.id;
-    if (!id) {
-      id = data.id = rel.uuid();
-    }
     this.createdRecords[id] = true;
 
     let typeName = this.getRecordTypeName(type);
-    try {
-      let saved = await rel.save(typeName, data);
-      Object.assign(data, saved);
-      let result = {};
-      result[pluralize(typeName)] = [data];
-      return result;
-    } catch (e) {
-      delete this.createdRecords[id];
-      throw e;
-    }
+
+    Object.defineProperty(record, '_emberPouchSavePromise', {
+      enumerable: false,
+      writable: true,
+      value: rel
+        .save(typeName, data)
+        .then((saved) => {
+          Object.assign(data, saved);
+          let result = {};
+          result[pluralize(typeName)] = [data];
+          console.log('saved, result', saved, result);
+          return result;
+        })
+        .catch((e) => {
+          console.log('catch', e);
+          delete this.createdRecords[id];
+          throw e;
+        }),
+    });
+
+    return record._emberPouchSavePromise;
   },
 
   updateRecord: async function (store, type, record) {

package.json

@@ -40,7 +40,8 @@
   },
   "dependencies": {
     "ember-auto-import": "~2.4.2",
-    "ember-cli-babel": "^7.26.11"
+    "ember-cli-babel": "^7.26.11",
+    "uuid": "^3.4.0"
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
@@ -79,16 +80,16 @@
     "license-checker": "^25.0.1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "pouchdb-core": "^7.3.1",
-    "pouchdb-adapter-indexeddb": "^7.3.1",
     "pouchdb-adapter-http": "^7.3.1",
+    "pouchdb-adapter-indexeddb": "^7.3.1",
+    "pouchdb-core": "^7.3.1",
+    "pouchdb-find": "^7.3.1",
     "pouchdb-mapreduce": "^7.3.1",
     "pouchdb-replication": "^7.3.1",
-    "pouchdb-find": "^7.3.1",
-    "relational-pouch": "^4.0.1",
     "prettier": "^2.6.1",
     "qunit": "^2.18.0",
     "qunit-dom": "^2.0.0",
+    "relational-pouch": "^4.0.1",
     "webpack": "^5.70.0"
   },
   "engines": {

tests/integration/adapters/pouch-basics-test.js

@@ -440,6 +440,42 @@ module('Integration | Adapter | Basic CRUD Ops', {}, function (hooks) {
         .finally(done);
     });
 
+    test('update a newly created record before it has finished saving', function (assert) {
+      assert.expect(2);
+
+      var done = assert.async();
+      Promise.resolve()
+        .then(() => {
+          var newSoup = this.store().createRecord('taco-soup', {
+            id: 'E',
+            flavor: 'oops-wrong-flavor',
+          });
+          console.log('pre first save');
+          let res = newSoup.save();
+          console.log('after first save', res);
+          newSoup.set('flavor', 'balsamic');
+          console.log('pre second save');
+          return newSoup.save();
+        })
+        .then(() => {
+          return this.db().get('tacoSoup_2_E');
+        })
+        .then((newDoc) => {
+          assert.strictEqual(
+            newDoc.data.flavor,
+            'balsamic',
+            'should have saved the attribute'
+          );
+
+          var recordInStore = this.store().peekRecord('tacoSoup', 'E');
+          assert.strictEqual(
+            newDoc._rev,
+            recordInStore.get('rev'),
+            'should have associated the ember-data record with the rev for the new record'
+          );
+        })
+        .finally(done);
+    });
     test('creating an associated record stores a reference to it in the parent', function (assert) {
       assert.expect(1);