Fix record unloading logic

Author: Lee Richmond

addon/mixins/model.js

@@ -1,18 +1,13 @@
 import Ember from 'ember';
 
-const resetRelations = function(record, relationshipsDirective) {
-  record.eachRelationship((relationName, meta) => {
-    if (meta.kind === 'hasMany') {
-      if (relationshipsDirective.hasOwnProperty(relationName)) {
-        let filtered = record.get(relationName).filter((r) => {
-          return r.get('isNew') ||
-            r.get('markedForDestruction') ||
-            r.get('markedForDeletion');
-        });
-        record.get(relationName).removeObjects(filtered);
-      }
+const resetRelations = function(record) {
+  record.get('__recordsJustSaved').forEach((r) => {
+    let shouldUnload = r.get('isNew') || r.get('markedForDestruction') || r.get('markedForDeletion');
+    if (shouldUnload) {
+      r.unloadRecord();
     }
   });
+  record.set('__recordsJustSaved', []);
 };
 
 const defaultOptions = function(options) {
@@ -49,12 +44,7 @@ export default Ember.Mixin.create({
   save(options = {}) {
     defaultOptions(options);
     let promise = this._super(...arguments);
-
-    let directive = options.adapterOptions.relationships;
-    promise.then((record) => {
-      resetRelations(record, directive);
-    });
-
+    promise.then(resetRelations);
     return promise;
   }
 });

addon/mixins/nested-relations.js

@@ -1,5 +1,12 @@
 import Ember from 'ember';
 
+// This is for reference in our post-save promise
+// We need to unload these records after save, otherwise
+// we will be left with 2 of the same object - one persisted
+// and one not.
+// This is only required for hasMany's
+let savedRecords = [];
+
 const iterateRelations = function(record, relations, callback) {
   Object.keys(relations).forEach((relationName) => {
     let subRelations = relations[relationName];
@@ -71,6 +78,7 @@ const hasManyData = function(relatedRecords, subRelations) {
     let payload = jsonapiPayload(relatedRecord);
     processRelationships(subRelations, payload, relatedRecord);
     payloads.push(payload);
+    savedRecords.push(relatedRecord);
   });
   return { data: payloads };
 };
@@ -131,6 +139,7 @@ const relationshipsDirective = function(value) {
 
 export default Ember.Mixin.create({
   serialize(snapshot/*, options */) {
+    savedRecords = [];
     let json = this._super(...arguments);
     delete(json.data.relationships);
     delete(json.data.attributes);
@@ -152,6 +161,7 @@ export default Ember.Mixin.create({
 
     let relationships = relationshipsDirective(adapterOptions.relationships);
     processRelationships(relationships, json.data, snapshot.record);
+    snapshot.record.set('__recordsJustSaved', savedRecords);
     console.log('serialized', json);
     return json;
   }

tests/acceptance/create-nested-relations-test.js

@@ -19,6 +19,8 @@ test('creating a record with nested relations', function(assert) {
   andThen(function() {
     assert.equal(detailPage.title, 'my post', 'saves basic attributes correctly');
     assert.equal(detailPage.tagList, 'new tag 1, new tag 2', 'saves one-to-many correctly');
+    assert.equal(detailPage.tagIds, '1, 2', 'maintains one-to-many ids correctly');
     assert.equal(detailPage.authorName, 'John Doe', 'saves one-to-one correctly');
+    assert.equal(detailPage.authorId, '1', 'maintains one-to-one ids correctly');
   });
 });

tests/dummy/app/models/post.js

@@ -10,5 +10,9 @@ export default DS.Model.extend(ModelMixin, {
 
   tagNames: Ember.computed('[email protected]', function() {
     return this.get('tags').mapBy('name').join(', ');
+  }),
+
+  tagIds: Ember.computed('[email protected]', function() {
+    return this.get('tags').mapBy('id').join(', ');
   })
 });

tests/dummy/app/post/template.hbs

@@ -19,10 +19,20 @@
                 <span>{{model.author.name}}</span>
               </div>
 
-              <div class='tags'>
+              <div class='author-id'>
+                <label>Author ID:</label>
+                <span>{{model.author.id}}</span>
+              </div>
+
+              <div class='tag-names'>
                 <label>Tags:</label>
                 <span>{{model.tagNames}}</span>
               </div>
+
+              <div class='tag-ids'>
+                <label>Tags:</label>
+                <span>{{model.tagIds}}</span>
+              </div>
             </div>
           </div>
         </div>

tests/pages/show-post.js

@@ -9,8 +9,10 @@ export default create({
   visit: visitable('/posts/:id'),
   title: text('.title span'),
   authorName: text('.author-name span'),
+  authorId: text('.author-id span'),
 
-  tagList: text('.tags span'),
+  tagList: text('.tag-names span'),
+  tagIds: text('.tag-ids span'),
 
   edit: clickable('.edit')
 });