refactor(relationships): refactor arguments

Author: digitalsadhu

lib/relationships.js

@@ -26,7 +26,7 @@ module.exports = function (app, options) {
     data = options.data
     model = utils.getModelFromContext(ctx, app)
 
-    relationships(id, data, model).then(() => next()).catch(err => next(err))
+    relationships(model, id, data).then(() => next()).catch(err => next(err))
   })
 
   // for create
@@ -41,7 +41,7 @@ module.exports = function (app, options) {
       id = ctx.result.data.id
       data = options.data
       model = utils.getModelFromContext(ctx, app)
-      return relationships(id, data, model)
+      return relationships(model, id, data)
         .then(() => next())
         .catch(err => next(err))
     }
@@ -57,24 +57,26 @@ function extractIdsFromResource (resource) {
   return _.get(resource, 'id', null)
 }
 
-function relationships (id, payload, ModelFrom) {
-  if (!id || !ModelFrom) return
+function relationships (model, id, payload) {
+  if (!id || !model) return
   const relationships = _.get(payload, 'data.relationships', {})
 
   return Promise.all(
-    Object.keys(relationships).map(name => {
-      const relationship = relationships[name]
-      const relationDefn = ModelFrom.relations[name]
+    Object.keys(relationships).map(relationName => {
+      const relationship = relationships[relationName]
+      const relationDefn = model.relations[relationName]
       if (!relationDefn) return
 
       const type = relationDefn.type
-      const ModelTo = relationDefn.modelTo
+      const modelTo = relationDefn.modelTo
 
       // don't handle belongsTo in relationships function
-      if (!ModelTo || type === 'belongsTo') return
+      if (!modelTo || type === 'belongsTo') return
 
       const data = extractIdsFromResource(relationship.data)
-      return linkRelatedModels(name, ModelFrom, id, ModelTo, data)
+      const from = { model, id }
+      const to = { model: modelTo, data }
+      return linkRelatedModels(relationName, from, to)
     })
   )
 }

lib/utilities/relationship-utils.js

@@ -183,7 +183,11 @@ function detectUpdateStrategy (Model, relationName) {
   if (relationDefn.type === 'belongsTo') return RELATION_TYPES.BELONGS_TO
 }
 
-function linkRelatedModels (relationName, LeftModel, id, RightModel, data) {
+function linkRelatedModels (relationName, from, to) {
+  const LeftModel = from.model
+  const id = from.id
+  const RightModel = to.model
+  const data = to.data
   const relationDefn = LeftModel.relations[relationName]
   const strategy = detectUpdateStrategy(LeftModel, relationName)
 

test/relationship-utils.test.js

@@ -178,8 +178,10 @@ describe('relationship utils', () => {
   describe('linkRelatedModels()', function () {
     it('belongsTo', () => {
       setupBelongsTo()
+      const from = { model: Comment, id: 1 }
+      const to = { model: Post, data: 1 }
       return Comment.create({}, {})
-        .then(() => linkRelatedModels('post', Comment, 1, Post, 1))
+        .then(() => linkRelatedModels('post', from, to))
         .then(() => Comment.find({ where: { postId: 1 } }))
         .then(comments => {
           expect(comments.length).to.equal(1)
@@ -188,8 +190,10 @@ describe('relationship utils', () => {
     })
     it('hasMany', () => {
       setupHasMany()
+      const from = { model: Post, id: 1 }
+      const to = { model: Comment, data: [2, 3, 4] }
       return Comment.create([{ postId: 1 }, { postId: 1 }, { postId: 1 }, {}])
-        .then(() => linkRelatedModels('comments', Post, 1, Comment, [2, 3, 4]))
+        .then(() => linkRelatedModels('comments', from, to))
         .then(() => Comment.find({ where: { postId: 1 } }))
         .then(comments => {
           expect(comments.length).to.equal(3)
@@ -200,6 +204,8 @@ describe('relationship utils', () => {
     })
     it('hasManyThrough', () => {
       setupHasManyThrough()
+      const from = { model: Post, id: 1 }
+      const to = { model: Comment, data: [2, 3, 4] }
       return Promise.all([
         Post.create({}),
         Comment.create([{}, {}, {}, {}]),
@@ -209,7 +215,7 @@ describe('relationship utils', () => {
             { postId: 1, commentId: 3 }
         ])
       ])
-        .then(() => linkRelatedModels('comments', Post, 1, Comment, [2, 3, 4]))
+        .then(() => linkRelatedModels('comments', from, to))
         .then(() => PostComment.find({ where: { postId: 1 } }))
         .then(postComments => {
           expect(postComments.length).to.equal(3)
@@ -220,8 +226,10 @@ describe('relationship utils', () => {
     })
     it('hasOne', () => {
       setupHasOne()
+      const from = { model: Post, id: 1 }
+      const to = { model: Comment, data: 1 }
       return Comment.create([{}, {}])
-        .then(() => linkRelatedModels('comment', Post, 1, Comment, 1))
+        .then(() => linkRelatedModels('comment', from, to))
         .then(() => Comment.find({ where: { postId: 1 } }))
         .then(comments => {
           expect(comments.length).to.equal(1)
@@ -230,8 +238,10 @@ describe('relationship utils', () => {
     })
     it('hasOne null', () => {
       setupHasOne()
+      const from = { model: Post, id: 1 }
+      const to = { model: Comment, data: null }
       return Comment.create([{ postId: 1 }])
-        .then(() => linkRelatedModels('comment', Post, 1, Comment, null))
+        .then(() => linkRelatedModels('comment', from, to))
         .then(() => Comment.find({ where: { postId: null } }))
         .then(comments => {
           expect(comments.length).to.equal(1)