Merge pull request #59 from BenjaminHorn/master

relation's related link

Author: digitalsadhu

lib/serializer.js

@@ -3,6 +3,7 @@ var inflection = require('inflection');
 var utils = require('./utils');
 
 module.exports = function serializer (type, data, relations, options) {
+
   var result = null;
   var resultData = {};
 
@@ -110,16 +111,33 @@ function parseCollection (type, data, relations, options) {
  */
 function parseRelations (data, relations, options) {
   var relationships = {};
+
+  var topLevel = options.topLevelLinks.self;
+  var parts = topLevel.split('/');
+  var collection = parts[parts.length - 1];
+
   _.each(relations, function (relation, name) {
+
     var pkName = relation.keyFrom;
     var fkName = relation.keyTo;
 
-    //If relation is belongsTo then pk and fk are the other way around
+    // If relation is belongsTo then pk and fk are the other way around
     if (relation.type === 'belongsTo' || relation.type === 'referencesMany') {
       pkName = relation.keyTo;
       fkName = relation.keyFrom;
     }
 
+    // Items of /:collection and /:collection/:id/:relatedcollection
+    // should have the same relationship object.
+    // Without this /:collection/:id/:relatedcollection relationship
+    // object is the same as /:collection/:id's.
+    if (collection === name) {
+      // fk should not be leaked out of the server
+      delete data[fkName];
+      relationships = parseRelations(data, relation.modelTo.relations, options);
+      return false;
+    }
+
     var pk = data[pkName];
     var fk = data[fkName];
 
@@ -130,6 +148,7 @@ function parseRelations (data, relations, options) {
     // Relationship `links` should always be defined unless this is a
     // relationship request
     if (!options.isRelationshipRequest) {
+
       relationships[name] = {
         links: {
           related: options.host + options.restApiRoot + '/' + fromType + '/' + pk + '/' + name

test/belongsToThroughHasMany.test.js

@@ -0,0 +1,73 @@
+var request = require('supertest');
+var loopback = require('loopback');
+var expect = require('chai').expect;
+var JSONAPIComponent = require('../');
+var app, Rule, Action, Card, ds;
+
+describe('belongsTo through hasMany', function () {
+  beforeEach(function () {
+    app = loopback();
+    app.set('legacyExplorer', false);
+    ds = loopback.createDataSource('memory');
+
+    Rule = ds.createModel('rule', {
+      id: {type: Number, id: true},
+      name: String
+    });
+
+    app.model(Rule);
+
+    Action = ds.createModel('action', {
+      id: {type: Number, id: true},
+      cardId: Number,
+      name: String
+    });
+
+    app.model(Action);
+
+    Card = ds.createModel('card', {
+      id: {type: Number, id: true},
+      title: String
+    });
+
+    app.model(Card);
+
+    Rule.hasMany(Action, {as: 'actions', foreignKey: 'ruleId'});
+    Action.belongsTo(Card, {as: 'card', foreignKey: 'cardId'});
+    Card.hasMany(Action, {as: 'actions', foreignKey: 'cardId'});
+    app.use(loopback.rest());
+    JSONAPIComponent(app, {restApiRoot: '/'});
+  });
+
+  describe('relationship should point to its relationship', function () {
+
+    beforeEach(function (done) {
+      Rule.create({
+        name: 'Rule 1'
+      }, function (err, rule) {
+        expect(err).to.equal(null);
+        rule.actions.create([
+          {name: 'Action 1', cardId: 1},
+          {name: 'Action 2', cardId: 1}
+        ], function (err, res) {
+          expect(err).to.equal(null);
+          Card.create([{title: 'Card 1'}], done);
+        });
+      });
+    });
+
+    it('GET /rules/1/actions', function (done) {
+      request(app).get('/rules/1/actions')
+        .end(function (err, res) {
+          expect(err).to.equal(null);
+          expect(res.body.data[0].relationships.card).to.be.an('object');
+          expect(res.body.data[0].relationships.card.links).to.be.an('object');
+          expect(res.body.data[0].relationships.card.links.related).to.match(/\/actions\/1\/card/);
+          expect(res.body.data[1].relationships.card.links.related).to.match(/\/actions\/2\/card/);
+          done();
+        });
+    });
+
+  });
+
+});