[feature] new sortable columns

- adds sorting ability on last run and average runtime columns

resolves #151

Author: lroggen

resources/views/tasks/index.blade.php

@@ -22,8 +22,8 @@
         <thead>
             <tr>
                 <th>{!! Html::columnSort('Description', 'description') !!}</th>
-                <th>Average Runtime</th>
-                <th>Last Run</th>
+                <th>{!! Html::columnSort('Average Runtime', 'average_runtime') !!}</th>
+                <th>{!! Html::columnSort('Last Run', 'last_ran_at') !!}</th>
                 <th>Next Run</th>
                 <th class="uk-text-center">Execute</th>
             </tr>
@@ -85,4 +85,4 @@
         </span>
     </div>
     {{$tasks->links('totem::partials.pagination')}}
-@stop
+@stop

src/Http/Controllers/TasksController.php

@@ -38,6 +38,8 @@ public function index()
                 ->builder()
                 ->sortableBy([
                     'description',
+                    'last_ran_at',
+                    'average_runtime',
                 ], ['description'=>'asc'])
                 ->when(request('q'), function ($query) {
                     $query->where('description', 'LIKE', '%'.request('q').'%');

src/Repositories/EloquentTaskRepository.php

@@ -3,6 +3,7 @@
 namespace Studio\Totem\Repositories;
 
 use Studio\Totem\Task;
+use Studio\Totem\Result;
 use Studio\Totem\Events\Created;
 use Studio\Totem\Events\Deleted;
 use Studio\Totem\Events\Updated;
@@ -14,6 +15,7 @@
 use Studio\Totem\Events\Deactivated;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Database\Eloquent\Builder;
 use Studio\Totem\Contracts\TaskInterface;
 
 class EloquentTaskRepository implements TaskInterface
@@ -23,9 +25,19 @@ class EloquentTaskRepository implements TaskInterface
      *
      * @return Task
      */
-    public function builder()
+    public function builder() : Builder
     {
-        return new Task;
+        $result = new Result;
+
+        return (new Task)->select('tasks.*')
+            ->selectSub(
+                $result->getLastRun(),
+                'last_ran_at'
+            )
+            ->selectSub(
+                $result->getAverageRunTime(),
+                'average_runtime'
+            );
     }
 
     /**

src/Result.php

@@ -2,6 +2,9 @@
 
 namespace Studio\Totem;
 
+use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Query\Builder;
+
 class Result extends TotemModel
 {
     protected $table = 'task_results';
@@ -19,4 +22,26 @@ public function task()
     {
         return $this->belongsTo(Task::class);
     }
+
+    /**
+     * @return Builder
+     */
+    public function getLastRun() : Builder
+    {
+        return $this->select('ran_at')
+            ->whereColumn('task_id', 'tasks.id')
+            ->latest()
+            ->limit(1)
+            ->getQuery();
+    }
+
+    /**
+     * @return Builder
+     */
+    public function getAverageRunTime() : Builder
+    {
+        return $this->select(DB::raw('avg(duration)'))
+            ->whereColumn('task_id', 'tasks.id')
+            ->getQuery();
+    }
 }