diff --git a/app/Http/Controllers/V3/CMMSMachinesController.php b/app/Http/Controllers/V3/CMMSMachinesController.php
index 73a08bd0..90cffe26 100644
--- a/app/Http/Controllers/V3/CMMSMachinesController.php
+++ b/app/Http/Controllers/V3/CMMSMachinesController.php
@@ -23,7 +23,7 @@ class CMMSMachinesController extends Controller
     {
         $matchedSearchedMachines = CMMSMachine::query()
             ->where('machine_code', 'LIKE', "%{$request->machine_code}%")
-            ->get();
+            ->get(['machine_code']);
 
         return $this->successResponse($matchedSearchedMachines);
     }
diff --git a/app/Http/Requests/V3/RoadItemsProject/VerifyBySupervisorRequest.php b/app/Http/Requests/V3/RoadItemsProject/VerifyBySupervisorRequest.php
index c360df47..6d0a19a3 100644
--- a/app/Http/Requests/V3/RoadItemsProject/VerifyBySupervisorRequest.php
+++ b/app/Http/Requests/V3/RoadItemsProject/VerifyBySupervisorRequest.php
@@ -17,7 +17,7 @@ class VerifyBySupervisorRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return Gate::allows('gate-supervise-road-item', $this->road_item);
+        return Gate::allows('gate-supervise-road-item', $this->roadItemsProject);
     }
 
     /**
diff --git a/routes/v3.php b/routes/v3.php
index bc28ba27..dc7f7d9f 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -118,7 +118,7 @@ Route::prefix('road_items')
     });
 
 Route::prefix('cmms_machines')
-    ->name('cmms_machines')
+    ->name('cmms_machines.')
     ->controller(CMMSMachinesController::class)
     ->group(function () {
         Route::get('/list', 'list')->name('list');
@@ -126,7 +126,7 @@ Route::prefix('cmms_machines')
     });
 
 Route::prefix('rahdaran')
-    ->name('rahdaran')
+    ->name('rahdaran.')
     ->controller(RahdaranController::class)
     ->group(function () {
         Route::get('/list', 'list')->name('list');
diff --git a/tests/Feature/V3/CMMSMachine/SearchTest.php b/tests/Feature/V3/CMMSMachine/SearchTest.php
new file mode 100644
index 00000000..40da9e7c
--- /dev/null
+++ b/tests/Feature/V3/CMMSMachine/SearchTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Tests\Feature\V3\CMMSMachine;
+
+use App\Models\CMMSMachine;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Tests\TestCase;
+
+class SearchTest extends TestCase
+{
+    use RefreshDatabase, WithFaker;
+    /**
+     * A basic feature test example.
+     */
+    public function test_user_can_search_through_machine_codes(): void
+    {
+        $user = User::factory()->create();
+
+        $machine = CMMSMachine::factory()->create();
+
+        $response = $this->actingAs($user)->getJson(route('v3.cmms_machines.search', [$machine->machine_code]));
+
+        $response->assertOk();
+
+        $response->assertJsonStructure([
+            'data' => [
+                '*' => [
+                    "machine_code",
+                ],
+            ]
+        ]);
+    }
+}
diff --git a/tests/Feature/V3/Rahdaran/SearchTest.php b/tests/Feature/V3/Rahdaran/SearchTest.php
new file mode 100644
index 00000000..65a0f55a
--- /dev/null
+++ b/tests/Feature/V3/Rahdaran/SearchTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Tests\Feature\V3\Rahdaran;
+
+use App\Models\Rahdaran;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Tests\TestCase;
+
+class SearchTest extends TestCase
+{
+    use RefreshDatabase;
+    /**
+     * A basic feature test example.
+     */
+    public function test_user_can_search_through_rahdaran_codes(): void
+    {
+        $user = User::factory()->create();
+
+        $rahdar = Rahdaran::factory()->create();
+
+        $response = $this->actingAs($user)->getJson(route('v3.cmms_machines.search', [$rahdar->code]));
+
+        $response->assertOk();
+
+        $response->assertJsonStructure([
+            'data' => [
+                '*' => [
+                    "name",
+                    "code",
+                ],
+            ]
+        ]);
+    }
+}