Fix standard errors

Author: digitalsadhu

lib/serialize.js

@@ -83,9 +83,8 @@ module.exports = function (app, defaults) {
     var relation = model.relations[relationName]
     if (relationName && relation) {
       if (relation.polymorphic && utils.relationFkOnModelFrom(relation)) {
-        var discriminator = utils.clone(ctx.instance)[
-          relation.polymorphic.discriminator
-        ]
+        let discriminator = relation.polymorphic.discriminator
+        discriminator = utils.clone(ctx.instance)[discriminator]
         relatedModel = app.models[discriminator]
       } else {
         relatedModel = relation.modelTo

lib/serializer.js

@@ -403,10 +403,8 @@ function handleIncludes (resp, includes, relations, options) {
             )
           })
           embeds = _.compact(embeds)
-
-          resource.relationships[include].data = resource.attributes[
-            include
-          ].map(function (relData) {
+          const included = resource.attributes[include]
+          resource.relationships[include].data = included.map(relData => {
             return {
               id: String(relData[propertyKey]),
               type: plural

test/hasMany.test.js

@@ -267,6 +267,10 @@ describe('loopback json api hasMany relationships', function () {
           function (done) {
             request(app).get('/posts?include=comments').end(function (err, res) {
               expect(err).to.equal(null)
+              const relatedReplies = id => {
+                const included = res.body.included
+                return included[id].relationships.replies.links.related
+              }
               expect(res.body.included).to.be.an('array')
               expect(res.body.included.length).to.equal(2)
               expect(res.body.data[0].attributes).to.not.have.keys('comments')
@@ -280,9 +284,7 @@ describe('loopback json api hasMany relationships', function () {
                 relationships: {
                   replies: {
                     links: {
-                      related: res.body.included[
-                        0
-                      ].relationships.replies.links.related
+                      related: relatedReplies(0)
                     }
                   }
                 }
@@ -297,9 +299,7 @@ describe('loopback json api hasMany relationships', function () {
                 relationships: {
                   replies: {
                     links: {
-                      related: res.body.included[
-                        1
-                      ].relationships.replies.links.related
+                      related: relatedReplies(1)
                     }
                   }
                 }

test/hasManyPolymorphic.test.js

@@ -88,20 +88,16 @@ describe('loopback json api hasMany polymorphic relationships', function () {
         request(app).get('/posts/1').end(function (err, res) {
           expect(err).to.equal(null)
           expect(res.body).to.not.have.key('errors')
-          request(app)
-            .get(
-              res.body.data.relationships.resources.links.related.split('api')[
-                1
-              ]
-            )
-            .end(function (err, res) {
-              expect(err).to.equal(null)
-              expect(res.body).to.not.have.key('errors')
-              expect(res.body.data).to.be.an('array')
-              expect(res.body.data[0].type).to.equal('resources')
-              expect(res.body.data[0].id).to.equal('1')
-              done()
-            })
+          const relationships = res.body.data.relationships
+          const url = relationships.resources.links.related.split('api')[1]
+          request(app).get(url).end(function (err, res) {
+            expect(err).to.equal(null)
+            expect(res.body).to.not.have.key('errors')
+            expect(res.body.data).to.be.an('array')
+            expect(res.body.data[0].type).to.equal('resources')
+            expect(res.body.data[0].id).to.equal('1')
+            done()
+          })
         })
       }
     )

test/hasManyRelationships.test.js

@@ -98,6 +98,9 @@ describe('loopback json api hasMany relationships', function () {
           })
           expect(res.body.included).to.be.an('array')
           expect(res.body.included.length).to.equal(3)
+          const relatedPostLink = id => {
+            return res.body.included[0].relationships.posts.links.related
+          }
           expect(res.body.included[0]).to.deep.equal({
             id: '1',
             type: 'authors',
@@ -108,9 +111,7 @@ describe('loopback json api hasMany relationships', function () {
             relationships: {
               posts: {
                 links: {
-                  related: res.body.included[
-                    0
-                  ].relationships.posts.links.related
+                  related: relatedPostLink(0)
                 }
               }
             }