From ece2d687cddcc016d5f5b1ee605fc6d8d3383047 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Mon, 19 May 2025 09:18:32 +0330
Subject: [PATCH 1/3] create transportation unit cartable

---
 .../Mission/TransportationUnitController.php  | 36 ++++++++++++++
 .../SafetyAndPrivacy/OperatorController.php   | 10 ++--
 .../OperatorReportController.php              | 17 +++----
 .../SafetyAndPrivacy/SupervisorController.php |  9 ++--
 app/Models/Mission.php                        | 20 ++++++++
 .../Mission/TransportationUnitService.php     | 34 +++++++++++++
 .../OperatorService.php}                      | 48 ++-----------------
 .../SafetyAndPrivacy/SupervisorService.php    | 39 +++++++++++++++
 ...025_05_17_103927_create_missions_table.php |  2 +-
 9 files changed, 153 insertions(+), 62 deletions(-)
 create mode 100644 app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
 create mode 100644 app/Services/Cartables/Mission/TransportationUnitService.php
 rename app/Services/Cartables/{SafetyAndPrivacyTableService.php => SafetyAndPrivacy/OperatorService.php} (78%)
 create mode 100644 app/Services/Cartables/SafetyAndPrivacy/SupervisorService.php

diff --git a/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php b/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
new file mode 100644
index 00000000..f735ab17
--- /dev/null
+++ b/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Controllers\V3\Dashboard\Mission;
+
+use App\Http\Controllers\Controller;
+use App\Http\Traits\ApiResponse;
+use App\Models\Mission;
+use App\Services\Cartables\Mission\TransportationUnitService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class TransportationUnitController extends Controller
+{
+    use ApiResponse;
+
+    public function index(Request $request, TransportationUnitService $transportationUnitService): JsonResponse
+    {
+        return response()->json($transportationUnitService->dataTable($request));
+    }
+
+    public function allocate(Request $request, Mission $mission): JsonResponse
+    {
+        $mission->machines()->attach($request->machines);
+
+        $mission->update([
+           'state' => ''
+        ]);
+
+        return $this->successResponse();
+    }
+
+    public function deallocate()
+    {
+        
+    }
+}
diff --git a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorController.php b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorController.php
index b6726fe4..995233c1 100644
--- a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorController.php
+++ b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorController.php
@@ -17,7 +17,7 @@ use App\Http\Requests\V3\SafetyAndPrivacy\UpdateRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\InfoItem;
 use App\Models\SafetyAndPrivacy;
-use App\Services\Cartables\SafetyAndPrivacyTableService;
+use App\Services\Cartables\SafetyAndPrivacy\OperatorService;
 use App\Services\NominatimService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -34,18 +34,18 @@ class OperatorController extends Controller
     /**
      * @throws Throwable
      */
-    public function index(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): JsonResponse
+    public function index(Request $request, OperatorService $operatorService): JsonResponse
     {
-        return response()->json($safetyAndPrivacyTableService->operatorDatatable($request));
+        return response()->json($operatorService->datatable($request));
     }
 
     /**
      * @throws Throwable
      */
-    public function excelReport(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): BinaryFileResponse
+    public function excelReport(Request $request, OperatorService $operatorService): BinaryFileResponse
     {
         $name = 'گزارش از نگهداری حریم راه ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-        $data = $safetyAndPrivacyTableService->operatorDatatable($request);
+        $data = $operatorService->datatable($request);
         return Excel::download(new OperatorCartableReport($data['data']), $name);
     }
 
diff --git a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReportController.php b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReportController.php
index 31b41c52..0e3c5e78 100644
--- a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReportController.php
+++ b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReportController.php
@@ -8,6 +8,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
 use App\Models\Province;
