From 0befa33b0f27afa0f8dded0d903dc8ab5b304fd9 Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Mon, 22 Jun 2026 15:30:35 +0330 Subject: [PATCH] add validation --- .../V3/Mission/ControlUnit/FinishRequest.php | 2 +- .../RequestPortal/ClarifyUnauthorizedExitRequest.php | 2 +- .../Mission/RequestPortal/ContinueMissionRequest.php | 4 ++-- .../V3/Mission/RequestPortal/StoreRequest.php | 2 +- .../V3/Mission/RequestPortal/UpdateRequest.php | 2 +- .../Requests/V3/Mission/Violation/UpdateRequest.php | 2 +- .../Mission/Report/ReportMachineService.php | 12 ++++++------ .../Cartables/Mission/RequestPortalService.php | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php b/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php index b62c5124..87c55735 100644 --- a/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php +++ b/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php @@ -41,7 +41,7 @@ class FinishRequest extends FormRequest 'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.' ); } - if ($this->end_km < $mission->km) { + if ($this->end_km <= $mission->km) { $validator->errors()->add( 'end_km', 'کیلومتر پایان باید بزرگتر از کیلومتر شروع باشد.' diff --git a/app/Http/Requests/V3/Mission/RequestPortal/ClarifyUnauthorizedExitRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/ClarifyUnauthorizedExitRequest.php index 54eeb4f6..9391e83e 100644 --- a/app/Http/Requests/V3/Mission/RequestPortal/ClarifyUnauthorizedExitRequest.php +++ b/app/Http/Requests/V3/Mission/RequestPortal/ClarifyUnauthorizedExitRequest.php @@ -26,7 +26,7 @@ class ClarifyUnauthorizedExitRequest extends FormRequest { return [ 'item_id' => 'required|exists:info_items,item', - 'sub_item_id' => 'required|exists:info_items,sub_item', + 'sub_item_id' => 'required|exists:info_items,id', 'rahdaran' => 'array', 'rahdaran.*' => 'exists:rahdaran,id', 'driver' => 'required|integer|exists:rahdaran,id', diff --git a/app/Http/Requests/V3/Mission/RequestPortal/ContinueMissionRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/ContinueMissionRequest.php index 8b75bd61..0507f840 100644 --- a/app/Http/Requests/V3/Mission/RequestPortal/ContinueMissionRequest.php +++ b/app/Http/Requests/V3/Mission/RequestPortal/ContinueMissionRequest.php @@ -27,7 +27,7 @@ class ContinueMissionRequest extends FormRequest { return [ 'item_id' => 'required|exists:info_items,item', - 'sub_item_id' => 'required|exists:info_items,sub_item', + 'sub_item_id' => 'required|exists:info_items,id', 'rahdaran' => 'array', 'rahdaran.*' => 'exists:rahdaran,id', 'machine_id' => 'required|integer|exists:cmms_machines,id', @@ -58,7 +58,7 @@ class ContinueMissionRequest extends FormRequest ); } } - if ($this->end_km < $this->mission->km) { + if ($this->end_km <= $this->mission->km) { $validator->errors()->add( 'end_km', 'کیلومتر پایان باید بزرگتر از کیلومتر شروع باشد.' diff --git a/app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php index 7f586a8f..72fe6ec1 100644 --- a/app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php +++ b/app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php @@ -26,7 +26,7 @@ class StoreRequest extends FormRequest { return [ 'item_id' => 'required|exists:info_items,item', - 'sub_item_id' => 'required|exists:info_items,sub_item', + 'sub_item_id' => 'required|exists:info_items,id', 'rahdaran' => 'array', 'rahdaran.*' => 'exists:rahdaran,id', 'requested_machines' => 'required|array', diff --git a/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php index 04e38858..020cf459 100644 --- a/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php +++ b/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php @@ -27,7 +27,7 @@ class UpdateRequest extends FormRequest { return [ 'item_id' => 'required|exists:info_items,item', - 'sub_item_id' => 'required|exists:info_items,sub_item', + 'sub_item_id' => 'required|exists:info_items,id', 'rahdaran' => 'array', 'rahdaran.*' => 'exists:rahdaran,id', 'requested_machines' => 'required|array', diff --git a/app/Http/Requests/V3/Mission/Violation/UpdateRequest.php b/app/Http/Requests/V3/Mission/Violation/UpdateRequest.php index 561e2188..e2d5294e 100644 --- a/app/Http/Requests/V3/Mission/Violation/UpdateRequest.php +++ b/app/Http/Requests/V3/Mission/Violation/UpdateRequest.php @@ -41,7 +41,7 @@ class UpdateRequest extends FormRequest 'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.' ); } - if ($this->end_km < $this->violation->km) { + if ($this->end_km <= $this->violation->km) { $validator->errors()->add( 'end_km', 'کیلومتر پایان باید بزرگتر از کیلومتر شروع باشد.' diff --git a/app/Services/Cartables/Mission/Report/ReportMachineService.php b/app/Services/Cartables/Mission/Report/ReportMachineService.php index 38bb4996..215c253c 100644 --- a/app/Services/Cartables/Mission/Report/ReportMachineService.php +++ b/app/Services/Cartables/Mission/Report/ReportMachineService.php @@ -24,7 +24,7 @@ class ReportMachineService FROM missions m JOIN cmms_machines cm ON cm.id = m.machine_id WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to - GROUP BY machine_id;"; + GROUP BY machine_id ORDER BY missions DESC;"; return DB::select($sql, [ 'from' => $from, @@ -42,7 +42,7 @@ class ReportMachineService FROM missions m JOIN cmms_machines cm ON cm.id = m.machine_id WHERE m.state_id = 4 AND start_time >= :from AND finish_time <= :to AND m.province_id = :province_id - GROUP BY machine_id;"; + GROUP BY machine_id ORDER BY missions DESC;"; return DB::select($sql, [ 'from' => $from, @@ -63,7 +63,7 @@ class ReportMachineService FROM missions m JOIN cmms_machines cm ON cm.id = m.machine_id WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to - GROUP BY cm.car_type;"; + GROUP BY cm.car_type ORDER BY missions DESC;"; return DB::select($sql, [ 'from' => $from, @@ -84,7 +84,7 @@ class ReportMachineService FROM missions m JOIN cmms_machines cm ON cm.id = m.machine_id WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND m.province_id = :province_id - GROUP BY cm.car_type;"; + GROUP BY cm.car_type ORDER BY missions DESC;"; return DB::select($sql, [ 'from' => $from, @@ -105,7 +105,7 @@ class ReportMachineService SUM(m.end_km - m.km) AS func FROM missions m WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to - GROUP BY m.driver_id;"; + GROUP BY m.driver_id ORDER BY missions DESC;"; return DB::select($sql, [ 'from' => $from, @@ -126,7 +126,7 @@ class ReportMachineService SUM(m.end_km - m.km) AS func FROM missions m WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND province_id = :province_id - GROUP BY m.driver_id;"; + GROUP BY m.driver_id ORDER BY missions DESC;"; return DB::select($sql, [ 'from' => $from, diff --git a/app/Services/Cartables/Mission/RequestPortalService.php b/app/Services/Cartables/Mission/RequestPortalService.php index 2c17793c..443508fc 100644 --- a/app/Services/Cartables/Mission/RequestPortalService.php +++ b/app/Services/Cartables/Mission/RequestPortalService.php @@ -34,7 +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' + 'driver_id', 'driver_name', 'machine_id', 'item_id', 'sub_item_id' ] ); } -- 2.49.1