From 4860d3c45cfe7d8634bebafec90e586be13b07d9 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Wed, 1 Oct 2025 11:59:35 +0330
Subject: [PATCH] resolve confilict

---
 app/Http/Controllers/V3/RahdaranController.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/V3/RahdaranController.php b/app/Http/Controllers/V3/RahdaranController.php
index 5ef3ba42..47c8383e 100644
--- a/app/Http/Controllers/V3/RahdaranController.php
+++ b/app/Http/Controllers/V3/RahdaranController.php
@@ -7,11 +7,13 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\V3\Rahdaran\StoreRequest;
 use App\Http\Requests\V3\Rahdaran\UpdateRequest;
 use App\Http\Traits\ApiResponse;
+use App\Models\EdarateShahri;
 use App\Models\Province;
 use App\Models\Rahdaran;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class RahdaranController extends Controller
 {
@@ -19,8 +21,16 @@ class RahdaranController extends Controller
 
     public function index(Request $request): JsonResponse
     {
+        $user = Auth::user();
+        $query = $user->hasPermissionTo('manage-rahdaran-country') ?
+            Rahdaran::query() :
+            ($user->hasPermissionTo('manage-rahdaran-province') ?
+                Rahdaran::query()->where('province_id', '=', $user->province_id) :
+                Rahdaran::query()->where('edareh_shahri_id', '=', $user->edarate_shahri_id)
+            );
+
         return response()->json(DataTableFacade::run(
-            Rahdaran::query(),
+            $query,
             $request,
             allowedFilters: ['*'],
             allowedSortings: ['*'])
@@ -30,6 +40,7 @@ class RahdaranController extends Controller
     public function store(StoreRequest $request): JsonResponse
     {
         $province = Province::query()->find($request->input('province_id'));
+        $edareh = EdarateShahri::query()->find($request->input('edareh_shahri_id'));
 
         Rahdaran::query()->create([
             'name' => $request->name,
@@ -38,7 +49,7 @@ class RahdaranController extends Controller
             'province_id' => $province->id,
             'province_name' => $province->name_fa,
             'edareh_shahri_id' => $request->edareh_shahri_id,
-            'is_driver' => $request->is_driver,
+            'edareh_shahri_name' => $edareh->name_fa,
         ]);
 
         return $this->successResponse();
@@ -52,6 +63,7 @@ class RahdaranController extends Controller
     public function update(UpdateRequest $request, Rahdaran $rahdaran): JsonResponse
     {
         $province = Province::query()->find($request->input('province_id'));
+        $edareh = EdarateShahri::query()->find($request->input('edareh_shahri_id'));
 
         $rahdaran->update([
             'name' =>$request->name,
@@ -60,7 +72,7 @@ class RahdaranController extends Controller
             'province_id' => $province->id,
             'province_name' => $province->name_fa,
             'edareh_shahri_id' => $request->edareh_shahri_id,
-            'is_driver' => $request->is_driver,
+            'edareh_shahri_name' => $edareh->name_fa,
         ]);
 
         return $this->successResponse();