+use App\Services\Cartables\SafetyAndPrivacy\OperatorService;
 use App\Services\Cartables\SafetyAndPrivacyTableService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -18,34 +19,34 @@ class OperatorReportController extends Controller
 {
     use ApiResponse;
 
-    public function countryActivity(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): JsonResponse
+    public function countryActivity(Request $request, OperatorService $operatorService): JsonResponse
     {
-        $data = $safetyAndPrivacyTableService->countryActivity($request);
+        $data = $operatorService->countryActivity($request);
         return $this->successResponse([
             'activities' => $data,
             'provinces' => Province::all(['id', 'name_fa'])
         ]);
     }
 
-    public function provinceActivity(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): JsonResponse
+    public function provinceActivity(Request $request, OperatorService $operatorService): JsonResponse
     {
-        $data = $safetyAndPrivacyTableService->provinceActivity($request);
+        $data = $operatorService->provinceActivity($request);
         return $this->successResponse([
             'activities' => $data,
             'edarateShahri' => EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']),
         ]);
     }
 
-    public function countryExcelActivity(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): BinaryFileResponse
+    public function countryExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
     {
-        $data = $safetyAndPrivacyTableService->countryActivity($request);
+        $data = $operatorService->countryActivity($request);
         $name = 'گزارش از نگهداری حریم راه ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
         return Excel::download(new CountryActivityReport($data), $name);
     }
 
-    public function provinceExcelActivity(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): BinaryFileResponse
+    public function provinceExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
     {
-        $data = $safetyAndPrivacyTableService->provinceActivity($request);
+        $data = $operatorService->provinceActivity($request);
         $name = 'گزارش از نگهداری حریم راه ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
         return Excel::download(new ProvinceActivityReport($data, $request), $name);
     }
diff --git a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/SupervisorController.php b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/SupervisorController.php
index fc026166..0cd984c5 100644
--- a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/SupervisorController.php
+++ b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/SupervisorController.php
@@ -8,6 +8,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\V3\SafetyAndPrivacy\RejectRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\SafetyAndPrivacy;
+use App\Services\Cartables\SafetyAndPrivacy\SupervisorService;
 use App\Services\Cartables\SafetyAndPrivacyTableService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -22,18 +23,18 @@ class SupervisorController extends Controller
     /**
      * @throws Throwable
      */
-    public function index(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): JsonResponse
+    public function index(Request $request, SupervisorService $supervisorService): JsonResponse
     {
-        return response()->json($safetyAndPrivacyTableService->supervisorDataTable($request));
+        return response()->json($supervisorService->dataTable($request));
     }
 
     /**
      * @throws Throwable
      */
-    public function excelReport(Request $request, SafetyAndPrivacyTableService $safetyAndPrivacyTableService): BinaryFileResponse
+    public function excelReport(Request $request, SupervisorService $supervisorService): BinaryFileResponse
     {
         $name = 'گزارش از نگهداری حریم راه ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-        $data = $safetyAndPrivacyTableService->supervisorDataTable($request);
+        $data = $supervisorService->dataTable($request);
         return Excel::download(new SupervisorCartableReport($data['data']), $name);
     }
 
diff --git a/app/Models/Mission.php b/app/Models/Mission.php
index a2184352..28ba82eb 100644
--- a/app/Models/Mission.php
+++ b/app/Models/Mission.php
@@ -26,4 +26,24 @@ class Mission extends Model
     {
         return $this->morphedByMany(RoadObserved::class, 'missionable');
     }
+
+    public function machines(): MorphToMany
+    {
+        return $this->morphToMany(CMMSMachine::class,
+            'machinable',
+            'machinables',
+            'machinable_id',
+            'machine_id'
+        );
+    }
+
+    public function rahdaran(): MorphToMany
+    {
+        return $this->morphToMany(Rahdaran::class,
+            'rahdarable',
+            'rahdarables',
+            'rahdarable_id',
+            'rahdar_id',
+        );
+    }
 }
diff --git a/app/Services/Cartables/Mission/TransportationUnitService.php b/app/Services/Cartables/Mission/TransportationUnitService.php
new file mode 100644
index 00000000..03c4d203
--- /dev/null
+++ b/app/Services/Cartables/Mission/TransportationUnitService.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Services\Cartables\Mission;
+
+use App\Exceptions\ProhibitedAction;
+use App\Facades\DataTable\DataTableFacade;
+use App\Models\Mission;
+use Illuminate\Http\Request;
+
+class TransportationUnitService
+{
+    public function dataTable(Request $request)
+    {
+        $user = auth()->user();
+
+        $fields = [
+            'id','lat','lon', 'recognize_picture','action_picture','created_at','step', 'final_description',
+            'info_fa', 'activity_date_time', 'action_picture_document_upload_date', 'judiciary_document_upload_date',
+            'step_fa', 'axis_type_id', 'axis_type_name', 'action_date', 'is_finished', 'status_fa', 'supervisor_description', 'operator_description'
+        ];
+
+        throw_if(is_null($user->edarate_shahri_id), new ProhibitedAction('اداره ای برای شما در سامانه ثبت نشده است!'));
+
+        $query = Mission::query()->where('', '=', '');
+
+        return DataTableFacade::run(
+            $query,
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: $fields
+        );
+    }
+}
\ No newline at end of file
diff --git a/app/Services/Cartables/SafetyAndPrivacyTableService.php b/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php
similarity index 78%
rename from app/Services/Cartables/SafetyAndPrivacyTableService.php
rename to app/Services/Cartables/SafetyAndPrivacy/OperatorService.php
index b6331901..f41270fd 100644
--- a/app/Services/Cartables/SafetyAndPrivacyTableService.php
+++ b/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php
@@ -1,24 +1,15 @@
 <?php
 
