From e35d12d0b9ebb446ea0f5819fc9d4c83d439e043 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 12 Apr 2024 08:42:44 +1000
Subject: [PATCH] Additional task filters

---
 app/Filters/TaskFilters.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php
index 3356c538e08f..aaa63608daeb 100644
--- a/app/Filters/TaskFilters.php
+++ b/app/Filters/TaskFilters.php
@@ -156,10 +156,17 @@ class TaskFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->where(function ($query) use ($user) {
-            $query->where('user_id', $this->decodePrimaryKey($user))
-                  ->orWhere('assigned_user_id', $this->decodePrimaryKey($user));
-        });
+        return $this->builder->where('user_id', $this->decodePrimaryKey($user));
+
+    }
+
+    public function assigned_user(string $user = ''): Builder
+    {
+        if (strlen($user) == 0) {
+            return $this->builder;
+        }
+
+        return $this->builder->where('assigned_user_id', $this->decodePrimaryKey($user));
 
     }