Merge pull request #119 from witelgroup/feature/bugFix

change relation

app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php

@@ -226,6 +226,6 @@ class RoadMaintenanceStationController extends Controller
 
     public function giveListToFms(): JsonResponse
     {
-        return $this->successResponse(RahdariPoint::all(['id', 'name', 'lat', 'lng', 'area']));
+        return $this->successResponse(RahdariPoint::all(['id', 'province_id', 'province_name', 'city_id', 'city_name', 'name', 'lat', 'lng', 'area']));
     }
 }

app/Models/MissionViolation.php

@@ -17,8 +17,8 @@ class MissionViolation extends Model
         return $this->belongsTo(Mission::class);
     }
 
-    public function machine(): HasOne
+    public function machine(): BelongsTo
     {
-        return $this->hasOne(CMMSMachine::class);
+        return $this->belongsTo(CMMSMachine::class, 'machine_id');
     }
 }

app/Services/CMMS/DailyMovingMachinesService.php

@@ -46,6 +46,7 @@ class DailyMovingMachinesService
         $inputData = $this->makeInputParameters();
 
         return Http::withBody($inputData)
+            ->timeout(120)
             ->throw()
             ->withoutVerifying()
             ->post($this->url)

app/Services/Cartables/Mission/DailyMoveMachineService.php

@@ -30,7 +30,6 @@ class DailyMoveMachineService
             $request,
             allowedFilters: ['*'],
             allowedSortings: ['*'],
-            allowedSelects: ['id', 'mission_id', 'machine_code', 'request_date', 'type', 'exit_time', 'enter_time', 'status']
         );
     }
 }