Merge pull request #77 from JonathanPrince/master

bugfix for PK name for related models

Author: digitalsadhu

lib/serialize.js

@@ -20,7 +20,6 @@ module.exports = function (app, defaults) {
     var data,
       type,
       options,
-      relatedModelName,
       modelNamePlural,
       relatedModelPlural,
       relations,
@@ -63,24 +62,21 @@ module.exports = function (app, defaults) {
       return next();
     }
 
-    //match on __GET__, etc.
-    if (ctx.methodString.match(/.*\.__.*__.*/)) {
-      //get the model name of the related model in plural form.
-      //we cant just get the relationship name because the name of
-      //the relationship may not match the related model plural.
-      //eg. /posts/1/author could actually be a user model so we
-      //would want type = 'users'
-
-      //WARNING: feels fragile but functional.
-      relatedModelName = ctx.method.returns[0].type;
-      relatedModelPlural = utils.pluralForModel(app.models[relatedModelName]);
+    var primaryKeyField = utils.primaryKeyForModel(model);
+    var regexRelationFromUrl = /\/.*\/(.*$)/g;
+    var regexMatches = regexRelationFromUrl.exec(ctx.req.path);
+    var relationName = (regexMatches && regexMatches[1]) ? regexMatches[1] : null;
+
+    var relation = model.relations[relationName];
+    if (relationName && relation) {
+      relatedModelPlural = utils.pluralForModel(relation.modelTo);
+      primaryKeyField = utils.primaryKeyForModel(relation.modelTo);
+
       if (relatedModelPlural) {
         type = relatedModelPlural;
       }
     }
 
-    var primaryKeyField = utils.primaryKeyForModel(model);
-
     options = {
       primaryKeyField: primaryKeyField,
       host: utils.hostFromContext(ctx),

test/belongsTo.test.js

@@ -86,21 +86,36 @@ describe('loopback json api belongsTo relationships', function () {
   describe('Comment with a post and relationship back to comment', function (done) {
     beforeEach(function (done) {
       Post.hasMany(Comment, {as: 'comments', foreignKey: 'postId'});
-      Comment.create({
-        title: 'my comment',
-        comment: 'my post comment'
-      }, function (err, comment) {
+      Comment.create([{
+        title: 'my comment 1',
+        comment: 'my post comment 1'
+      }, {
+        title: 'my comment 2',
+        comment: 'my post comment 2'
+      }], function (err, comments) {
         expect(err).to.equal(null);
-        comment.post.create({
+        comments[1].post.create({
           title: 'My post',
           content: 'My post content'
         }, done);
       });
     });
 
-    describe('GET /comments/1/post', function () {
-      it('should display correct relationships', function (done) {
-        request(app).get('/comments/1/post')
+    describe('should display correct relationships', function () {
+      it('GET /comments/2/post', function (done) {
+        request(app).get('/comments/2/post')
+          .end(function (err, res) {
+            expect(err).to.equal(null);
+            expect(res.body.data.relationships.comments).to.be.an('object');
+            expect(res.body.data.relationships.comments.links).to.be.an('object');
+            expect(res.body.data.relationships.comments.links.related).to.match(/^http.*\/posts\/1\/comments$/);
+            expect(res.body.data.relationships.post).to.be.undefined;
+            done();
+          });
+      });
+
+      it('GET /posts/1', function (done) {
+        request(app).get('/posts/1')
           .end(function (err, res) {
             expect(err).to.equal(null);
             expect(res.body.data.relationships.comments).to.be.an('object');