Merge pull request #19 from jnaglick/many-to-one-deletion

add manyToOne deletion

Author: sh9189

addon/mixins/model.js

@@ -29,9 +29,9 @@ const defaultOptions = function(options) {
 };
 
 export default Mixin.create({
-  hasDirtyAttributes: computed('currentState.isDirty', 'markedForDestruction', 'markedForDeletion', function() {
+  hasDirtyAttributes: computed('currentState.isDirty', 'markedForDestruction', 'markedForDeletion', '_manyToOneDeleted.[]', function() {
     let original = this._super(...arguments);
-    return original || this.get('markedForDestruction') || this.get('markedForDeletion');
+    return original || this.get('markedForDestruction') || this.get('markedForDeletion') || this.get('_manyToOneDeleted.length') > 0;
   }),
 
   markedForDeletion: computed('_markedForDeletion', function() {
@@ -58,6 +58,27 @@ export default Mixin.create({
     this.set('_markedForDestruction', false);
   },
 
+  markManyToOneDeletion(relation) {
+    let deletedRelations = this.get('_manyToOneDeleted');
+
+    if (!deletedRelations) {
+      this.set('_manyToOneDeleted', A());
+      deletedRelations = this.get('_manyToOneDeleted')
+    }
+
+    if (!deletedRelations.includes(relation)) {
+      deletedRelations.pushObject(relation)
+    }
+  },
+
+  unmarkManyToOneDeletion(relation) {
+    return this.markedForManyToOneDeletion(relation) && this.get('_manyToOneDeleted').removeObject(relation)
+  },
+
+  markedForManyToOneDeletion(relation) {
+    return this.get('_manyToOneDeleted') && this.get('_manyToOneDeleted').includes(relation);
+  },
+
   markManyToManyDeletion(relation, model) {
     let deletedRelations = this.get('_manyToManyDeleted');
     if(!deletedRelations) {

addon/mixins/nested-relations.js

@@ -17,13 +17,14 @@ const iterateRelations = function(record, relations, callback) {
     let kind              = metadata.kind;
     let relatedRecord     = record.get(relationName);
     let manyToManyDeleted = record.manyToManyMarkedForDeletionModels(relationName);
+    let isManyToOneDelete = record.markedForManyToOneDeletion(relationName);
 
     if (metadata.options.async !== false) {
       relatedRecord = relatedRecord.get('content');
     }
 
     if (relatedRecord) {
-      callback(relationName, kind, relatedRecord, subRelations, manyToManyDeleted);
+      callback(relationName, kind, relatedRecord, subRelations, manyToManyDeleted, isManyToOneDelete);
     }
   });
 };
@@ -53,7 +54,7 @@ const attributesFor = function(record) {
   return attrs;
 };
 
-const jsonapiPayload = function(record, isManyToManyDelete) {
+const jsonapiPayload = function(record, relationshipMarkedForDeletion) {
   let attributes = attributesFor(record);
 
   let payload = { type: record.jsonapiType() };
@@ -69,7 +70,7 @@ const jsonapiPayload = function(record, isManyToManyDelete) {
   else if (record.get('markedForDestruction')) {
     payload['method'] = 'destroy';
   }
-  else if (record.get('markedForDeletion') || isManyToManyDelete) {
+  else if (record.get('markedForDeletion') || relationshipMarkedForDeletion) {
     payload['method'] = 'disassociate';
   }
   else if (record.get('currentState.isDirty')) {
@@ -131,21 +132,21 @@ const hasManyData = function(relationName, relatedRecords, subRelations, manyToM
   return { data: payloads };
 };
 
-const belongsToData = function(relatedRecord, subRelations, includedRecords) {
-  let payload = jsonapiPayload(relatedRecord);
+const belongsToData = function(relatedRecord, subRelations, isManyToOneDelete, includedRecords) {
+  let payload = jsonapiPayload(relatedRecord, isManyToOneDelete);
   processRelationships(subRelations, payload, relatedRecord, includedRecords);
   addToIncludes(payload, includedRecords);
 
   return { data: payloadForRelationship(payload) };
 };
 
-const processRelationship = function(name, kind, relationData, subRelations, manyToManyDeleted, includedRecords, callback) {
+const processRelationship = function(name, kind, relationData, subRelations, manyToManyDeleted, isManyToOneDelete, includedRecords, callback) {
   let payload = null;
 
   if (kind === 'hasMany') {
     payload = hasManyData(name, relationData, subRelations, manyToManyDeleted, includedRecords);
   } else {
-    payload = belongsToData(relationData, subRelations, includedRecords);
+    payload = belongsToData(relationData, subRelations, isManyToOneDelete, includedRecords);
   }
 
   if (payload && payload.data) {
@@ -157,8 +158,8 @@ const processRelationships = function(relationshipHash, jsonData, record, includ
   if (isPresentObject(relationshipHash)) {
     jsonData.relationships = {};
 
-    iterateRelations(record, relationshipHash, (name, kind, related, subRelations, manyToManyDeleted) => {
-      processRelationship(name, kind, related, subRelations, manyToManyDeleted, includedRecords, (payload) => {
+    iterateRelations(record, relationshipHash, (name, kind, related, subRelations, manyToManyDeleted, isManyToOneDelete) => {
+      processRelationship(name, kind, related, subRelations, manyToManyDeleted, isManyToOneDelete, includedRecords, (payload) => {
         let serializer = record.store.serializerFor(record.constructor.modelName);
         let serializedName = serializer.keyForRelationship(name);
         jsonData.relationships[serializedName] = payload;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-jsonapi-extensions",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "description": "The default blueprint for ember-cli addons.",
   "directories": {
     "doc": "doc",