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);
     }
 }