@fleetbase/fleetops-engine 0.3.1 → 0.3.2

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.3.1",
+    "version": "0.3.2",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.3.1",
+    "version": "0.3.2",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops",
@@ -40,8 +40,8 @@
     },
     "dependencies": {
         "@fleetbase/ember-core": "^0.1.6",
-        "@fleetbase/ember-ui": "^0.2.2",
-        "@fleetbase/fleetops-data": "^0.1.1",
+        "@fleetbase/ember-ui": "^0.2.3",
+        "@fleetbase/fleetops-data": "^0.1.2",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",
@@ -56,6 +56,7 @@
         "ember-intl": "^6.0.0-beta.6",
         "ember-leaflet": "^5.1.1",
         "ember-radio-button": "^3.0.0-beta.1",
+        "ember-tag-input": "^3.1.0",
         "ember-wormhole": "^0.6.0",
         "leaflet": "^1.9.4",
         "leaflet-contextmenu": "^1.4.0",

package/server/migrations/2023_11_03_072503_refactor_issues_table_columns.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class RefactorIssuesTableColumns extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('issues', function (Blueprint $table) {
+            $table->dropColumn(['longitude', 'latitude', 'odometer']);
+            $table->string('category')->nullable()->after('type');
+            $table->json('tags')->nullable()->after('priority');
+            $table->json('meta')->nullable()->after('priority');
+            $table->mediumText('report')->change();
+            $table->foreignUuid('reported_by_uuid')->nullable()->after('assigned_to_uuid')->references('uuid')->on('users')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('issues', function (Blueprint $table) {
+            $table->string('longitude')->nullable()->after('location');
+            $table->string('latitude')->nullable()->after('location');
+            $table->string('odometer')->nullable()->after('location');
+            $table->string('report')->change();
+            $table->dropForeign(['reported_by_uuid']);
+            $table->dropColumn(['reported_by_uuid', 'meta', 'tags', 'category']);
+        });
+    }
+}

package/server/migrations/2023_11_06_040645_refactor_fuel_reports_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class RefactorFuelReportsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('fuel_reports', function (Blueprint $table) {
+            $table->dropColumn(['longitude', 'latitude']);
+            $table->json('meta')->nullable()->after('metric_unit');
+            $table->mediumText('report')->nullable()->after('vehicle_uuid');
+            $table->foreignUuid('reported_by_uuid')->nullable()->after('vehicle_uuid')->references('uuid')->on('users')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('fuel_reports', function (Blueprint $table) {
+            $table->string('longitude')->nullable()->after('location');
+            $table->string('latitude')->nullable()->after('location');
+            $table->dropForeign(['reported_by_uuid']);
+            $table->dropColumn(['reported_by_uuid', 'meta', 'report']);
+        });
+    }
+}

package/server/src/Casts/Point.php

@@ -59,7 +59,21 @@ class Point implements CastsAttributes
             return $point;
         }
 
