fix: fix search function to accept null criteria as empty query string (

#1138)
officelifehq · Jun 30, 2021 · bae676b · bae676b
1 parent 07901c2
commit bae676b
Show file tree

Hide file tree

Showing 16 changed files with 126 additions and 181 deletions.
diff --git a/app/Http/ViewHelpers/Adminland/AdminExpenseViewHelper.php b/app/Http/ViewHelpers/Adminland/AdminExpenseViewHelper.php
@@ -62,12 +62,12 @@ public static function employees($company): ?Collection
      * Search all employees matching a given criteria.
      *
      * @param Company $company
-     * @param string $criteria
+     * @param string|null $criteria
      * @return Collection
      */
-    public static function search(Company $company, string $criteria): Collection
+    public static function search(Company $company, ?string $criteria): Collection
     {
-        $employees = $company->employees()
+        return $company->employees()
             ->select('id', 'first_name', 'last_name', 'avatar_file_id')
             ->notLocked()
             ->where(function ($query) use ($criteria) {
@@ -78,16 +78,12 @@ public static function search(Company $company, string $criteria): Collection
             ->where('can_manage_expenses', false)
             ->orderBy('last_name', 'asc')
             ->take(10)
-            ->get();
-
-        $employeesCollection = collect([]);
-        foreach ($employees as $employee) {
-            $employeesCollection->push([
-                'id' => $employee->id,
-                'name' => $employee->name,
-            ]);
-        }
-
-        return $employeesCollection;
+            ->get()
+            ->map(function ($employee) {
+                return [
+                    'id' => $employee->id,
+                    'name' => $employee->name,
+                ];
+            });
     }
 }
diff --git a/app/Http/ViewHelpers/Adminland/AdminSoftwareViewHelper.php b/app/Http/ViewHelpers/Adminland/AdminSoftwareViewHelper.php
@@ -132,16 +132,15 @@ public static function seats($employees, Company $company): Collection
      *
      * @param Software $software
      * @param Company $company
-     * @param string $criteria
+     * @param string|null $criteria
      * @return Collection
      */
-    public static function getPotentialEmployees(Software $software, Company $company, string $criteria): Collection
+    public static function getPotentialEmployees(Software $software, Company $company, ?string $criteria): Collection
     {
         // get list of employees who have the software
         $employees = $software->employees()
             ->select('id')
-            ->pluck('id')
-            ->toArray();
+            ->pluck('id');
 
         $potentialEmployees = $company->employees()
             ->select('id', 'first_name', 'last_name', 'avatar_file_id')

diff --git a/app/Http/ViewHelpers/Company/Group/GroupCreateViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupCreateViewHelper.php
@@ -13,12 +13,12 @@ class GroupCreateViewHelper
      * Search all potential members for the group.
      *
      * @param Company $company
-     * @param string $criteria
+     * @param string|null $criteria
      * @return Collection
      */
-    public static function search(Company $company, string $criteria): Collection
+    public static function search(Company $company, ?string $criteria): Collection
     {
-        $potentialEmployees = $company->employees()
+        return $company->employees()
             ->select('id', 'first_name', 'last_name', 'avatar_file_id')
             ->notLocked()
             ->where(function ($query) use ($criteria) {
@@ -28,17 +28,13 @@ public static function search(Company $company, string $criteria): Collection
             })
             ->orderBy('last_name', 'asc')
             ->take(10)
-            ->get();
-
-        $employeesCollection = collect([]);
-        foreach ($potentialEmployees as $employee) {
-            $employeesCollection->push([
-                'id' => $employee->id,
-                'name' => $employee->name,
-                'avatar' => ImageHelper::getAvatar($employee, 23),
-            ]);
-        }
-
-        return $employeesCollection;
+            ->get()
+            ->map(function ($employee) {
+                return [
+                    'id' => $employee->id,
+                    'name' => $employee->name,
+                    'avatar' => ImageHelper::getAvatar($employee, 23),
+                ];
+            });
     }
 }
diff --git a/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php b/app/Http/ViewHelpers/Company/Group/GroupMeetingsViewHelper.php
@@ -128,17 +128,16 @@ public static function show(Meeting $meeting, Company $company): array
      *
      * @param Meeting $meeting
      * @param Company $company
-     * @param string $criteria
+     * @param string|null $criteria
      * @return Collection
      */
-    public static function potentialGuests(Meeting $meeting, Company $company, string $criteria): Collection
+    public static function potentialGuests(Meeting $meeting, Company $company, ?string $criteria): Collection
     {
         $members = $meeting->employees()
-            ->select('id', 'first_name', 'last_name')
-            ->pluck('id')
-            ->toArray();
+            ->select('id')
+            ->pluck('id');
 
-        $potentialGuests = $company->employees()
+        return $company->employees()
             ->select('id', 'first_name', 'last_name')
             ->notLocked()
             ->whereNotIn('id', $members)
@@ -149,17 +148,13 @@ public static function potentialGuests(Meeting $meeting, Company $company, strin
             })
             ->orderBy('last_name', 'asc')
             ->take(10)
-            ->get();
-
-        $employeesCollection = collect([]);
-        foreach ($potentialGuests as $employee) {
-            $employeesCollection->push([
-                'id' => $employee->id,
-                'name' => $employee->name,
-            ]);
-        }
-
-        return $employeesCollection;
+            ->get()
+            ->map(function ($employee) {
+                return [
+                    'id' => $employee->id,
+                    'name' => $employee->name,
+                ];
+            });
     }
 
     /**

diff --git a/app/Http/ViewHelpers/Company/HR/CompanyHRViewHelper.php b/app/Http/ViewHelpers/Company/HR/CompanyHRViewHelper.php
@@ -30,9 +30,7 @@ public static function eCoffees(Company $company): ?array
         $allMatchesInCompany = DB::table('e_coffees')
             ->where('company_id', $company->id)
             ->select('id')
-            ->get()
-            ->pluck('id')
-            ->toArray();
+            ->pluck('id');
 
         // list all matches for each ecoffee sessions
         $eCoffeeMatchesParticipated = DB::table('e_coffee_matches')

diff --git a/app/Http/ViewHelpers/Company/Project/ProjectDecisionsViewHelper.php b/app/Http/ViewHelpers/Company/Project/ProjectDecisionsViewHelper.php
@@ -58,12 +58,12 @@ public static function decisions(Project $project, Employee $employee): Collecti
      * Search all employees matching a given criteria.
      *
      * @param Company $company
-     * @param string $criteria
+     * @param string|null $criteria
      * @return Collection
      */
-    public static function searchDeciders(Company $company, string $criteria): Collection
+    public static function searchDeciders(Company $company, ?string $criteria): Collection
     {
-        $employees = $company->employees()
+        return $company->employees()
             ->select('id', 'first_name', 'last_name', 'avatar_file_id')
             ->notLocked()
             ->where(function ($query) use ($criteria) {
@@ -73,17 +73,13 @@ public static function searchDeciders(Company $company, string $criteria): Colle
             })
             ->orderBy('last_name', 'asc')
             ->take(10)
-            ->get();
-
-        $employeesCollection = collect([]);
-        foreach ($employees as $employee) {
-            $employeesCollection->push([
-                'id' => $employee->id,
-                'name' => $employee->name,
-                'avatar' => ImageHelper::getAvatar($employee, 23),
-            ]);
-        }
-
-        return $employeesCollection;
+            ->get()
+            ->map(function ($employee) {
+                return [
+                    'id' => $employee->id,
+                    'name' => $employee->name,
+                    'avatar' => ImageHelper::getAvatar($employee, 23),
+                ];
+            });
     }
 }