-namespace App\Services\Cartables;
+namespace App\Services\Cartables\SafetyAndPrivacy;
 
 use App\Exceptions\ProhibitedAction;
 use App\Facades\DataTable\DataTableFacade;
-use App\Http\Traits\ApiResponse;
-use App\Models\Province;
 use App\Models\SafetyAndPrivacy;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Throwable;
 
-class SafetyAndPrivacyTableService
+class OperatorService
 {
-    use ApiResponse;
-
-    /**
-     * @throws Throwable
-     */
-    public function operatorDataTable(Request $request)
+    public function dataTable(Request $request)
     {
         $user = auth()->user();
 
@@ -41,37 +32,6 @@ class SafetyAndPrivacyTableService
         );
     }
 
-    /**
-     * @throws Throwable
-     */
-    public function supervisorDataTable(Request $request)
-    {
-        $user = auth()->user();
-
-        $fields = [
-            'id','lat','lon', 'recognize_picture','action_picture','created_at','status', 'final_description', 'province_fa',
-            'info_fa', 'activity_date_time', 'action_picture_document_upload_date', 'judiciary_document_upload_date', 'edare_shahri_name',
-            'step_fa', 'axis_type_id', 'axis_type_name', 'action_date', 'is_finished', 'status_fa', 'supervisor_description', 'operator_description'
-        ];
-
-        $query = SafetyAndPrivacy::query();
-
-        if ($user->hasPermissionTo('show-safety-and-privacy-operator-cartable-province'))
-        {
-            throw_if(is_null($user->province_id), new ProhibitedAction('استانی برای شما در سامانه ثبت نشده است!'));
-
-            $query = $query->where('province_id', '=', $user->province_id);
-        }
-
-        return DataTableFacade::run(
-            $query,
-            $request,
-            allowedFilters: ['*'],
-            allowedSortings: ['*'],
-            allowedSelects: $fields
-        );
-    }
-
     public function countryActivity(Request $request): array
     {
         $activities = [];
@@ -186,4 +146,4 @@ class SafetyAndPrivacyTableService
 
         return array_values($activities);
     }
-}
+}
\ No newline at end of file
diff --git a/app/Services/Cartables/SafetyAndPrivacy/SupervisorService.php b/app/Services/Cartables/SafetyAndPrivacy/SupervisorService.php
new file mode 100644
index 00000000..0579bc8b
--- /dev/null
+++ b/app/Services/Cartables/SafetyAndPrivacy/SupervisorService.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Services\Cartables\SafetyAndPrivacy;
+
+use App\Exceptions\ProhibitedAction;
+use App\Facades\DataTable\DataTableFacade;
+use App\Models\SafetyAndPrivacy;
+use Illuminate\Http\Request;
+
+class SupervisorService
+{
+    public function dataTable(Request $request)
+    {
+        $user = auth()->user();
+
+        $fields = [
+            'id','lat','lon', 'recognize_picture','action_picture','created_at','status', 'final_description', 'province_fa',
+            'info_fa', 'activity_date_time', 'action_picture_document_upload_date', 'judiciary_document_upload_date', 'edare_shahri_name',
+            'step_fa', 'axis_type_id', 'axis_type_name', 'action_date', 'is_finished', 'status_fa', 'supervisor_description', 'operator_description'
+        ];
+
+        $query = SafetyAndPrivacy::query();
+
+        if ($user->hasPermissionTo('show-safety-and-privacy-operator-cartable-province'))
+        {
+            throw_if(is_null($user->province_id), new ProhibitedAction('استانی برای شما در سامانه ثبت نشده است!'));
+
+            $query = $query->where('province_id', '=', $user->province_id);
+        }
+
+        return DataTableFacade::run(
+            $query,
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: $fields
+        );
+    }
+}
\ No newline at end of file
diff --git a/database/migrations/2025_05_17_103927_create_missions_table.php b/database/migrations/2025_05_17_103927_create_missions_table.php
index af2a3340..385e8a18 100644
--- a/database/migrations/2025_05_17_103927_create_missions_table.php
+++ b/database/migrations/2025_05_17_103927_create_missions_table.php
@@ -19,7 +19,7 @@ return new class extends Migration
             $table->foreignId('state_id')->constrained('mission_states');
             $table->string('state_name');
             $table->string('requested_machine_type');
