improvement

Author: Ardalan

README.md

@@ -90,7 +90,12 @@ class User {
 
             // add eager constraints
             function ($relation, $models) {
-                $relation->getQuery()->whereIn('role_user.user_id', $relation->getKeys($models));
+                $relation->getQuery()->whereIn(
+                  'role_user.user_id',
+                  collect($models)->map(function ($value) {
+                      return $value->getKey();
+                  })->values()->unique()->sort()->all()
+               );
             }
         );
     }
@@ -125,7 +130,12 @@ class Permission {
 
             // eager constraints
             function ($relation, $models) {
-                $relation->getQuery()->whereIn('permission_role.permission_id', $relation->getKeys($models));
+                $relation->getQuery()->whereIn(
+                    'permission_role.permission_id',
+                    collect($models)->map(function ($value) {
+                        return $value->getKey();
+                    })->values()->unique()->sort()->all()
+                );
             }
         );
     }

src/HasCustomRelations.php

@@ -32,11 +32,12 @@ public function custom(
         Closure $baseConstraints,
         Closure $eagerConstraints,
         array $eagerParentRelations = null,
-        string $localKey = null
+        string $localKey = null,
+        string $foreignKey = null
     ) {
         $instance = $this->newRelatedInstance($related);
         $query = $instance->newQuery();
 
-        return new Custom($query, $this, $baseConstraints, $eagerConstraints, $eagerParentRelations, $localKey);
+        return new Custom($query, $this, $baseConstraints, $eagerConstraints, $eagerParentRelations, $localKey, $foreignKey);
     }
 }

src/Relations/Custom.php

@@ -38,14 +38,16 @@ public function __construct(
         Closure $baseConstraints,
         Closure $eagerConstraints,
         array $eagerParentRelations = null,
-        string $localKey = null
+        string $localKey = null,
+        string $foreignKey = null,
     ) {
         $this->baseConstraints = $baseConstraints;
         $this->eagerConstraints = $eagerConstraints;
 
         if ($eagerParentRelations != null) $parent->setEagerLoads($eagerParentRelations);
 
         $this->localKey = $localKey;
+        $this->foreignKey = $foreignKey;
 
         parent::__construct($query, $parent);
     }
@@ -118,7 +120,12 @@ protected function buildDictionary(Collection $results, $models) {
         // parents without having a possibly slow inner loops for every models.
         $dictionary = [];
 
-        foreach ($models as $model) $dictionary[$model->getKey()] = $results->where($this->localKey ?: $model->getKeyName(), $model->getKey())->all();
+        foreach ($models as $model) {
+            $dictionary[$model->getKey()] = $results->where(
+                $this->localKey ?: $model->getKeyName(),
+                $this->foreignKey ? $model->getAttribute($this->foreignKey) : $model->getKey()
+            )->all();
+        }
 
         return $dictionary;
     }