diff --git a/app/Http/ViewHelpers/Company/Project/ProjectViewHelper.php b/app/Http/ViewHelpers/Company/Project/ProjectViewHelper.php
@@ -214,12 +214,12 @@ public static function info(Project $project): array
      * Search all employees matching a given criteria.
      *
      * @param Company $company
-     * @param string $criteria
+     * @param string|null $criteria
      * @return Collection
      */
-    public static function searchProjectLead(Company $company, string $criteria): Collection
+    public static function searchProjectLead(Company $company, ?string $criteria): Collection
     {
-        $employees = $company->employees()
+        return $company->employees()
             ->select('id', 'first_name', 'last_name', 'avatar_file_id', 'email')
             ->notLocked()
             ->where(function ($query) use ($criteria) {
@@ -229,17 +229,13 @@ public static function searchProjectLead(Company $company, string $criteria): Co
             })
             ->orderBy('last_name', 'asc')
             ->take(10)
-            ->get();
-
-        $employeesCollection = collect([]);
-        foreach ($employees as $employee) {
-            $employeesCollection->push([
-                'id' => $employee->id,
-                'name' => $employee->name,
-                'avatar' => ImageHelper::getAvatar($employee, 23),
-            ]);
-        }
-
-        return $employeesCollection;
+            ->get()
+            ->map(function ($employee) {
+                return [
+                    'id' => $employee->id,
+                    'name' => $employee->name,
+                    'avatar' => ImageHelper::getAvatar($employee, 23),
+                ];
+            });
     }
 }
