fix: Allow searching of CID within feedback

VATSIM-UK · Aug 29, 2024 · f0a8443 · f0a8443
1 parent ff9c17e
commit f0a8443
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/app/Http/Controllers/Mship/Feedback.php b/app/Http/Controllers/Mship/Feedback.php
@@ -166,10 +166,12 @@ public function postFeedback(Form $form, Request $request)
             ->withSuccess('Your feedback has been recorded. Thank you!');
     }
 
-    public function getUserSearch($name, Request $request)
+    public function getUserSearch($search, Request $request)
     {
-        $matches = Account::whereRaw("CONCAT(`name_first`, ' ',`name_last`) LIKE \"%".$name.'%"')
-            ->where('id', '!=', \Auth::user()->id)
+        $matches = Account::where(function ($query) use ($search) {
+            return $query->whereRaw("CONCAT(`name_first`, ' ',`name_last`) LIKE \"%".$search.'%"')
+                ->orWhere('id', $search);
+        })->where('id', '!=', \Auth::user()->id)
             ->limit(5)
             ->with(['states'])
             ->get(['id', 'name_first', 'name_last']);

diff --git a/tests/Feature/Account/Feedback/FeedbackUserSearchTest.php b/tests/Feature/Account/Feedback/FeedbackUserSearchTest.php
@@ -20,7 +20,7 @@ public function setUp(): void
     }
 
     /** @test */
-    public function testItReturnsAnotherUser()
+    public function testItReturnsAnotherUserByName()
     {
         $searchQuery = $this->actingAs($this->user)
             ->get(route('mship.feedback.usersearch', $this->otherUser->real_name))
@@ -30,6 +30,17 @@ public function testItReturnsAnotherUser()
         $this->assertStringContainsString((string) $this->otherUser->id, $searchQuery);
     }
 
+    /** @test */
+    public function testItReturnsAnotherUserById()
+    {
+        $searchQuery = $this->actingAs($this->user)
+            ->get(route('mship.feedback.usersearch', $this->otherUser->id))
+            ->getContent();
+
+        $this->assertStringContainsString(e($this->otherUser->real_name), $searchQuery);
+        $this->assertStringContainsString((string) $this->otherUser->id, $searchQuery);
+    }
+
     /** @test */
     public function testItDoesNotReturnCurrentUser()
     {