@fleetbase/fleetops-engine 0.6.51 → 0.6.52

package/server/src/Http/Controllers/Internal/v1/DriverController.php

@@ -6,12 +6,13 @@ use Fleetbase\Exceptions\FleetbaseRequestValidationException;
 use Fleetbase\FleetOps\Exports\DriverExport;
 use Fleetbase\FleetOps\Http\Controllers\Api\v1\DriverController as ApiDriverController;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
-use Fleetbase\FleetOps\Http\Requests\Internal\AssignOrderRequest;
 use Fleetbase\FleetOps\Http\Requests\Internal\CreateDriverRequest;
 use Fleetbase\FleetOps\Http\Requests\Internal\UpdateDriverRequest;
+use Fleetbase\FleetOps\Http\Resources\v1\Index\Order as IndexOrderResource;
 use Fleetbase\FleetOps\Imports\DriverImport;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
@@ -21,6 +22,7 @@ use Fleetbase\Models\User;
 use Fleetbase\Models\VerificationCode;
 use Fleetbase\Support\Auth;
 use Illuminate\Database\QueryException;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
@@ -303,7 +305,7 @@ class DriverController extends FleetOpsController
                 function (&$request, &$driver, &$input) {
                     $driver->load(['user'])->guard(['user_uuid']);
                     $input     = collect($input);
-                    $userInput = $input->only(['name', 'password', 'email', 'phone', 'avatar_uuid'])->toArray();
+                    $userInput = $input->only(['name', 'password', 'email', 'phone', 'avatar_uuid'])->reject(fn ($value) => $value === null)->toArray();
                     // handle `photo_uuid`
                     if (isset($input['photo_uuid']) && Str::isUuid($input['photo_uuid'])) {
                         $userInput['avatar_uuid'] = $input['photo_uuid'];
@@ -312,9 +314,8 @@ class DriverController extends FleetOpsController
 
                     // Update driver user details
                     $driverUser = $driver->getUser();
-                    if ($driverUser) {
+                    if ($driverUser && !empty($userInput)) {
                         $driverUser->update($userInput);
-                        $input['slug'] = $driverUser->slug;
                     }
 
                     // Flush cache
@@ -396,10 +397,18 @@ class DriverController extends FleetOpsController
      *
      * @return \Illuminate\Http\Response $response
      */
-    public function assignOrder(AssignOrderRequest $request)
+    public function assignOrder(Request $request, ?string $id = null)
     {
-        $driver = Driver::where('public_id', $request->driver)->first();
-        $order  = Order::where('public_id', $request->order)->first();
+        $request->validate([
+            'driver' => ($id ? 'nullable' : 'required') . '|string',
+            'order'  => 'required|string',
+        ]);
+
+        $driverIdentifier = $id ?? $request->input('driver');
+        $orderIdentifier  = $request->input('order');
+
+        $driver = $this->findDriver($driverIdentifier);
+        $order  = $this->findOrder($orderIdentifier);
 
         if ($order->hasDriverAssigned) {
             return response()->error('A driver is already assigned to this order.');
@@ -410,13 +419,155 @@ class DriverController extends FleetOpsController
         }
 
         $order->assignDriver($driver);
+        $driver->update(['current_job_uuid' => $order->uuid]);
 
         return response()->json([
             'status'  => 'ok',
             'message' => 'Driver assigned',
+            'driver'  => $driver->fresh(['vehicle', 'currentOrder']),
+            'order'   => $order->fresh(['driverAssigned']),
+        ]);
+    }
+
+    public function assignedOrders(string $id): JsonResponse
+    {
+        $driver = $this->findDriver($id);
+        $orders = Order::where('driver_assigned_uuid', $driver->uuid)
+            ->where('company_uuid', session('company'))
+            ->with(['payload', 'trackingNumber', 'orderConfig', 'driverAssigned', 'vehicleAssigned'])
+            ->orderByRaw('uuid = ? desc', [$driver->current_job_uuid])
+            ->latest()
+            ->get();
+
+        return response()->json([
+            'status'  => 'ok',
+            'driver'  => $driver->fresh(['vehicle', 'currentOrder']),
+            'orders'  => IndexOrderResource::collection($orders)->resolve(),
+            'current' => $driver->current_job_uuid,
+            'count'   => $orders->count(),
+        ]);
+    }
+
+    public function unassignOrders(Request $request, string $id): JsonResponse
+    {
+        $request->validate([
+            'orders'   => 'required|array|min:1',
+            'orders.*' => 'required|string',
+        ]);
+
+        $driver = $this->findDriver($id);
+        $ids    = collect($request->input('orders'))->filter()->unique()->values();
+        $orders = Order::where('driver_assigned_uuid', $driver->uuid)
+            ->where('company_uuid', session('company'))
+            ->where(function ($query) use ($ids) {
+                $query->whereIn('uuid', $ids)->orWhereIn('public_id', $ids);
+            })
+            ->get();
+
+        if ($orders->isEmpty()) {
+            return response()->error('No assigned orders were selected for this driver.');
+        }
+
+        DB::transaction(function () use ($driver, $orders): void {
+            Order::whereIn('uuid', $orders->pluck('uuid'))->update([
+                'driver_assigned_uuid' => null,
+                'updated_at'           => now(),
+            ]);
+
+            if ($driver->current_job_uuid && $orders->contains('uuid', $driver->current_job_uuid)) {
+                $driver->update(['current_job_uuid' => null]);
+            }
+        });
+
+        return response()->json([
+            'status'  => 'ok',
+            'message' => 'Driver unassigned from selected orders.',
+            'driver'  => $driver->fresh(['vehicle', 'currentOrder']),
+            'orders'  => IndexOrderResource::collection($orders->fresh(['driverAssigned', 'vehicleAssigned']))->resolve(),
+            'count'   => $orders->count(),
+        ]);
+    }
+
+    public function unassignOrder(string $id): JsonResponse
+    {
+        $driver = $this->findDriver($id);
+        $order  = Order::where('driver_assigned_uuid', $driver->uuid)
+            ->where('company_uuid', session('company'))
+            ->first() ?? $driver->getCurrentOrder();
+
+        if ($order) {
+            $order->update(['driver_assigned_uuid' => null]);
+        }
+
+        $driver->unassignCurrentJob();
+
+        return response()->json([
+            'status'  => 'ok',
+            'message' => 'Driver unassigned from order.',
+            'driver'  => $driver->fresh(['vehicle', 'currentOrder']),
+            'order'   => $order?->fresh(['driverAssigned']),
         ]);
     }
 
+    public function assignVehicle(Request $request, string $id): JsonResponse
+    {
+        $request->validate(['vehicle' => 'required|string']);
+
+        $driver  = $this->findDriver($id);
+        $vehicle = $this->findVehicle($request->input('vehicle'));
+
+        $driver->assignVehicle($vehicle);
+
+        return response()->json([
+            'status'  => 'ok',
+            'message' => 'Vehicle assigned to driver.',
+            'driver'  => $driver->fresh(['vehicle', 'currentOrder']),
+            'vehicle' => $vehicle->fresh(['driver']),
+        ]);
+    }
+
+    public function unassignVehicle(string $id): JsonResponse
+    {
+        $driver  = $this->findDriver($id);
+        $vehicle = $driver->vehicle;
+
+        $driver->update(['vehicle_uuid' => null]);
+
+        return response()->json([
+            'status'  => 'ok',
+            'message' => 'Vehicle unassigned from driver.',
+            'driver'  => $driver->fresh(['vehicle', 'currentOrder']),
+            'vehicle' => $vehicle?->fresh(['driver']),
+        ]);
+    }
+
+    protected function findDriver(?string $id): Driver
+    {
+        return Driver::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('public_id', $id);
+        })
+            ->where('company_uuid', session('company'))
+            ->firstOrFail();
+    }
+
+    protected function findOrder(?string $id): Order
+    {
+        return Order::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('public_id', $id);
+        })
+            ->where('company_uuid', session('company'))
+            ->firstOrFail();
+    }
+
+    protected function findVehicle(?string $id): Vehicle
+    {
+        return Vehicle::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('public_id', $id);
+        })
+            ->where('company_uuid', session('company'))
+            ->firstOrFail();
+    }
+
     /**
      * Update drivers geolocation data.
      *

package/server/src/Http/Controllers/Internal/v1/FuelProviderConnectionController.php

@@ -0,0 +1,124 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\FleetOps\Jobs\SyncFuelProviderTransactionsJob;
+use Fleetbase\FleetOps\Models\FuelProviderConnection;
+use Fleetbase\FleetOps\Support\FuelProviders\FuelProviderService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+use Illuminate\Validation\ValidationException;
+
+class FuelProviderConnectionController extends FleetOpsController
+{
+    public $resource = 'fuel_provider_connection';
+
+    public function __construct(protected FuelProviderService $fuelProviderService)
+    {
+        parent::__construct();
+    }
+
+    public function providers(): JsonResponse
+    {
+        return response()->json($this->fuelProviderService->providers());
+    }
+
+    public function onBeforeCreate(Request $request, array &$input)
+    {
+        $this->validateConnectionInput($input);
+        $this->normalizeConnectionInput($input);
+    }
+
+    public function onBeforeUpdate(Request $request, FuelProviderConnection $connection, array &$input)
+    {
+        $candidate = array_merge($connection->toArray(), $input);
+        $this->validateConnectionInput($candidate, $connection);
+        $this->normalizeConnectionInput($input, $connection);
+    }
+
+    public function testCredentials(Request $request, string $provider): JsonResponse
+    {
+        $request->validate([
+            'credentials' => 'required|array',
+            'environment' => 'nullable|string|in:production,sandbox',
+        ]);
+
+        $result = $this->fuelProviderService->testCredentials(
+            $provider,
+            $request->array('credentials'),
+            $request->input('environment', 'production')
+        );
+
+        return response()->json($result, data_get($result, 'success') ? 200 : 422);
+    }
+
+    public function testConnection(Request $request, string $id): JsonResponse
+    {
+        $connection = $this->findConnection($id);
+        $result     = $this->fuelProviderService->testConnection($connection);
+
+        return response()->json($result, data_get($result, 'success') ? 200 : 422);
+    }
+
+    public function sync(Request $request, string $id): JsonResponse
+    {
+        $connection = $this->findConnection($id);
+        $async      = $request->boolean('async', true);
+        $from       = $request->input('from') ? Carbon::parse($request->input('from')) : null;
+        $to         = $request->input('to') ? Carbon::parse($request->input('to')) : null;
+        $options    = $request->array('options', []);
+        $syncRun    = $this->fuelProviderService->createSyncRun($connection, $from, $to, $async ? 'queued' : 'running');
+
+        if ($async) {
+            SyncFuelProviderTransactionsJob::dispatch($connection->uuid, $from?->toIso8601String(), $to?->toIso8601String(), $options, $syncRun->uuid);
+
+            return response()->json(['status' => 'ok', 'message' => 'Fuel provider sync queued.', 'sync_run' => $syncRun], 202);
+        }
+
+        $summary = $this->fuelProviderService->syncTransactions($connection, $from, $to, $options, $syncRun);
+
+        return response()->json(['status' => 'ok', 'summary' => $summary, 'sync_run' => $syncRun->fresh()]);
+    }
+
+    protected function validateConnectionInput(array $input, ?FuelProviderConnection $connection = null): void
+    {
+        $provider = data_get($input, 'provider');
+        if (!$provider) {
+            throw ValidationException::withMessages(['provider' => 'Fuel integration provider is required.']);
+        }
+
+        $descriptor = $this->fuelProviderService->providers()->firstWhere('key', $provider);
+        if (!$descriptor) {
+            throw ValidationException::withMessages(['provider' => 'Fuel integration provider is not registered.']);
+        }
+
+        foreach ((array) data_get($descriptor, 'required_fields', []) as $field) {
+            if (data_get($field, 'required') && blank(data_get($input, 'credentials.' . data_get($field, 'name')))) {
+                throw ValidationException::withMessages(['credentials.' . data_get($field, 'name') => data_get($field, 'label', data_get($field, 'name')) . ' is required.']);
+            }
+        }
+    }
+
+    protected function normalizeConnectionInput(array &$input, ?FuelProviderConnection $connection = null): void
+    {
+        $input['company_uuid'] ??= session('company');
+        $input['environment'] ??= 'production';
+        $input['status']        = $connection?->status && $connection->status !== 'draft' ? $connection->status : ($input['status'] ?? 'configured');
+        $input['sync_settings'] = array_merge([
+            'window_days'              => 7,
+            'matching_order'           => ['plate_number', 'internal_id', 'vin', 'serial_number', 'call_sign', 'fuel_card_number', 'trip_number'],
+            'auto_create_fuel_reports' => true,
+        ], (array) data_get($input, 'sync_settings', []));
+    }
+
+    protected function findConnection(string $id): FuelProviderConnection
+    {
+        return FuelProviderConnection::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('public_id', $id);
+        })
+            ->where('company_uuid', session('company'))
+            ->firstOrFail();
+    }
+}

package/server/src/Http/Controllers/Internal/v1/FuelProviderSyncRunController.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+
+class FuelProviderSyncRunController extends FleetOpsController
+{
+    public $resource = 'fuel_provider_sync_run';
+}

package/server/src/Http/Controllers/Internal/v1/FuelProviderTransactionController.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\FleetOps\Models\FuelProviderTransaction;
+use Fleetbase\FleetOps\Support\FuelProviders\FuelProviderService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FuelProviderTransactionController extends FleetOpsController
+{
+    public $resource = 'fuel_provider_transaction';
+
+    public function __construct(protected FuelProviderService $fuelProviderService)
+    {
+        parent::__construct();
+    }
+
+    public static function onQueryRecord($query, $request): void
+    {
+        $query->with(['vehicle', 'driver', 'fuelReport']);
+    }
+
+    public function matchVehicle(Request $request, string $id): JsonResponse
+    {
+        $request->validate(['vehicle' => 'required|string']);
+        $transaction = $this->findTransaction($id);
+
+        return response()->json([
+            'status'      => 'ok',
+            'transaction' => $this->fuelProviderService->matchVehicle($transaction, $request->input('vehicle')),
+        ]);
+    }
+
+    public function matchOrder(Request $request, string $id): JsonResponse
+    {
+        $request->validate(['order' => 'required|string']);
+        $transaction = $this->findTransaction($id);
+
+        return response()->json([
+            'status'      => 'ok',
+            'transaction' => $this->fuelProviderService->matchOrder($transaction, $request->input('order')),
+        ]);
+    }
+
+    public function reprocess(Request $request, string $id): JsonResponse
+    {
+        $transaction = $this->findTransaction($id);
+
+        return response()->json([
+            'status'      => 'ok',
+            'transaction' => $this->fuelProviderService->reprocessTransaction($transaction),
+        ]);
+    }
+
+    public function review(Request $request, string $id): JsonResponse
+    {
+        $request->validate(['status' => 'required|string|in:reviewed,ignored']);
+        $transaction = $this->findTransaction($id);
+
+        return response()->json([
+            'status'      => 'ok',
+            'transaction' => $this->fuelProviderService->reviewTransaction($transaction, $request->input('status')),
+        ]);
+    }
+
+    protected function findTransaction(string $id): FuelProviderTransaction
+    {
+        return FuelProviderTransaction::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('public_id', $id);
+        })
+            ->where('company_uuid', session('company'))
+            ->firstOrFail();
+    }
+}

package/server/src/Http/Controllers/Internal/v1/SensorController.php

@@ -21,6 +21,6 @@ class SensorController extends FleetOpsController
      */
     public static function onQueryRecord($query, $request): void
     {
-        $query->with(['telematic', 'warranty']);
+        $query->with(['telematic', 'device', 'warranty']);
     }
 }