diff --git a/app/Console/Commands/DailyMovingMachineCommand.php b/app/Console/Commands/DailyMovingMachineCommand.php index 96bdf9d6..0b0bacbe 100644 --- a/app/Console/Commands/DailyMovingMachineCommand.php +++ b/app/Console/Commands/DailyMovingMachineCommand.php @@ -32,12 +32,11 @@ class DailyMovingMachineCommand extends Command public function handle(DailyMovingMachinesService $dailyMovingMachines): void { $vehiclesInfo = $dailyMovingMachines->run(); - $response =$vehiclesInfo->get('vehiclesInfo', collect()); + $response = collect($vehiclesInfo['vehiclesInfo']); $date = now()->toDateString(); - $cmms = $response - ->pluck('machineCode'); + $cmms = $response->pluck('machineCode'); $mission = Mission::query() ->whereDate('start_time',$date) @@ -60,12 +59,13 @@ class DailyMovingMachineCommand extends Command } foreach ($missionOnly as $code) { - $missionRecord = Mission::query()->where('machine_code', $code) + $missionId = Mission::query()->where('machine_code', $code) ->whereDate('start_time', today()) - ->get(); + ->value('id'); + AssignmentFails::query()->create([ 'machine_code' => $code, - 'mission_id' => $missionRecord->id, + 'mission_id' => $missionId, 'type' => ActivityMachineType::ADAM_TAHAROK->label(), 'request_date' => $date, ]); diff --git a/app/Http/Controllers/V3/Dashboard/Mission/DetailController.php b/app/Http/Controllers/V3/Dashboard/Mission/DetailController.php index 1c361ff1..4a99af4f 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/DetailController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/DetailController.php @@ -15,7 +15,7 @@ class DetailController extends Controller public function machines(Mission $mission): JsonResponse { - return $this->successResponse($mission->machines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number'])); + return $this->successResponse($mission->machine()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number'])); } public function rahdaran(Mission $mission): JsonResponse diff --git a/app/Services/CMMS/DailyMovingMachinesService.php b/app/Services/CMMS/DailyMovingMachinesService.php index 6383eb10..1facb4e8 100644 --- a/app/Services/CMMS/DailyMovingMachinesService.php +++ b/app/Services/CMMS/DailyMovingMachinesService.php @@ -25,10 +25,10 @@ class DailyMovingMachinesService /** * @throws Exception */ - public function run(): Collection + public function run(): array { try { - return collect( $this->sendRequest()); + return $this->sendRequest(); } catch (Exception $e) { Log::channel($this->channelName) ->error(get_class($this),