diff --git a/app/Http/ViewHelpers/Dashboard/DashboardHRViewHelper.php b/app/Http/ViewHelpers/Dashboard/DashboardHRViewHelper.php
@@ -37,9 +37,7 @@ public static function employeesWithoutManagersWithPendingTimesheets(Company $co
         $listOfEmployeesWithManagers = DB::table('direct_reports')
             ->where('company_id', $company->id)
             ->select('employee_id')
-            ->get()
-            ->pluck('employee_id')
-            ->toArray();
+            ->pluck('employee_id');
 
         $timesheetsWithUniqueEmployees = $timesheets->unique('employee_id');
         $timesheetsWithUniqueEmployees = $timesheetsWithUniqueEmployees->whereNotIn('employee_id', $listOfEmployeesWithManagers);

diff --git a/app/Http/ViewHelpers/Dashboard/HR/DashboardHRTimesheetViewHelper.php b/app/Http/ViewHelpers/Dashboard/HR/DashboardHRTimesheetViewHelper.php
@@ -38,9 +38,7 @@ public static function timesheetApprovalsForEmployeesWithoutManagers(Company $co
         $listOfEmployeesWithManagers = DB::table('direct_reports')
             ->where('company_id', $company->id)
             ->select('employee_id')
-            ->get()
-            ->pluck('employee_id')
-            ->toArray();
+            ->pluck('employee_id');
 
         $timesheetsWithUniqueEmployees = $timesheets->unique('employee_id');
         $timesheetsWithUniqueEmployees = $timesheetsWithUniqueEmployees->whereNotIn('employee_id', $listOfEmployeesWithManagers);

diff --git a/app/Http/ViewHelpers/Employee/EmployeeHierarchyViewHelper.php b/app/Http/ViewHelpers/Employee/EmployeeHierarchyViewHelper.php
@@ -13,12 +13,20 @@ class EmployeeHierarchyViewHelper
      *
      * @param Company $company
      * @param Employee $employee
-     * @param string $criteria
+     * @param string|null $criteria
      * @return Collection
      */
-    public static function search(Company $company, Employee $employee, string $criteria): Collection
+    public static function search(Company $company, Employee $employee, ?string $criteria): Collection
     {
-        $potentialEmployees = $company->employees()
+        // remove the existing managers of this employee from the list
+        $existingManagersForTheEmployee = $employee->getListOfManagers()
+            ->pluck('id');
+
+        // remove the existing direct reports of this employee from the list
+        $existingDirectReportsForTheEmployee = $employee->getListOfDirectReports()
+            ->pluck('id');
+
+        return $company->employees()
             ->select('id', 'first_name', 'last_name')
             ->notLocked()
             ->where(function ($query) use ($criteria) {
@@ -27,26 +35,15 @@ public static function search(Company $company, Employee $employee, string $crit
                     ->orWhere('email', 'LIKE', '%'.$criteria.'%');
             })
             ->where('id', '!=', $employee->id)
+            ->whereNotIn('id', $existingManagersForTheEmployee->merge($existingDirectReportsForTheEmployee))
             ->orderBy('last_name', 'asc')
             ->take(10)
-            ->get();
-
-        // remove the existing managers of this employee from the list
-        $existingManagersForTheEmployee = $employee->getListOfManagers();
-        $potentialEmployees = $potentialEmployees->diff($existingManagersForTheEmployee);
-
-        // remove the existing direct reports of this employee from the list
-        $existingDirectReportsForTheEmployee = $employee->getListOfDirectReports();
-        $potentialEmployees = $potentialEmployees->diff($existingDirectReportsForTheEmployee);
-
-        $employeesCollection = collect([]);
-        foreach ($potentialEmployees as $employee) {
-            $employeesCollection->push([
-                'id' => $employee->id,
-                'name' => $employee->name,
-            ]);
-        }
-
-        return $employeesCollection;
+            ->get()
+            ->map(function ($employee) {
+                return [
+                    'id' => $employee->id,
+                    'name' => $employee->name,
+                ];
+            });
     }
 }
diff --git a/app/Http/ViewHelpers/Employee/EmployeeSkillViewHelper.php b/app/Http/ViewHelpers/Employee/EmployeeSkillViewHelper.php
@@ -28,8 +28,7 @@ public static function search(Company $company, Employee $employee, ?string $cri
 
         $employeeSkills = $employee->skills()
             ->select('id')
-            ->pluck('id')
-            ->toArray();
+            ->pluck('id');
 
         return $company->skills()
             ->select('id', 'name')

diff --git a/app/Http/ViewHelpers/Team/TeamMembersViewHelper.php b/app/Http/ViewHelpers/Team/TeamMembersViewHelper.php
@@ -15,38 +15,33 @@ class TeamMembersViewHelper
      *
      * @param Company $company
      * @param Team $team
-     * @param string $criteria
+     * @param string|null $criteria
      * @return Collection
      */
-    public static function searchPotentialTeamMembers(Company $company, Team $team, string $criteria): Collection
+    public static function searchPotentialTeamMembers(Company $company, Team $team, ?string $criteria): Collection
     {
-        $potentialEmployees = $company->employees()
+        $employeesInTeam = $team->employees()
+            ->select('id')
+            ->pluck('id');
+
+        return $company->employees()
             ->select('id', 'first_name', 'last_name', 'email')
             ->notLocked()
             ->where(function ($query) use ($criteria) {
                 $query->where('first_name', 'LIKE', '%'.$criteria.'%')
                     ->orWhere('last_name', 'LIKE', '%'.$criteria.'%')
                     ->orWhere('email', 'LIKE', '%'.$criteria.'%');
             })
+            ->whereNotIn('id', $employeesInTeam)
             ->orderBy('last_name', 'asc')
             ->take(10)
-            ->get();
-
-        $employeesInTeam = $team->employees()
-            ->select('id', 'first_name', 'last_name')
-            ->get();
-
-        $potentialEmployees = $potentialEmployees->diff($employeesInTeam);
-
-        $employeesCollection = collect([]);
-        foreach ($potentialEmployees as $employee) {
-            $employeesCollection->push([
-                'id' => $employee->id,
-                'name' => $employee->name,
-            ]);
-        }
-
-        return $employeesCollection;
+            ->get()
+            ->map(function ($employee) {
+                return [
+                    'id' => $employee->id,
+                    'name' => $employee->name,
+                ];
+            });
     }
 
     /**