chore(relation): replace intermediate variables to lodash transform

adonisjs · Aug 25, 2017 · 4eb520a · 4eb520a
1 parent f5b11f4
commit 4eb520a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 25 deletions.
diff --git a/src/Lucid/Relations/BelongsTo.js b/src/Lucid/Relations/BelongsTo.js
@@ -32,13 +32,12 @@ class BelongsTo extends BaseRelation {
    * @return {Array}
    */
   mapValues (modelInstances) {
-    const values = []
-    _.forEach(modelInstances, (modelInstance) => {
+    return _.transform(modelInstances, (result, modelInstance) => {
       if (modelInstance[this.primaryKey]) {
-        values.push(modelInstance[this.primaryKey])
+        result.push(modelInstance[this.primaryKey])
       }
-    })
-    return values
+      return result
+    }, [])
   }
 
   /**

diff --git a/src/Lucid/Relations/BelongsToMany.js b/src/Lucid/Relations/BelongsToMany.js
@@ -429,13 +429,12 @@ class BelongsToMany extends BaseRelation {
    * @return {Array}
    */
   mapValues (modelInstances) {
-    const values = []
-    _.forEach(modelInstances, (modelInstance) => {
+    return _.transform(modelInstances, (result, modelInstance) => {
       if (modelInstance[this.primaryKey]) {
-        values.push(modelInstance[this.primaryKey])
+        result.push(modelInstance[this.primaryKey])
       }
-    })
-    return values
+      return result
+    }, [])
   }
 
   /**

diff --git a/src/Lucid/Relations/HasMany.js b/src/Lucid/Relations/HasMany.js
@@ -52,13 +52,12 @@ class HasMany extends BaseRelation {
    * @return {Array}
    */
   mapValues (modelInstances) {
-    const values = []
-    _.forEach(modelInstances, (modelInstance) => {
+    return _.transform(modelInstances, (result, modelInstance) => {
       if (modelInstance[this.primaryKey]) {
-        values.push(modelInstance[this.primaryKey])
+        result.push(modelInstance[this.primaryKey])
       }
-    })
-    return values
+      return result
+    }, [])
   }
 
   /**

diff --git a/src/Lucid/Relations/HasManyThrough.js b/src/Lucid/Relations/HasManyThrough.js
@@ -149,13 +149,12 @@ class HasManyThrough extends BaseRelation {
    * @return {Array}
    */
   mapValues (modelInstances) {
-    const values = []
-    _.forEach(modelInstances, (modelInstance) => {
+    return _.transform(modelInstances, (result, modelInstance) => {
       if (modelInstance[this.primaryKey]) {
-        values.push(modelInstance[this.primaryKey])
+        result.push(modelInstance[this.primaryKey])
       }
-    })
-    return values
+      return result
+    }, [])
   }
 
   /**

diff --git a/src/Lucid/Relations/HasOne.js b/src/Lucid/Relations/HasOne.js
@@ -51,13 +51,12 @@ class HasOne extends BaseRelation {
    * @return {Array}
    */
   mapValues (modelInstances) {
-    const values = []
-    _.forEach(modelInstances, (modelInstance) => {
+    return _.transform(modelInstances, (result, modelInstance) => {
       if (modelInstance[this.primaryKey]) {
-        values.push(modelInstance[this.primaryKey])
+        result.push(modelInstance[this.primaryKey])
       }
-    })
-    return values
+      return result
+    }, [])
   }
 
   /**