@fleetbase/fleetops-engine 0.3.3 → 0.3.5

package/server/src/Http/Filter/VendorFilter.php

@@ -14,14 +14,7 @@ class VendorFilter extends Filter
 
     public function query(?string $searchQuery)
     {
-        $this->builder->where(function ($query) use ($searchQuery) {
-            $query->orWhereHas(
-                'user',
-                function ($query) use ($searchQuery) {
-                    $query->searchWhere(['name', 'email', 'phone', 'address'], $searchQuery);
-                }
-            );
-        });
+        $this->builder->search($searchQuery);
     }
 
     public function internalId(?string $internalId)
@@ -49,6 +42,11 @@ class VendorFilter extends Filter
         $this->builder->searchWhere('email', $email);
     }
 
+    public function websiteUrl(?string $websiteUrl)
+    {
+        $this->builder->searchWhere('website_url', $websiteUrl);
+    }
+
     public function country(?string $country)
     {
         $this->builder->searchWhere('country', $country);
@@ -59,6 +57,11 @@ class VendorFilter extends Filter
         $this->builder->searchWhere('status', $status);
     }
 
+    public function address(?string $address)
+    {
+        $this->builder->searchWhere('place_uuid', $address);
+    }
+
     public function createdAt($createdAt)
     {
         $createdAt = Utils::dateRange($createdAt);

package/server/src/Http/Middleware/TransformLocationMiddleware.php

@@ -35,7 +35,7 @@ class TransformLocationMiddleware
     {
         foreach ($data as $key => $value) {
             if (is_array($value)) {
-                // If the value is an array, recursively transform it
+                // If the value is a valid coordinates type, recursively transform it
                 $data[$key] = $this->transformNestedLocation($value);
             } elseif ($key === 'location' && $value === null) {
                 // Transform the 'location' property if it's null

package/server/src/Http/Resources/Internal/v1/IntegratedVendorFacilitator.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Http\Resources\Internal\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
 
 class IntegratedVendorFacilitator extends FleetbaseResource
 {
@@ -15,23 +16,21 @@ class IntegratedVendorFacilitator extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return array_merge(
-            $this->getInternalIds(),
-            [
-                'id'               => $this->public_id,
-                'public_id'        => $this->public_id,
-                'uuid'             => $this->uuid,
-                'name'             => $this->name,
-                'photo_url'        => $this->photo_url,
-                'provider'         => $this->provider,
-                'options'          => $this->options,
-                'sandbox'          => $this->sandbox,
-                'facilitator_type' => $this->type,
-                'type'             => 'facilitator',
-                'status'           => $this->status,
-                'updated_at'       => $this->updated_at,
-                'created_at'       => $this->created_at,
-            ]
-        );
+        return [
+            'id'               => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'             => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'        => $this->public_id,
+            'uuid'             => $this->uuid,
+            'name'             => $this->name,
+            'photo_url'        => $this->photo_url,
+            'provider'         => $this->provider,
+            'options'          => $this->options,
+            'sandbox'          => $this->sandbox,
+            'facilitator_type' => $this->type,
+            'type'             => 'facilitator',
+            'status'           => $this->status,
+            'updated_at'       => $this->updated_at,
+            'created_at'       => $this->created_at,
+        ];
     }
 }

package/server/src/Http/Resources/v1/Contact.php

@@ -16,25 +16,22 @@ class Contact extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return array_merge(
-            $this->getInternalIds(),
-            [
-                'id'          => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-                'uuid'        => $this->when(Http::isInternalRequest(), $this->uuid),
-                'public_id'   => $this->when(Http::isInternalRequest(), $this->public_id),
-                'internal_id' => $this->internal_id,
-                'name'        => $this->name,
-                'title'       => $this->title ?? null,
-                'email'       => $this->email ?? null,
-                'phone'       => $this->phone ?? null,
-                'photo_url'   => $this->photo_url ?? null,
-                'type'        => $this->type ?? null,
-                'meta'        => $this->meta ?? [],
-                'slug'        => $this->slug ?? null,
-                'updated_at'  => $this->updated_at,
-                'created_at'  => $this->created_at,
-            ]
-        );
+        return [
+            'id'          => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'        => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'   => $this->when(Http::isInternalRequest(), $this->public_id),
+            'internal_id' => $this->internal_id,
+            'name'        => $this->name,
+            'title'       => $this->title ?? null,
+            'email'       => $this->email ?? null,
+            'phone'       => $this->phone ?? null,
+            'photo_url'   => $this->photo_url ?? null,
+            'type'        => $this->type ?? null,
+            'meta'        => $this->meta ?? [],
+            'slug'        => $this->slug ?? null,
+            'updated_at'  => $this->updated_at,
+            'created_at'  => $this->created_at,
+        ];
     }
 
     /**

package/server/src/Http/Resources/v1/CurrentJob.php

@@ -16,21 +16,18 @@ class CurrentJob extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return array_merge(
-            $this->getInternalIds(),
-            [
-                'id'           => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-                'uuid'         => $this->when(Http::isInternalRequest(), $this->uuid),
-                'public_id'    => $this->when(Http::isInternalRequest(), $this->public_id),
-                'company_uuid' => $this->when(Http::isInternalRequest(), $this->company_uuid),
-                'internal_id'  => $this->internal_id,
-                'payload'      => $this->when(Http::isInternalRequest(), new Payload($this->payload)),
-                'type'         => $this->type,
-                'status'       => $this->status,
-                'meta'         => $this->meta ?? [],
-                'updated_at'   => $this->updated_at,
-                'created_at'   => $this->created_at,
-            ]
-        );
+        return [
+            'id'           => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'         => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'    => $this->when(Http::isInternalRequest(), $this->public_id),
+            'company_uuid' => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'internal_id'  => $this->internal_id,
+            'payload'      => $this->when(Http::isInternalRequest(), new Payload($this->payload)),
+            'type'         => $this->type,
+            'status'       => $this->status,
+            'meta'         => $this->meta ?? [],
+            'updated_at'   => $this->updated_at,
+            'created_at'   => $this->created_at,
+        ];
     }
 }

package/server/src/Http/Resources/v1/Driver.php

@@ -18,42 +18,44 @@ class Driver extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return array_merge(
-            $this->getInternalIds(),
-            [
-                'id'                     => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-                'uuid'                   => $this->when(Http::isInternalRequest(), $this->uuid),
-                'public_id'              => $this->when(Http::isInternalRequest(), $this->public_id),
-                'internal_id'            => $this->internal_id,
-                'name'                   => $this->name,
-                'email'                  => $this->email ?? null,
-                'phone'                  => $this->phone ?? null,
-                'drivers_license_number' => $this->drivers_license_number ?? null,
-                'photo_url'              => $this->photo_url ?? null,
-                'vehicle_name'           => $this->when(Http::isInternalRequest(), $this->vehicle_name),
-                'vehicle_avatar'         => $this->when(Http::isInternalRequest(), $this->vehicle_avatar),
-                'vendor_name'            => $this->when(Http::isInternalRequest(), $this->vendor_name),
-                'vehicle'                => $this->whenLoaded('vehicle', new VehicleWithoutDriver($this->vehicle)),
-                'current_job'            => $this->whenLoaded('currentJob', new CurrentJob($this->currentJob)),
-                'current_job_id'         => $this->when(Http::isInternalRequest(), data_get($this, 'currentJob.public_id')),
-                'jobs'                   => $this->whenLoaded('jobs', CurrentJob::collection($this->jobs()->without(['driverAssigned'])->get())),
-                'vendor'                 => $this->whenLoaded('vendor', new Vendor($this->vendor)),
-                'fleets'                 => $this->whenLoaded('fleets', Fleet::collection($this->fleets()->without('drivers')->get())),
-                'location'               => data_get($this, 'location', new Point(0, 0)),
-                'heading'                => (int) data_get($this, 'heading', 0),
-                'altitude'               => (int) data_get($this, 'altitude', 0),
-                'speed'                  => (int) data_get($this, 'speed', 0),
-                'country'                => data_get($this, 'country'),
-                'currency'               => data_get($this, 'currency', Utils::getCurrenyFromCountryCode($this->country)),
-                'city'                   => data_get($this, 'city', Utils::getCapitalCityFromCountryCode($this->country)),
-                'online'                 => data_get($this, 'online', false),
-                'status'                 => $this->status,
-                'token'                  => data_get($this, 'token'),
-                'meta'                   => $this->meta,
-                'updated_at'             => $this->updated_at,
-                'created_at'             => $this->created_at,
-            ]
-        );
+        return [
+            'id'                            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                          => $this->when(Http::isInternalRequest(), $this->uuid),
+            'user_uuid'                     => $this->when(Http::isInternalRequest(), $this->user_uuid),
+            'company_uuid'                  => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'vehicle_uuid'                  => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
+            'vendor_uuid'                   => $this->when(Http::isInternalRequest(), $this->vendor_uuid),
+            'current_job_uuid'              => $this->when(Http::isInternalRequest(), $this->current_job_uuid),
+            'public_id'                     => $this->when(Http::isInternalRequest(), $this->public_id),
+            'internal_id'                   => $this->internal_id,
+            'name'                          => $this->name,
+            'email'                         => $this->email ?? null,
+            'phone'                         => $this->phone ?? null,
+            'drivers_license_number'        => $this->drivers_license_number ?? null,
+            'photo_url'                     => $this->photo_url ?? null,
+            'vehicle_name'                  => $this->when(Http::isInternalRequest(), $this->vehicle_name),
+            'vehicle_avatar'                => $this->when(Http::isInternalRequest(), $this->vehicle_avatar),
+            'vendor_name'                   => $this->when(Http::isInternalRequest(), $this->vendor_name),
+            'vehicle'                       => $this->whenLoaded('vehicle', new VehicleWithoutDriver($this->vehicle)),
+            'current_job'                   => $this->whenLoaded('currentJob', new CurrentJob($this->currentJob)),
+            'current_job_id'                => $this->when(Http::isInternalRequest(), data_get($this, 'currentJob.public_id')),
+            'jobs'                          => $this->whenLoaded('jobs', CurrentJob::collection($this->jobs()->without(['driverAssigned'])->get())),
+            'vendor'                        => $this->whenLoaded('vendor', new Vendor($this->vendor)),
+            'fleets'                        => $this->whenLoaded('fleets', Fleet::collection($this->fleets()->without('drivers')->get())),
+            'location'                      => data_get($this, 'location', new Point(0, 0)),
+            'heading'                       => (int) data_get($this, 'heading', 0),
+            'altitude'                      => (int) data_get($this, 'altitude', 0),
+            'speed'                         => (int) data_get($this, 'speed', 0),
+            'country'                       => data_get($this, 'country'),
+            'currency'                      => data_get($this, 'currency', Utils::getCurrenyFromCountryCode($this->country)),
+            'city'                          => data_get($this, 'city', Utils::getCapitalCityFromCountryCode($this->country)),
+            'online'                        => data_get($this, 'online', false),
+            'status'                        => $this->status,
+            'token'                         => data_get($this, 'token'),
+            'meta'                          => $this->meta,
+            'updated_at'                    => $this->updated_at,
+            'created_at'                    => $this->created_at,
+        ];
     }
 
     /**
@@ -64,27 +66,27 @@ class Driver extends FleetbaseResource
     public function toWebhookPayload()
     {
         return [
-            'id'          => $this->public_id,
-            'internal_id' => $this->internal_id,
-            'name'        => $this->name,
-            'email'       => $this->email ?? null,
-            'phone'       => $this->phone ?? null,
-            'photo_url'   => $this->photo_url ?? null,
-            'vehicle'     => $this->vehicle->public_id ?? null,
-            'current_job' => $this->currentJob->public_id ?? null,
-            'vendor'      => $this->vendor->public_id ?? null,
-            'location'    => $this->location ?? new Point(0, 0),
-            'heading'     => $this->heading ?? null,
-            'altitude'    => $this->altitude ?? null,
-            'speed'       => $this->speed ?? null,
-            'country'     => $this->country ?? null,
-            'currency'    => $this->currency ?? null,
-            'city'        => $this->city ?? null,
-            'online'      => $this->online ?? false,
-            'status'      => $this->status,
-            'meta'        => $this->meta,
-            'updated_at'  => $this->updated_at,
-            'created_at'  => $this->created_at,
+            'id'                     => $this->public_id,
+            'internal_id'            => $this->internal_id,
+            'name'                   => $this->name,
+            'email'                  => $this->email,
+            'phone'                  => $this->phone,
+            'photo_url'              => $this->photo_url,
+            'vehicle'                => data_get($this, 'vehicle.public_id'),
+            'current_job'            => data_get($this, 'currentJob.public_id'),
+            'vendor'                 => data_get($this, 'vendor.public_id'),
+            'location'               => data_get($this, 'location', new Point(0, 0)),
+            'heading'                => (int) data_get($this, 'heading', 0),
+            'altitude'               => (int) data_get($this, 'altitude', 0),
+            'speed'                  => (int) data_get($this, 'speed', 0),
+            'country'                => data_get($this, 'country'),
+            'currency'               => data_get($this, 'currency', Utils::getCurrenyFromCountryCode($this->country)),
+            'city'                   => data_get($this, 'city', Utils::getCapitalCityFromCountryCode($this->country)),
+            'online'                 => data_get($this, 'online', false),
+            'status'                 => $this->status,
+            'meta'                   => $this->meta,
+            'updated_at'             => $this->updated_at,
+            'created_at'             => $this->created_at,
         ];
     }
 }

package/server/src/Http/Resources/v1/Entity.php

@@ -17,39 +17,36 @@ class Entity extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return array_merge(
-            $this->getInternalIds(),
-            [
-                'id'              => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-                'uuid'            => $this->when(Http::isInternalRequest(), $this->uuid),
-                'photo_uuid'      => $this->when(Http::isInternalRequest(), $this->photo_uuid),
-                'public_id'       => $this->when(Http::isInternalRequest(), $this->public_id),
-                'customer_uuid'   => $this->when(Http::isInternalRequest(), $this->customer_uuid),
-                'customer_type'   => $this->when(Http::isInternalRequest(), $this->customer_type),
-                'internal_id'     => $this->internal_id,
-                'name'            => $this->name,
-                'type'            => $this->type ?? null,
-                'destination'     => $this->when(Http::isPublicRequest(), data_get($this, 'destination.public_id'), null),
-                'customer'        => $this->setCustomerType(Resolve::resourceForMorph($this->customer_type, $this->customer_uuid)),
-                'tracking_number' => new TrackingNumber($this->trackingNumber),
-                'description'     => $this->description ?? null,
-                'photo_url'       => $this->photo_url ?? null,
-                'length'          => $this->length ?? null,
-                'width'           => $this->width ?? null,
-                'height'          => $this->height ?? null,
-                'dimensions_unit' => $this->dimensions_unit ?? null,
-                'weight'          => $this->weight ?? null,
-                'weight_unit'     => $this->weight_unit ?? null,
-                'declared_value'  => $this->declared_value ?? null,
-                'price'           => $this->price ?? null,
-                'sale_price'      => $this->sale_price ?? null,
-                'sku'             => $this->sku ?? null,
-                'currency'        => $this->currency ?? null,
-                'meta'            => $this->meta ?? [],
-                'updated_at'      => $this->updated_at,
-                'created_at'      => $this->created_at,
-            ]
-        );
+        return [
+            'id'              => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'            => $this->when(Http::isInternalRequest(), $this->uuid),
+            'photo_uuid'      => $this->when(Http::isInternalRequest(), $this->photo_uuid),
+            'public_id'       => $this->when(Http::isInternalRequest(), $this->public_id),
+            'customer_uuid'   => $this->when(Http::isInternalRequest(), $this->customer_uuid),
+            'customer_type'   => $this->when(Http::isInternalRequest(), $this->customer_type),
+            'internal_id'     => $this->internal_id,
+            'name'            => $this->name,
+            'type'            => $this->type ?? null,
+            'destination'     => $this->when(Http::isPublicRequest(), data_get($this, 'destination.public_id'), null),
+            'customer'        => $this->setCustomerType(Resolve::resourceForMorph($this->customer_type, $this->customer_uuid)),
+            'tracking_number' => new TrackingNumber($this->trackingNumber),
+            'description'     => $this->description ?? null,
+            'photo_url'       => $this->photo_url ?? null,
+            'length'          => $this->length ?? null,
+            'width'           => $this->width ?? null,
+            'height'          => $this->height ?? null,
+            'dimensions_unit' => $this->dimensions_unit ?? null,
+            'weight'          => $this->weight ?? null,
+            'weight_unit'     => $this->weight_unit ?? null,
+            'declared_value'  => $this->declared_value ?? null,
+            'price'           => $this->price ?? null,
+            'sale_price'      => $this->sale_price ?? null,
+            'sku'             => $this->sku ?? null,
+            'currency'        => $this->currency ?? null,
+            'meta'            => $this->meta ?? [],
+            'updated_at'      => $this->updated_at,
+            'created_at'      => $this->created_at,
+        ];
     }
 
     /**

package/server/src/Http/Resources/v1/Fleet.php

@@ -17,23 +17,25 @@ class Fleet extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id'                   => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'                 => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'            => $this->when(Http::isInternalRequest(), $this->public_id),
-            'name'                 => $this->name,
-            'task'                 => $this->task ?? null,
-            'status'               => $this->status ?? null,
-            'drivers_count'        => $this->when(Http::isInternalRequest(), $this->drivers_count),
-            'drivers_online_count' => $this->when(Http::isInternalRequest(), $this->drivers_online_count),
-            'service_area'         => $this->whenLoaded('serviceArea', new ServiceArea($this->serviceArea)),
-            'zone'                 => $this->whenLoaded('zone', new Zone($this->zone)),
-            'vendor'               => $this->whenLoaded('vendor', new Vendor($this->vendor)),
-            'parent_fleet'         => $this->whenLoaded('parentFleet', new ParentFleet($this->parentFleet)),
-            'subfleets'            => $this->whenLoaded('subFleets', SubFleet::collection($this->subFleets)),
-            'drivers'              => $this->whenLoaded('drivers', Driver::collection($this->drivers()->without(['driverAssigned'])->with(Http::isInternalRequest() ? ['jobs'] : [])->get())),
-            'vehicles'             => $this->whenLoaded('vehicles', Vehicle::collection($this->vehicles)),
-            'updated_at'           => $this->updated_at,
-            'created_at'           => $this->created_at,
+            'id'                    => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                  => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'             => $this->when(Http::isInternalRequest(), $this->public_id),
+            'name'                  => $this->name,
+            'task'                  => $this->task ?? null,
+            'status'                => $this->status ?? null,
+            'drivers_count'         => $this->when(Http::isInternalRequest(), $this->drivers_count),
+            'drivers_online_count'  => $this->when(Http::isInternalRequest(), $this->drivers_online_count),
+            'vehicles_count'        => $this->when(Http::isInternalRequest(), $this->vehicles_count),
+            'vehicles_online_count' => $this->when(Http::isInternalRequest(), $this->vehicles_online_count),
+            'service_area'          => $this->whenLoaded('serviceArea', new ServiceArea($this->serviceArea)),
+            'zone'                  => $this->whenLoaded('zone', new Zone($this->zone)),
+            'vendor'                => $this->whenLoaded('vendor', new Vendor($this->vendor)),
+            'parent_fleet'          => $this->whenLoaded('parentFleet', new ParentFleet($this->parentFleet)),
+            'subfleets'             => $this->whenLoaded('subFleets', SubFleet::collection($this->subFleets)),
+            'drivers'               => $this->whenLoaded('drivers', Driver::collection($this->drivers()->without(['driverAssigned'])->with(Http::isInternalRequest() ? ['jobs'] : [])->get())),
+            'vehicles'              => $this->whenLoaded('vehicles', Vehicle::collection($this->vehicles)),
+            'updated_at'            => $this->updated_at,
+            'created_at'            => $this->created_at,
         ];
     }
 

package/server/src/Http/Resources/v1/FuelReport.php

@@ -36,6 +36,7 @@ class FuelReport extends FleetbaseResource
             'volume'            => $this->volume,
             'metric_unit'       => $this->metric_unit,
             'type'              => $this->type,
+            'status'            => $this->status,
             'location'          => $this->location ?? new Point(0, 0),
             'updated_at'        => $this->updated_at,
             'created_at'        => $this->created_at,
@@ -50,20 +51,21 @@ class FuelReport extends FleetbaseResource
     public function toWebhookPayload()
     {
         return [
-            'id'            => $this->public_id,
-            'reporter'      => data_get($this, 'reportedBy.public_id'),
-            'driver'        => data_get($this, 'driver.public_id'),
-            'vehicle'       => data_get($this, 'vehicle.public_id'),
-            'report'        => $this->report,
-            'odometer'      => $this->odometer,
-            'amount'        => $this->amount,
-            'currency'      => $this->currency,
-            'volume'        => $this->volume,
-            'metric_unit'   => $this->metric_unit,
-            'type'          => $this->type,
-            'location'      => $this->location ?? new Point(0, 0),
-            'updated_at'    => $this->updated_at,
-            'created_at'    => $this->created_at,
+            'id'                 => $this->public_id,
+            'reporter'           => data_get($this, 'reportedBy.public_id'),
+            'driver'             => data_get($this, 'driver.public_id'),
+            'vehicle'            => data_get($this, 'vehicle.public_id'),
+            'report_name'        => $this->report,
+            'odometer'           => $this->odometer,
+            'amount'             => $this->amount,
+            'currency'           => $this->currency,
+            'volume'             => $this->volume,
+            'metric_unit'        => $this->metric_unit,
+            'type'               => $this->type,
+            'status'             => $this->status,
+            'location'           => $this->location ?? new Point(0, 0),
+            'updated_at'         => $this->updated_at,
+            'created_at'         => $this->created_at,
         ];
     }
 }

package/server/src/Http/Resources/v1/Order.php

@@ -40,7 +40,7 @@ class Order extends FleetbaseResource
             'customer'             => $this->setCustomerType(Resolve::resourceForMorph($this->customer_type, $this->customer_uuid)),
             'payload'              => new Payload($this->payload),
             'facilitator'          => $this->setFacilitatorType(Resolve::resourceForMorph($this->facilitator_type, $this->facilitator_uuid)),
-            'driver_assigned'      => new Driver($this->driverAssigned()->without(['jobs', 'currentJob', 'driverAssigned'])->first()),
+            'driver_assigned'      => new Driver($this->driverAssigned()->without(['jobs', 'currentJob'])->first()),
             'tracking_number'      => new TrackingNumber($this->trackingNumber),
             'tracking_statuses'    => $this->whenLoaded('trackingStatuses', TrackingStatus::collection($this->trackingStatuses)),
             'purchase_rate'        => new PurchaseRate($this->purchaseRate),

package/server/src/Http/Resources/v1/Payload.php

@@ -17,30 +17,27 @@ class Payload extends FleetbaseResource
      */
     public function toArray($request)
     {
-        return array_merge(
-            $this->getInternalIds(),
-            [
-                'id'                    => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-                'uuid'                  => $this->when(Http::isInternalRequest(), $this->uuid),
-                'public_id'             => $this->when(Http::isInternalRequest(), $this->public_id),
-                'current_waypoint_uuid' => $this->when(Http::isInternalRequest(), $this->current_waypoint_uuid),
-                'pickup_uuid'           => $this->when(Http::isInternalRequest(), $this->pickup_uuid),
-                'dropoff_uuid'          => $this->when(Http::isInternalRequest(), $this->dropoff_uuid),
-                'return_uuid'           => $this->when(Http::isInternalRequest(), $this->return_uuid),
-                'current_waypoint'      => $this->when(!Http::isInternalRequest() && $this->currentWaypoint, data_get($this, 'currentWaypoint.public_id'), null),
-                'pickup'                => new Place($this->pickup),
-                'dropoff'               => new Place($this->dropoff),
-                'return'                => new Place($this->return),
-                'waypoints'             => $this->waypoints($this->waypoints),
-                'entities'              => Entity::collection($this->entities ?? []),
-                'cod_amount'            => $this->cod_amount ?? null,
-                'cod_currency'          => $this->cod_currency ?? null,
-                'cod_payment_method'    => $this->cod_payment_method ?? null,
-                'meta'                  => $this->meta ?? [],
-                'updated_at'            => $this->updated_at,
-                'created_at'            => $this->created_at,
-            ]
-        );
+        return [
+            'id'                    => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                  => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'             => $this->when(Http::isInternalRequest(), $this->public_id),
+            'current_waypoint_uuid' => $this->when(Http::isInternalRequest(), $this->current_waypoint_uuid),
+            'pickup_uuid'           => $this->when(Http::isInternalRequest(), $this->pickup_uuid),
+            'dropoff_uuid'          => $this->when(Http::isInternalRequest(), $this->dropoff_uuid),
+            'return_uuid'           => $this->when(Http::isInternalRequest(), $this->return_uuid),
+            'current_waypoint'      => $this->when(!Http::isInternalRequest() && $this->currentWaypoint, data_get($this, 'currentWaypoint.public_id'), null),
+            'pickup'                => new Place($this->pickup),
+            'dropoff'               => new Place($this->dropoff),
+            'return'                => new Place($this->return),
+            'waypoints'             => $this->waypoints($this->waypoints),
+            'entities'              => Entity::collection($this->entities ?? []),
+            'cod_amount'            => $this->cod_amount ?? null,
+            'cod_currency'          => $this->cod_currency ?? null,
+            'cod_payment_method'    => $this->cod_payment_method ?? null,
+            'meta'                  => $this->meta ?? [],
+            'updated_at'            => $this->updated_at,
+            'created_at'            => $this->created_at,
+        ];
     }
 
     /**