-            $table->string('requested_machine_numbers');
+            $table->integer('requested_machine_numbers');
             $table->string('type');
             $table->dateTime('start_date');
             $table->dateTime('end_date');

From 367eb55db10fa50085d7d05df91d23f515fe6db8 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Mon, 19 May 2025 10:29:59 +0330
Subject: [PATCH 2/3] create mission state enum

---
 app/Enums/MissionStates.php                   | 28 ++++++++++++++++++
 .../Mission/TransportationUnitController.php  | 19 +++++++++---
 .../TransportaionUnit/AllocateRequest.php     | 29 +++++++++++++++++++
 .../Mission/TransportationUnitService.php     |  9 +++---
 ...025_05_17_103927_create_missions_table.php | 12 +++++---
 5 files changed, 84 insertions(+), 13 deletions(-)
 create mode 100644 app/Enums/MissionStates.php
 create mode 100644 app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php

diff --git a/app/Enums/MissionStates.php b/app/Enums/MissionStates.php
new file mode 100644
index 00000000..9a389cb4
--- /dev/null
+++ b/app/Enums/MissionStates.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Enums;
+
+enum MissionStates: int
+{
+    case REQUEST_CREATED= 1;
+    case PENDING_CONFIRMATION = 2;
+    case START_MISSION = 3;
+
+    case END_MISSION = 4;
+    case REJECT_BY_TRANSPORTATION = 5;
+    case REJECT_BY_CONTROL_UNIT = 6;
+
+    public static function name(int $state): string
+    {
+        $mapArray = [
+            1 => 'درخواست ایجاد شد و در حال بررسی در توسط واحد نقلیه است',
+            2 => 'خودرو اختصاص داده شد و درخواست توسط واحد کنترل در حال بررسی است',
+            3 => 'درخواست توسط واحد کنترل تایید شد و ماموریت آغاز می شود',
+            4 => 'اتمام ماموریت',
+            5 => 'عدم تخصیص خودرو توسط واحد نقلیه و بازگشت درخواست به کارتابل کاربر',
+            6 => 'عدم تایید توسط واحد کنترل',
+        ];
+
+        return $mapArray[$state];
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php b/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
index f735ab17..1262df58 100644
--- a/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\V3\Dashboard\Mission;
 
+use App\Enums\MissionStates;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\V3\Mission\TransportaionUnit\AllocateRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\Mission;
 use App\Services\Cartables\Mission\TransportationUnitService;
@@ -18,19 +20,28 @@ class TransportationUnitController extends Controller
         return response()->json($transportationUnitService->dataTable($request));
     }
 
-    public function allocate(Request $request, Mission $mission): JsonResponse
+    public function allocate(AllocateRequest $request, Mission $mission): JsonResponse
     {
         $mission->machines()->attach($request->machines);
 
+        $state = MissionStates::PENDING_CONFIRMATION->value;
         $mission->update([
-           'state' => ''
+           'state_id' => $state,
+           'state_name' => MissionStates::name($state),
         ]);
 
         return $this->successResponse();
     }
 
-    public function deallocate()
+    public function deallocate(Mission $mission): JsonResponse
     {
-        
+        $state = MissionStates::REJECT_BY_TRANSPORTATION->value;
+
+        $mission->update([
+            'state_id' => $state,
+            'state_name' => MissionStates::name($state),
+        ]);
+
+        return $this->successResponse();
     }
 }
