From ef8fa4b5c24d6bb58a6cc5ef4f49ee9aa2546ff6 Mon Sep 17 00:00:00 2001 From: joddyabott Date: Mon, 25 Aug 2025 15:40:30 +0330 Subject: [PATCH 1/2] fix code --- .../Mission/ControlUnit/NoProcessRequest.php | 21 ++++++------------- .../Mission/SendDataToFMSListener.php | 6 ++++-- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/app/Http/Requests/V3/Mission/ControlUnit/NoProcessRequest.php b/app/Http/Requests/V3/Mission/ControlUnit/NoProcessRequest.php index bbcf30b9..db8fe205 100644 --- a/app/Http/Requests/V3/Mission/ControlUnit/NoProcessRequest.php +++ b/app/Http/Requests/V3/Mission/ControlUnit/NoProcessRequest.php @@ -33,8 +33,8 @@ class NoProcessRequest extends FormRequest 'driver' => 'required|integer|exists:rahdaran,id', 'zone' => 'required|in:1,2,3', 'start_date' => 'required|date', - 'end_date' => 'required|date', - 'end_point' => 'required|string', + 'end_date' => 'required|date|before:now', + 'end_point' => 'required|string|after:start_date, before:now', 'area' => 'required|array', 'area.type' => 'required|string', 'area.coordinates' => 'required|array', @@ -42,21 +42,12 @@ class NoProcessRequest extends FormRequest ]; } - public function after(): array + public function messages(): array { return [ - function (Validator $validator) { - $start = Carbon::parse($this->start_date); - $end = Carbon::parse($this->end_date); - $now = Carbon::now(); - - if ($end->diffInMinutes($now) > 0 || $start->diffInMinutes($now) > 0) { - $validator->errors()->add( - 'end_date', - 'امکان ثبت ماموریت بدون فرایند با توجه به زمان انتخابی مقدور نمی باشد.' - ); - } - } + 'start_date.before' => 'امکان ثبت ماموریت بدون فرایند با توجه به زمان انتخابی مقدور نمی‌باشد.', + 'end_date.before' => 'امکان ثبت ماموریت بدون فرایند با توجه به زمان انتخابی مقدور نمی‌باشد.', + 'end_date.after' => 'امکان ثبت ماموریت بدون فرایند با توجه به زمان انتخابی مقدور نمی‌باشد.', ]; } } diff --git a/app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php b/app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php index 26c98a2c..cab14dbe 100644 --- a/app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php +++ b/app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php @@ -10,6 +10,8 @@ use Illuminate\Http\Client\RequestException; class SendDataToFMSListener implements ShouldQueue { + public function __construct(public GetErrorRateService $getErrorRateService) {} + /** * The name of the queue the job should be sent to. * @@ -21,8 +23,8 @@ class SendDataToFMSListener implements ShouldQueue * @throws RequestException * @throws Exception */ - public function handle(SendDataToFMSEvent $event, GetErrorRateService $getErrorRateService): void + public function handle(SendDataToFMSEvent $event,): void { - $getErrorRateService->run($event->mission); + $this->getErrorRateService->run($event->mission); } } From 143d57174b242cecba8590e853cba50c56453111 Mon Sep 17 00:00:00 2001 From: joddyabott Date: Mon, 25 Aug 2025 15:48:45 +0330 Subject: [PATCH 2/2] fix code --- .../Requests/V3/Mission/ControlUnit/NoProcessRequest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Requests/V3/Mission/ControlUnit/NoProcessRequest.php b/app/Http/Requests/V3/Mission/ControlUnit/NoProcessRequest.php index db8fe205..11d38716 100644 --- a/app/Http/Requests/V3/Mission/ControlUnit/NoProcessRequest.php +++ b/app/Http/Requests/V3/Mission/ControlUnit/NoProcessRequest.php @@ -32,9 +32,9 @@ class NoProcessRequest extends FormRequest 'machines.*' => 'required|integer|exists:cmms_machines,id', 'driver' => 'required|integer|exists:rahdaran,id', 'zone' => 'required|in:1,2,3', - 'start_date' => 'required|date', - 'end_date' => 'required|date|before:now', - 'end_point' => 'required|string|after:start_date, before:now', + 'start_date' => 'required|date|before:now', + 'end_date' => 'required|date|after:start_date|before:now', + 'end_point' => 'required|string', 'area' => 'required|array', 'area.type' => 'required|string', 'area.coordinates' => 'required|array',