Relation sortable overrides are now called

zygimantas-gylys · Mar 16, 2017 · 330f9ee · 330f9ee
1 parent bd136fb
commit 330f9ee
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/src/ColumnSortable/Sortable.php b/src/ColumnSortable/Sortable.php
@@ -58,10 +58,6 @@ private function queryOrderBuilder($query, array $sortParameters)
             return $query;
         }
 
-        if (method_exists($this, camel_case($column).'Sortable')) {
-            return call_user_func_array([$this, camel_case($column).'Sortable'], [$query, $direction]);
-        }
-
         $explodeResult = SortableLink::explodeSortParameter($column);
         if ( ! empty($explodeResult)) {
             $relationName = $explodeResult[0];
@@ -79,6 +75,10 @@ private function queryOrderBuilder($query, array $sortParameters)
             $model = $relation->getRelated();
         }
 
+        if (method_exists($model, camel_case($column).'Sortable')) {
+            return call_user_func_array([$model, camel_case($column).'Sortable'], [$query, $direction]);
+        }
+
         if (isset($model->sortableAs) && in_array($column, $model->sortableAs)) {
             $query = $query->orderBy($column, $direction);
         } elseif ($this->columnExists($model, $column)) {

diff --git a/tests/ColumnSortableTraitTest.php b/tests/ColumnSortableTraitTest.php
@@ -144,6 +144,18 @@ public function testSortableOverridingQueryOrderBuilder()
         $this->assertEquals($expectedQuery, $resultQuery);
     }
 
+    public function testSortableOverridingQueryOrderBuilderOnRelation()
+    {
+        $sortParameters = ['sort' => 'profile.composite', 'order' => 'desc'];
+        $query = $this->user->newQuery();
+
+        $resultQuery = $this->invokeMethod($this->user, 'queryOrderBuilder', [$query, $sortParameters]);
+
+        $expectedQuery = $this->user->newQuery()->join('profiles', 'users.id', '=',
+            'profiles.user_id')->orderBy('phone', 'desc')->orderBy('address', 'desc')->select('users.*');
+
+        $this->assertEquals($expectedQuery, $resultQuery);
+    }
 
     public function testSortableAs()
     {
@@ -314,7 +326,8 @@ class Profile extends Model
      */
     public $sortable = [
         'phone',
-        'address'
+        'address',
+        'composite'
     ];
 
 
@@ -325,4 +338,9 @@ public function user()
     {
         return $this->belongsTo(User::class);
     }
+
+    public function compositeSortable($query, $direction)
+    {
+        return $query->orderBy('phone', $direction)->orderBy('address', $direction);
+    }
 }