Merge pull request #2 from laravel-enso/fixes/fixesTimePsql

fixes time in psql
laravel-enso · Nov 26, 2020 · f294837 · f294837
2 parents af5ed11 + 69becdb
commit f294837
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Models/Task.php b/src/Models/Task.php
@@ -3,6 +3,7 @@
 namespace LaravelEnso\Tasks\Models;
 
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Facades\Auth;
@@ -14,7 +15,7 @@
 
 class Task extends Model
 {
-    use TableCache, CreatedBy, UpdatedBy;
+    use TableCache, HasFactory, CreatedBy, UpdatedBy;
 
     protected $guarded = ['id'];
 

diff --git a/src/Tables/Builders/TaskTable.php b/src/Tables/Builders/TaskTable.php
@@ -2,6 +2,7 @@
 
 namespace LaravelEnso\Tasks\Tables\Builders;
 
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 use LaravelEnso\Helpers\Services\Obj;
@@ -16,14 +17,17 @@ class TaskTable implements Table, CustomFilter, ConditionalActions
 
     public function query(): Builder
     {
+        $now = Carbon::now();
+        $overdue = "completed = true and reminder >= '{$now}'";
+
         return Task::visible()
             ->with('createdBy.avatar', 'createdBy.person')
             ->with('allocatedTo.avatar', 'allocatedTo.person')
-            ->selectRaw('
+            ->selectRaw("
                 tasks.id, tasks.name, tasks.description, tasks.flag, tasks.completed,
                 tasks.allocated_to, tasks.reminder, tasks.reminder as rawReminder,
-                created_by, created_at, IF(completed, 0, reminder < CURRENT_TIME()) as overdue
-            ');
+                created_by, created_at, {$overdue} as overdue
+            ");
     }
 
     public function templatePath(): string