change command signature

Reviewed-on: #18

app/Console/Commands/EncodePolyLineCommand.php

@@ -13,7 +13,7 @@ class EncodePolyLineCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'app:encode-poly-line-command';
+    protected $signature = 'polyline:encode';
 
     /**
      * The console command description.
@@ -28,7 +28,8 @@ class EncodePolyLineCommand extends Command
     public function handle(PolylineEncoder $polylineEncoder): void
     {
         Mission::query()->whereNotNull('area')->each(function ($mission)  use ($polylineEncoder) {
-            $encodedValue = $polylineEncoder->encodePolyLine($mission, lng_lat_format:true);
+            $area = json_decode($mission->area, true);
+            $encodedValue = $polylineEncoder->encodePolyLine($area['coordinates'], lng_lat_format:true);
             $mission->update([
                 'encoded_route' => $encodedValue,
             ]);

app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php

@@ -109,7 +109,7 @@ class ReportMachineController extends Controller
             allowedSortings: ['*'],
             allowedSelects: [
                 'id', 'province_id', 'province_name', 'city_id', 'city_name',
-                'end_km', 'km', 'driver_name', 'state_name', 'station_name'
+                'end_km', 'km', 'driver_name', 'state_id', 'station_name'
             ]
         );
     }
@@ -125,4 +125,26 @@ class ReportMachineController extends Controller
 
         return Excel::download(new machineReport($data), $name);
     }
+
+    public function countryMachineDriversActivity(Request $request, ReportMachineService $reportMachineService)
+    {
+        return $this->successResponse([
+            'activities' => $reportMachineService->countryMachineDriversActivity($request),
+//            'provinces' => Province::all(['id', 'name_fa']),
+        ]);
+    }
+
+    public function provinceMachineDriversActivity(Request $request, ReportMachineService $reportMachineService)
+    {
+        return $this->successResponse([
+            'activities' => $reportMachineService->provinceMachineDriversActivity($request),
+//            'city' => City::query()
+//                ->where('province_id', $request->province_id)
+//                ->where(function ($query) {
+//                    $query->where('type_id', 1)
+//                        ->orWhereIn('name_fa', ['اداره ماشين‌آلات', 'اداره نقلیه']);
+//                })
+//                ->get(['id', 'name_fa'])
+        ]);
+    }
 }

app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php

@@ -236,8 +236,8 @@ class RequestPortalController extends Controller
     {
         DB::transaction(function () use ($request, $violation) {
 
-            $start = Carbon::parse($violation->exit_station);
-            $end = Carbon::parse($violation->enter_station);
+            $start = Carbon::parse($violation->exit_time);
+            $end = Carbon::parse($violation->enter_time);
             $type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
             $user = auth()->user();
             $zone = $request->zone;
@@ -257,14 +257,14 @@ class RequestPortalController extends Controller
                 'encoded_route' => $request->encoded_route,
                 'type' => $type,
                 'type_fa' => MissionTypes::name($type),
-                'start_date' => $violation->exit_station,
-                'end_date' => $violation->enter_station,
+                'start_date' => $violation->exit_time,
+                'end_date' => $violation->enter_time,
                 'end_point' => $request->end_point,
                 'category_id' => $request->category_id,
                 'category_name' => MissionCategory::name($request->category_id),
-                'start_time' => $violation->exit_station,
-                'finish_time' => $violation->enter_station,
-                'mission_duration' => strtotime($violation->enter_station) - strtotime($violation->exit_station),
+                'start_time' => $violation->exit_time,
+                'finish_time' => $violation->enter_time,
+                'mission_duration' => strtotime($violation->enter_time) - strtotime($violation->exit_time),
                 'state_id' => MissionStates::END_MISSION->value,
                 'state_name' => MissionStates::END_MISSION->label(),
                 'explanation' => $request->explanation,

app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php

@@ -54,7 +54,7 @@ class ViolationManagementController extends Controller
             'city_name' => $user->city_fa,
             'station_id' => $user->station_id,
             'station_name' => RahdariPoint::query()->find($user->station_id)->name,
-            'exit_station' => $request->exit_station,
+            'exit_time' => $request->exit_time,
         ]);
 
         return $this->successResponse();
@@ -68,7 +68,7 @@ class ViolationManagementController extends Controller
     public function update(UpdateRequest $request, MissionViolation $violation): JsonResponse
     {
         $violation->update([
-            'enter_station' => $request->enter_station,
+            'enter_time' => $request->enter_time,
             'status' => MissionViolationStatus::BEDON_EGHDAM->value,
         ]);
 

app/Http/Requests/V3/Mission/Violation/StoreRequest.php

@@ -25,7 +25,7 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'exit_station' => 'required|date',
+            'exit_time' => 'required|date',
             'machine_code' => 'required',
             'km'=> 'string',
         ];

app/Http/Requests/V3/Mission/Violation/UpdateRequest.php

@@ -26,7 +26,21 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'enter_station' => 'required|date',
+            'enter_time' => 'required|date',
+        ];
+    }
+
+    public function after(): array
+    {
+        return [
+            function (Validator $validator) {
+                if (strtotime($this->enter_time) < strtotime($this->violation->exit_time)) {
+                    $validator->errors()->add(
+                        'time',
+                        'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
+                    );
+                }
+            }
         ];
     }
 }

app/Services/Cartables/Mission/RequestPortalService.php

@@ -34,6 +34,7 @@ class RequestPortalService
                 'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
                 'end_date', 'request_date', 'end_point', 'encoded_route', 'zone', 'zone_fa', 'start_time', 'finish_time',
                 'code', 'category_id', 'category_name', 'explanation', 'city_id', 'city_name', 'province_id', 'station_name',
+                'driver_id', 'driver_name'
             ]
         );
     }

database/migrations/2026_06_10_144529_add_column_to_mission_violations_table.php

@@ -12,8 +12,6 @@ return new class extends Migration
     public function up(): void
     {
         Schema::table('mission_violations', function (Blueprint $table) {
-            $table->dateTime('exit_station')->nullable();
-            $table->dateTime('enter_station')->nullable();
             $table->unsignedInteger('station_id')->nullable();
             $table->string('station_name')->nullable();
         });
@@ -25,7 +23,7 @@ return new class extends Migration
     public function down(): void
     {
         Schema::table('mission_violations', function (Blueprint $table) {
-            $table->dropColumn(['exit_station', 'enter_station']);
+            $table->dropColumn(['station_id', 'station_name']);
         });
     }
 };

routes/v3.php

@@ -573,6 +573,8 @@ Route::prefix('missions')
                 Route::get('/country_machine_types_activity', 'countryMachineTypesActivity')->name('countryMachineTypesActivity');
                 Route::get('/province_machine_types_activity', 'provinceMachineTypesActivity')->name('provinceMachineTypesActivity');
                 Route::get('/machine_details_report', 'machineDetailsReport')->name('machineDetailsReport');
+                Route::get('/country_machine_drivers_activity', 'countryMachineDriversActivity')->name('countryMachineDriversActivity');
+                Route::get('/province_machine_drivers_activity', 'provinceMachineDriversActivity')->name('provinceMachineDriversActivity');
             });
     });