diff --git a/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php b/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php
new file mode 100644
index 00000000..bac0e6bd
--- /dev/null
+++ b/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests\V3\Mission\TransportaionUnit;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class AllocateRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'machines' => 'required|array',
+            'machines.*' => 'required|integer|exists:cmms_machines,id',
+        ];
+    }
+}
diff --git a/app/Services/Cartables/Mission/TransportationUnitService.php b/app/Services/Cartables/Mission/TransportationUnitService.php
index 03c4d203..0f9a56a3 100644
--- a/app/Services/Cartables/Mission/TransportationUnitService.php
+++ b/app/Services/Cartables/Mission/TransportationUnitService.php
@@ -2,6 +2,7 @@
 
 namespace App\Services\Cartables\Mission;
 
+use App\Enums\MissionStates;
 use App\Exceptions\ProhibitedAction;
 use App\Facades\DataTable\DataTableFacade;
 use App\Models\Mission;
@@ -14,14 +15,12 @@ class TransportationUnitService
         $user = auth()->user();
 
         $fields = [
-            'id','lat','lon', 'recognize_picture','action_picture','created_at','step', 'final_description',
-            'info_fa', 'activity_date_time', 'action_picture_document_upload_date', 'judiciary_document_upload_date',
-            'step_fa', 'axis_type_id', 'axis_type_name', 'action_date', 'is_finished', 'status_fa', 'supervisor_description', 'operator_description'
+            'id', '', '', '', ''
         ];
 
-        throw_if(is_null($user->edarate_shahri_id), new ProhibitedAction('اداره ای برای شما در سامانه ثبت نشده است!'));
+//        throw_if(is_null($user->edarate_shahri_id), new ProhibitedAction('اداره ای برای شما در سامانه ثبت نشده است!'));
 
