From ba5a6a2bd84c6de78b0d6b3f1e441b61432945e9 Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Wed, 12 Apr 2023 08:49:44 +0200 Subject: [PATCH] added team name into search results --- be/routes/api.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/be/routes/api.php b/be/routes/api.php index 8d6006a..c9144e8 100644 --- a/be/routes/api.php +++ b/be/routes/api.php @@ -110,11 +110,10 @@ Route::middleware(['auth:sanctum', 'abilities:full-access'])->group(function () $projectIDs = Project::where('name', 'like', '%' . $search . '%')->orWhere('code', 'like', '%' . $search . '%')->get()->pluck('id'); $userIDs = User::where('firstname', 'like', '%' . $search . '%')->orWhere('lastname', 'like', '%' . $search . '%')->get()->pluck('id'); - - + $teams = Team::whereHas('users', function($q) use($userIDs) { $q->whereIn('user_id', $userIDs); - })->get(); + })->orWhere('name', 'like', '%' . $search . '%' )->get(); $mastertasks = MasterTask::with('subtasks')->where('title', 'like', '%' . $search . '%')->orWhereIn('project_id', $projectIDs)->orWhereIn('team_id', $teams->pluck('id'))->get();