Test: Guest search refactor

barbosa89 · Feb 27, 2021 · 1777c2a · 1777c2a
1 parent 94597fd
commit 1777c2a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/app/Helpers/Parameter.php b/app/Helpers/Parameter.php
@@ -18,7 +18,7 @@ public static function clean($value = null, $encoding = 'UTF-8')
 			return null;
 		}
 
-		return htmlentities($value, ENT_QUOTES | ENT_HTML5, $encoding);
+		return htmlentities((string) $value, ENT_QUOTES | ENT_HTML5, $encoding);
 	}
 
 	/**
@@ -43,4 +43,4 @@ public static function bool($value = null): bool
 
 		return false;
 	}
-}
+}
diff --git a/app/Http/Controllers/Api/GuestController.php b/app/Http/Controllers/Api/GuestController.php
@@ -27,7 +27,7 @@ public function index()
         $validated = request()->validate([
             'from_date' => 'bail|nullable|date|before_or_equal:today',
             'status' => 'bail|nullable|string|in:is_staying,is_not_staying',
-            'query_by' => 'bail|nullable|string|min:3|max:50',
+            'query_by' => 'bail|nullable|alpha_num|min:3|max:50',
         ]);
 
         $guests = $this->guest->paginate(

diff --git a/app/Models/Guest.php b/app/Models/Guest.php
@@ -163,6 +163,6 @@ public function scopeStatus($query, string $status)
      */
     public function scopeQueryBy($query, string $text)
     {
-        return $query->whereLike(['name', 'last_name', 'dni', 'email'], $text);
+        return $query->whereLike(['name', 'last_name', 'dni'], $text);
     }
 }
diff --git a/tests/Feature/Api/GuestTest.php b/tests/Feature/Api/GuestTest.php
@@ -245,7 +245,7 @@ public function test_user_can_filter_guests_by_query()
                 'GET',
                 '/api/v1/web/guests',
                 [
-                    'query_by' => $guest->name,
+                    'query_by' => $guest->dni,
                 ]
             );
 

diff --git a/tests/Feature/VoucherTest.php b/tests/Feature/VoucherTest.php
@@ -157,7 +157,7 @@ public function test_user_can_search_guests_to_add_to_voucher()
                 'GET',
                 '/api/v1/web/guests',
                 [
-                    'query_by' => $guest->name,
+                    'query_by' => $guest->dni,
                 ]
             );
-Original file line number
+Diff line change
@@ Expand Up / @@ -245,7 +245,7 @@ public function test_user_can_filter_guests_by_query() @@
                     'GET',
                     '/api/v1/web/guests',
                     [
-                        'query_by' => $guest->name,
+                        'query_by' => $guest->dni,
                     ]
                 );
@@ Expand Down @@