From 1473ab22642b8d5db74b1d80864c379a77bdd4aa Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Mon, 29 Sep 2025 11:44:42 +0330
Subject: [PATCH] add columns to cartable

# Conflicts:
#	app/Http/Controllers/V3/RahdaranController.php
---
 app/Http/Controllers/V3/RahdaranController.php            | 2 ++
 .../V3/Mission/TransportaionUnit/AllocateRequest.php      | 3 ++-
 app/Http/Requests/V3/Rahdaran/StoreRequest.php            | 1 +
 app/Http/Requests/V3/Rahdaran/UpdateRequest.php           | 1 +
 .../Cartables/Mission/TransportationUnitService.php       | 2 +-
 .../2025_09_27_094044_add_column_to_rahdaran_table.php    | 8 ++++----
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/V3/RahdaranController.php b/app/Http/Controllers/V3/RahdaranController.php
index 47c8383e..412b7ac3 100644
--- a/app/Http/Controllers/V3/RahdaranController.php
+++ b/app/Http/Controllers/V3/RahdaranController.php
@@ -50,6 +50,7 @@ class RahdaranController extends Controller
             'province_name' => $province->name_fa,
             'edareh_shahri_id' => $request->edareh_shahri_id,
             'edareh_shahri_name' => $edareh->name_fa,
+            'is_driver' => $request->is_driver,
         ]);
 
         return $this->successResponse();
@@ -73,6 +74,7 @@ class RahdaranController extends Controller
             'province_name' => $province->name_fa,
             'edareh_shahri_id' => $request->edareh_shahri_id,
             'edareh_shahri_name' => $edareh->name_fa,
+            'is_driver' => $request->is_driver,
         ]);
 
         return $this->successResponse();
diff --git a/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php b/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php
index 4c744cba..249d5c36 100644
--- a/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php
+++ b/app/Http/Requests/V3/Mission/TransportaionUnit/AllocateRequest.php
@@ -25,7 +25,8 @@ class AllocateRequest extends FormRequest
         return [
             'machines' => 'required|array',
             'machines.*' => 'required|integer|exists:cmms_machines,id',
-            'driver' => 'required|integer|exists:rahdaran,id'
+            'driver' => 'required|integer|exists:rahdaran,id',
+            'km' => 'required',
         ];
     }
 }
diff --git a/app/Http/Requests/V3/Rahdaran/StoreRequest.php b/app/Http/Requests/V3/Rahdaran/StoreRequest.php
index 8d946ba4..ae925bdf 100644
--- a/app/Http/Requests/V3/Rahdaran/StoreRequest.php
+++ b/app/Http/Requests/V3/Rahdaran/StoreRequest.php
@@ -28,6 +28,7 @@ class StoreRequest extends FormRequest
             'mobile' => 'required|digits:11|regex:/^09\d{9}$/',
             'province_id' => 'required|exists:provinces,id',
             'edareh_shahri_id' => 'required|exists:edarate_shahri,id',
+            'is_driver' => 'required|boolean',
         ];
     }
 }
diff --git a/app/Http/Requests/V3/Rahdaran/UpdateRequest.php b/app/Http/Requests/V3/Rahdaran/UpdateRequest.php
index 0f19e72a..20efef51 100644
--- a/app/Http/Requests/V3/Rahdaran/UpdateRequest.php
+++ b/app/Http/Requests/V3/Rahdaran/UpdateRequest.php
@@ -29,6 +29,7 @@ class UpdateRequest extends FormRequest
             'mobile' => 'required|digits:11|regex:/^09\d{9}$/',
             'province_id' => 'required|exists:provinces,id',
             'edareh_shahri_id' => 'required|exists:edarate_shahri,id',
+            'is_driver' => 'required|boolean',
         ];
     }
 }
diff --git a/app/Services/Cartables/Mission/TransportationUnitService.php b/app/Services/Cartables/Mission/TransportationUnitService.php
index 7c5cc186..e0dd71b4 100644
--- a/app/Services/Cartables/Mission/TransportationUnitService.php
+++ b/app/Services/Cartables/Mission/TransportationUnitService.php
@@ -25,7 +25,7 @@ class TransportationUnitService
                 'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
                 'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
                 'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa', 'start_time', 'finish_time',
-                'code', 'category_id', 'category_name', 'explanation'
+                'code', 'category_id', 'category_name', 'explanation', 'km'
             ]
         );
     }
diff --git a/database/migrations/2025_09_27_094044_add_column_to_rahdaran_table.php b/database/migrations/2025_09_27_094044_add_column_to_rahdaran_table.php
index b4ce92f6..b954f770 100644
--- a/database/migrations/2025_09_27_094044_add_column_to_rahdaran_table.php
+++ b/database/migrations/2025_09_27_094044_add_column_to_rahdaran_table.php
@@ -12,10 +12,10 @@ return new class extends Migration
     public function up(): void
     {
         Schema::table('rahdaran', function (Blueprint $table) {
-            $table->unsignedTinyInteger('province_id');
+            $table->unsignedTinyInteger('province_id')->nullable();
             $table->foreign('province_id')->references('id')->on('provinces');
-            $table->string('province_name');
-            $table->unsignedBigInteger('edareh_shahri_id');
+            $table->string('province_name')->nullable();
+            $table->unsignedBigInteger('edareh_shahri_id')->nullable();
             $table->foreign('edareh_shahri_id')->references('id')->on('edarate_shahri');
             $table->boolean('is_driver')->default(false);
         });
@@ -29,7 +29,7 @@ return new class extends Migration
         Schema::table('rahdaran', function (Blueprint $table) {
             $table->dropForeign('province_id');
             $table->dropForeign('edareh_shahri_id');
-            $table->dropColumn(['province_id', 'province_name']);
+            $table->dropColumn(['province_id', 'province_name', 'edareh_shahri_id', 'is_driver']);
         });
     }
 };