-        return new SpatialExpression(new Point(0, 0));
+        return static::createEmptySpatialExpression();
+    }
+
+    /**
+     * Creates an empty Point as a SpatialExpression.
+     */
+    public static function createEmptySpatialExpression(): SpatialExpression
+    {
+        $value = json_encode([
+            'type'        => 'Point',
+            'coordinates' => [0, 0],
+            'bbox'        => [0, 0, 0, 0],
+        ]);
+
+        return Utils::createSpatialExpressionFromGeoJson($value);
     }
 
     /**

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

@@ -51,17 +51,26 @@ class DriverController extends FleetOpsController
             // outside organization: invite to join organization AS DRIVER
             if ($validator->errors()->hasAny(['phone', 'email'])) {
                 // get existing user
-                $existingUser = User::where(
-                    function ($q) use ($input) {
-                        if (!empty($input['phone'])) {
-                            $q->orWhere('phone', $input['phone']);
-                        }
-
-                        if (!empty($input['email'])) {
-                            $q->orWhere('email', $input['email']);
-                        }
+                $existingUser = null;
+
+                // if values provided for user lookup
+                if (!empty($input['phone']) || !empty($input['email'])) {
+                    $existingUserQuery = User::query();
+
+                    if (!empty($input['phone']) && is_string($input['phone'])) {
+                        $existingUserQuery->orWhere(function ($q) use ($input) {
+                            $q->where('phone', $input['phone'])->whereNotNull('phone');
+                        });
                     }
-                )->first();
+
+                    if (!empty($input['email']) && is_string($input['email'])) {
+                        $existingUserQuery->orWhere(function ($q) use ($input) {
+                            $q->where('email', $input['email'])->whereNotNull('email');
+                        });
+                    }
+
+                    $existingUser = $existingUserQuery->first();
+                }
 
                 if ($existingUser) {
                     // if exists in organization create driver profile for user
@@ -69,7 +78,7 @@ class DriverController extends FleetOpsController
 
                     // create driver profile for user
                     $input = collect($input)
-                        ->except(['name', 'password', 'email', 'phone', 'location', 'meta'])
+                        ->except(['name', 'password', 'email', 'phone', 'location', 'meta', 'avatar_uuid', 'photo_uuid'])
                         ->filter()
                         ->toArray();
 
@@ -116,12 +125,17 @@ class DriverController extends FleetOpsController
                     $input = collect($input);
 
                     $userInput = $input
-                        ->only(['name', 'password', 'email', 'phone', 'status'])
+                        ->only(['name', 'password', 'email', 'phone', 'status', 'avatar_uuid'])
                         ->filter()
                         ->toArray();
 
+                    // handle `photo_uuid`
+                    if (isset($input['photo_uuid']) && Str::isUuid($input['photo_uuid'])) {
+                        $userInput['avatar_uuid'] = $input['photo_uuid'];
+                    }
+
                     $input = $input
-                        ->except(['name', 'password', 'email', 'phone', 'location', 'meta'])
+                        ->except(['name', 'password', 'email', 'phone', 'location', 'meta', 'avatar_uuid', 'photo_uuid'])
                         ->filter()
                         ->toArray();
 
@@ -198,8 +212,12 @@ class DriverController extends FleetOpsController
                 function (&$request, &$driver, &$input) {
                     $driver->load(['user']);
                     $input     = collect($input);
-                    $userInput = $input->only(['name', 'password', 'email', 'phone'])->toArray();
-                    $input     = $input->except(['name', 'password', 'email', 'phone', 'location', 'meta'])->toArray();
+                    $userInput = $input->only(['name', 'password', 'email', 'phone', 'avatar_uuid'])->toArray();
+                    // handle `photo_uuid`
+                    if (isset($input['photo_uuid']) && Str::isUuid($input['photo_uuid'])) {
+                        $userInput['avatar_uuid'] = $input['photo_uuid'];
+                    }
+                    $input     = $input->except(['name', 'password', 'email', 'phone', 'location', 'meta', 'avatar_uuid', 'photo_uuid'])->toArray();
 
                     $driver->user->update($userInput);
                     $driver->flushAttributesCache();

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

@@ -24,6 +24,13 @@ class FleetFilter extends Filter
         });
     }
 
+    public function parentsOnly(bool $parentsOnly = false)
+    {
+        if ($parentsOnly) {
+            $this->builder->whereNull('parent_fleet_uuid');
+        }
+    }
+
     public function serviceArea(?string $serviceArea)
     {
         $this->builder->whereHas(

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

@@ -0,0 +1,58 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Filter\Filter;
+use Illuminate\Support\Str;
+
+class FuelReportFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function query(?string $searchQuery)
+    {
+        $this->builder->search($searchQuery);
+    }
+
+    public function publicId(?string $publicId)
+    {
+        $this->builder->searchWhere('public_id', $publicId);
+    }
+
+    public function reporter(?string $reporter)
+    {
+        $this->builder->whereHas('reportedBy', function ($q) use ($reporter) {
+            if (Str::isUuid($reporter)) {
+                $q->where('uuid', $reporter);
+            } else {
+                $q->search($reporter);
+            }
+        });
+    }
+
+    public function createdAt($createdAt)
+    {
+        $createdAt = Utils::dateRange($createdAt);
+
+        if (is_array($createdAt)) {
+            $this->builder->whereBetween('created_at', $createdAt);
+        } else {
+            $this->builder->whereDate('created_at', $createdAt);
+        }
+    }
+
+    public function updatedAt($updatedAt)
+    {
+        $updatedAt = Utils::dateRange($updatedAt);
+
+        if (is_array($updatedAt)) {
+            $this->builder->whereBetween('updated_at', $updatedAt);
+        } else {
+            $this->builder->whereDate('updated_at', $updatedAt);
+        }
+    }
+}

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

@@ -0,0 +1,69 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Http\Filter\Filter;
+use Illuminate\Support\Str;
+
+class IssueFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function query(?string $searchQuery)
+    {
+        $this->builder->search($searchQuery);
+    }
+
+    public function publicId(?string $publicId)
+    {
+        $this->builder->searchWhere('public_id', $publicId);
+    }
+
+    public function reporter(?string $reporter)
+    {
+        $this->builder->whereHas('reportedBy', function ($q) use ($reporter) {
+            if (Str::isUuid($reporter)) {
+                $q->where('uuid', $reporter);
+            } else {
+                $q->search($reporter);
+            }
+        });
+    }
+
+    public function assignee(?string $assignee)
+    {
+        $this->builder->whereHas('assignedBy', function ($q) use ($assignee) {
+            if (Str::isUuid($assignee)) {
+                $q->where('uuid', $assignee);
+            } else {
+                $q->search($assignee);
+            }
+        });
+    }
+
+    public function createdAt($createdAt)
+    {
+        $createdAt = Utils::dateRange($createdAt);
+
+        if (is_array($createdAt)) {
+            $this->builder->whereBetween('created_at', $createdAt);
+        } else {
+            $this->builder->whereDate('created_at', $createdAt);
+        }
+    }
+
+    public function updatedAt($updatedAt)
+    {
+        $updatedAt = Utils::dateRange($updatedAt);
+
+        if (is_array($updatedAt)) {
+            $this->builder->whereBetween('updated_at', $updatedAt);
+        } else {
+            $this->builder->whereDate('updated_at', $updatedAt);
+        }
+    }
+}

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

@@ -57,6 +57,16 @@ class VehicleFilter extends Filter
         );
     }
 
+    public function driverUuid(?string $driverId)
+    {
+        $this->builder->whereHas(
+            'driver',
+            function ($query) use ($driverId) {
+                $query->where('uuid', $driverId);
+            }
+        );
+    }
+
     public function createdAt($createdAt)
     {
         $createdAt = Utils::dateRange($createdAt);

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

@@ -0,0 +1,48 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Middleware;
+
+/**
+ * Middleware to transform the "location" property to a default value if it is null, even if it is nested within other objects.
+ *
+ * Class TransformLocationMiddleware
+ */
+class TransformLocationMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param Request $request
+     * @param Closure $next
+     */
+    public function handle($request, \Closure $next)
+    {
+        $data = $request->all();
+        $data = $this->transformNestedLocation($data);
+        $request->replace($data);
+
+        return $next($request);
+    }
+
+    /**
+     * Recursively transform the "location" property within nested objects to a default value if it is null.
+     *
+     * @param array $data the data to process
+     *
+     * @return array the transformed data
+     */
+    protected function transformNestedLocation($data)
+    {
+        foreach ($data as $key => $value) {
+            if (is_array($value)) {
+                // If the value is an array, recursively transform it
+                $data[$key] = $this->transformNestedLocation($value);
+            } elseif ($key === 'location' && $value === null) {
+                // Transform the 'location' property if it's null
+                $data[$key] = [0, 0];
+            }
+        }
+
+        return $data;
+    }
+}

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

