Allow shallow circular dependency to fix multiple relations

Author: Skysplit

lib/deserializer-utils.js

@@ -24,7 +24,7 @@ module.exports = function (jsonapi, data, opts) {
     }
   }
 
-  function findIncluded(relationshipData, from) {
+  function findIncluded(relationshipData, relationshipName, from) {
     return new Promise(function (resolve) {
       if (!jsonapi.included || !relationshipData) { return resolve(null); }
 
@@ -38,19 +38,16 @@ module.exports = function (jsonapi, data, opts) {
           id: from.id,
           type: from.type,
         },
-        from: relationshipData,
+        from: Object.assign({}, relationshipData),
+        relation: relationshipName,
       };
 
       // Check if the include is already processed (prevent circular
       // references).
       if (_find(alreadyIncluded, includedObject)) {
         return resolve(null);
       } else {
-        alreadyIncluded.push(includedObject)
-        alreadyIncluded.push({
-          to: includedObject.from,
-          from: includedObject.to,
-        });
+        alreadyIncluded.push(includedObject);
       }
 
       if (included) {
@@ -119,13 +116,13 @@ module.exports = function (jsonapi, data, opts) {
         } else if (Array.isArray(relationship.data)) {
           return Promise
             .all(relationship.data.map(function (relationshipData) {
-              return extractIncludes(relationshipData, from);
+              return extractIncludes(relationshipData, key, from);
             }))
             .then(function (includes) {
               if (includes) { dest[keyForAttribute(key)] = includes; }
             });
         } else {
-          return extractIncludes(relationship.data, from)
+          return extractIncludes(relationship.data, key, from)
             .then(function (include) {
               if (include) { dest[keyForAttribute(key)] = include; }
             });
@@ -136,8 +133,8 @@ module.exports = function (jsonapi, data, opts) {
       });
   }
 
-  function extractIncludes(relationshipData, from) {
-    return findIncluded(relationshipData, from)
+  function extractIncludes(relationshipData, relationshipName, from) {
+    return findIncluded(relationshipData, relationshipName, from)
       .then(function (included) {
         var valueForRelationship = getValueForRelationship(relationshipData,
           included);

test/deserializer.js

@@ -1046,6 +1046,50 @@ describe('JSON API Deserializer', function () {
 
       });
     });
+
+    describe('With multiple relations', function () {
+      it('should include both relations if they point to same include', function (done) {
+        var dataSet = {
+          data: {
+            type: 'posts',
+            id: 1,
+            relationships: {
+              owner: {
+                data: {
+                  type: 'users',
+                  id: 1,
+                },
+              },
+              publisher: {
+                data: {
+                  type: 'users',
+                  id: 1,
+                },
+              },
+            },
+          },
+          included: [
+            {
+              type: 'users',
+              id: 1,
+              attributes: {
+                'first-name': 'Sandro',
+                'last-name': 'Munda',
+              },
+            },
+          ],
+        };
+
+        new JSONAPIDeserializer().deserialize(dataSet).then(function(json) {
+          expect(json).to.be.an('object').with.keys('id', 'owner', 'publisher');
+          expect(json.owner).to.exist;
+          expect(json.publisher).to.exist;
+          expect(json.owner).to.be.eql(json.publisher);
+
+          done(null, json);
+        });
+      });
+    });
   });
 
   describe('without callback', function () {
@@ -1133,7 +1177,12 @@ describe('JSON API Deserializer', function () {
               id: '54735722e16620ba1eee36af',
               country: {
                 country: 'USA',
-                id: '54735722e16609ba1eee36af'
+                id: '54735722e16609ba1eee36af',
+                address: {
+                  address_line1: '406 Madison Court',
+                  zip_code: '49426',
+                  id: '54735722e16620ba1eee36af',
+                }
               }
             });
             done(null, json);