-        $query = Mission::query()->where('', '=', '');
+        $query = Mission::query()->where('state_id', '=', MissionStates::REQUEST_CREATED->value);
 
         return DataTableFacade::run(
             $query,
diff --git a/database/migrations/2025_05_17_103927_create_missions_table.php b/database/migrations/2025_05_17_103927_create_missions_table.php
index 385e8a18..adbad8a6 100644
--- a/database/migrations/2025_05_17_103927_create_missions_table.php
+++ b/database/migrations/2025_05_17_103927_create_missions_table.php
@@ -13,11 +13,15 @@ return new class extends Migration
     {
         Schema::create('missions', function (Blueprint $table) {
             $table->id();
-            $table->foreignId('user_id')->constrained('users');
-            $table->foreignId('machine_id')->nullable()->constrained('cmms_machines');
-            $table->foreignId('rahdar_id')->constrained('rahdaran');
-            $table->foreignId('state_id')->constrained('mission_states');
+            $table->foreignId('user_id')->constrained('users')->cascadeOnDelete();
+            $table->foreignId('machine_id')->nullable()->constrained('cmms_machines')->noActionOnDelete();
+            $table->foreignId('rahdar_id')->constrained('rahdaran')->noActionOnDelete();
+            $table->foreignId('state_id')->constrained('mission_states')->noActionOnDelete();
             $table->string('state_name');
+            $table->foreignId('province_id')->constrained('provinces')->noActionOnDelete();
+            $table->string('province_name');
+            $table->foreignId('edare_shahri_id')->constrained('edarate_shahri')->noActionOnDelete();
+            $table->string('edare_shahri_name');
             $table->string('requested_machine_type');
             $table->integer('requested_machine_numbers');
             $table->string('type');

From 4ff296e476a4a6b6036c78b09c282a753c1c789f Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Mon, 19 May 2025 14:40:02 +0330
Subject: [PATCH 3/3] create show access middleware

---
 app/Enums/MissionStates.php                   |  3 +-
 app/Http/Middleware/ValidateShowAccess.php    | 32 +++++++++++++++++++
 .../Mission/TransportationUnitService.php     | 14 ++++----
 ...025_05_17_103927_create_missions_table.php |  5 +--
 4 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 app/Http/Middleware/ValidateShowAccess.php

diff --git a/app/Enums/MissionStates.php b/app/Enums/MissionStates.php
index 9a389cb4..5be6b18a 100644
--- a/app/Enums/MissionStates.php
+++ b/app/Enums/MissionStates.php
@@ -7,10 +7,10 @@ enum MissionStates: int
     case REQUEST_CREATED= 1;
     case PENDING_CONFIRMATION = 2;
     case START_MISSION = 3;
-
     case END_MISSION = 4;
     case REJECT_BY_TRANSPORTATION = 5;
     case REJECT_BY_CONTROL_UNIT = 6;
+    case CANCELLED = 7;
 
     public static function name(int $state): string
     {
@@ -21,6 +21,7 @@ enum MissionStates: int
             4 => 'اتمام ماموریت',
             5 => 'عدم تخصیص خودرو توسط واحد نقلیه و بازگشت درخواست به کارتابل کاربر',
             6 => 'عدم تایید توسط واحد کنترل',
+            7 => 'ماموریت لغو شد',
         ];
 
         return $mapArray[$state];
diff --git a/app/Http/Middleware/ValidateShowAccess.php b/app/Http/Middleware/ValidateShowAccess.php
new file mode 100644
index 00000000..e0868ca6
--- /dev/null
+++ b/app/Http/Middleware/ValidateShowAccess.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Exceptions\ProhibitedAction;
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Symfony\Component\HttpFoundation\Response;
+use Throwable;
+
+class ValidateShowAccess
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param Closure(Request): (Response) $next
+     * @throws Throwable
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        $user = Auth::user();
+
+        throw_if (is_null($user->province_id),
+            new ProhibitedAction('استانی برای شما در سامانه ثبت نشده است!'));
+
+        throw_if(is_null($user->edarate_shahri_id),
+            new ProhibitedAction('اداره شهری برای شما در سامانه ثبت نشده است!'));
+
+        return $next($request);
+    }
+}
diff --git a/app/Services/Cartables/Mission/TransportationUnitService.php b/app/Services/Cartables/Mission/TransportationUnitService.php
index 0f9a56a3..d4535cad 100644
--- a/app/Services/Cartables/Mission/TransportationUnitService.php
+++ b/app/Services/Cartables/Mission/TransportationUnitService.php
@@ -3,24 +3,24 @@
 namespace App\Services\Cartables\Mission;
 
 use App\Enums\MissionStates;
-use App\Exceptions\ProhibitedAction;
 use App\Facades\DataTable\DataTableFacade;
 use App\Models\Mission;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class TransportationUnitService
 {
     public function dataTable(Request $request)
     {
-        $user = auth()->user();
-
         $fields = [
-            'id', '', '', '', ''
+            'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
+            'description', 'requested_machine_type', 'requested_machine_numbers', 'type',
+            'start_date', 'end_date', 'request_date', 'start_point', 'end_point',
         ];
 
-//        throw_if(is_null($user->edarate_shahri_id), new ProhibitedAction('اداره ای برای شما در سامانه ثبت نشده است!'));
-
-        $query = Mission::query()->where('state_id', '=', MissionStates::REQUEST_CREATED->value);
+        $query = Mission::query()
+            ->where('state_id', '=', MissionStates::REQUEST_CREATED->value)
+            ->where('edare_shahri_name', '=', Auth::user()->edarate_shahri_id);
 
         return DataTableFacade::run(
             $query,
diff --git a/database/migrations/2025_05_17_103927_create_missions_table.php b/database/migrations/2025_05_17_103927_create_missions_table.php
index adbad8a6..3d68f8dc 100644
--- a/database/migrations/2025_05_17_103927_create_missions_table.php
+++ b/database/migrations/2025_05_17_103927_create_missions_table.php
@@ -14,13 +14,14 @@ return new class extends Migration
         Schema::create('missions', function (Blueprint $table) {
             $table->id();
             $table->foreignId('user_id')->constrained('users')->cascadeOnDelete();
+            $table->string('username');
             $table->foreignId('machine_id')->nullable()->constrained('cmms_machines')->noActionOnDelete();
             $table->foreignId('rahdar_id')->constrained('rahdaran')->noActionOnDelete();
             $table->foreignId('state_id')->constrained('mission_states')->noActionOnDelete();
             $table->string('state_name');
-            $table->foreignId('province_id')->constrained('provinces')->noActionOnDelete();
+            $table->foreignId('province_id')->nullable()->constrained('provinces')->noActionOnDelete();
             $table->string('province_name');
-            $table->foreignId('edare_shahri_id')->constrained('edarate_shahri')->noActionOnDelete();
+            $table->foreignId('edare_shahri_id')->nullable()->constrained('edarate_shahri')->noActionOnDelete();
             $table->string('edare_shahri_name');
             $table->string('requested_machine_type');
             $table->integer('requested_machine_numbers');