@@ -35,6 +35,7 @@ class Driver extends FleetbaseResource
                 '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())),

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

@@ -16,27 +16,25 @@ class Fleet 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),
-                '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)),
-                'parentFleet'          => $this->whenLoaded('parent_fleet', new self($this->parent_fleet)),
-                '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,
-            ]
-        );
+        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,
+        ];
     }
 
     /**
@@ -51,6 +49,7 @@ class Fleet extends FleetbaseResource
             'name'         => $this->name,
             'task'         => $this->task ?? null,
             'status'       => $this->status ?? null,
+            'parent_fleet' => $this->when($this->serviceArea, data_get($this, 'parentFleet.public_id')),
             'service_area' => $this->when($this->serviceArea, data_get($this, 'serviceArea.public_id')),
             'zone'         => $this->when($this->zone, data_get($this, 'zone.public_id')),
             'updated_at'   => $this->updated_at,

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

@@ -17,29 +17,29 @@ class FuelReport 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),
-                'driver_uuid'  => $this->when(Http::isInternalRequest(), $this->driver_uuid),
-                'vehicle_uuid' => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
-                'driver_name'  => $this->when(Http::isInternalRequest(), $this->driver_name),
-                'vehicle_name' => $this->when(Http::isInternalRequest(), $this->vehicle_name),
-                'vehicle'      => $this->whenLoaded('vehicle', new Vehicle($this->vehicle)),
-                'driver'       => $this->whenLoaded('driver', new Driver($this->driver)),
-                '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,
-            ]
-        );
+        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),
+            'reported_by_uuid'  => $this->when(Http::isInternalRequest(), $this->reported_by_uuid),
+            'driver_uuid'       => $this->when(Http::isInternalRequest(), $this->driver_uuid),
+            'vehicle_uuid'      => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
+            'reporter_name'     => $this->when(Http::isInternalRequest(), $this->reporter_name),
+            'driver_name'       => $this->when(Http::isInternalRequest(), $this->driver_name),
+            'vehicle_name'      => $this->when(Http::isInternalRequest(), $this->vehicle_name),
+            'reporter'          => $this->whenLoaded('reporter', $this->reporter),
+            'vehicle'           => $this->whenLoaded('vehicle', new Vehicle($this->vehicle)),
+            'driver'            => $this->whenLoaded('driver', new Driver($this->driver)),
+            '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,
+        ];
     }
 
     /**
@@ -50,18 +50,20 @@ class FuelReport extends FleetbaseResource
     public function toWebhookPayload()
     {
         return [
-            'id'          => $this->public_id,
-            'driver'      => data_get($this, 'driver.public_id'),
-            'vehicle'     => data_get($this, 'vehicle.public_id'),
-            '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'        => $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,
         ];
     }
 }