@fleetbase/fleetops-engine 0.3.3 → 0.3.5

package/server/migrations/2023_04_27_053456_create_tracking_statuses_table.php

@@ -18,8 +18,8 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->index();
-            $table->string('company_uuid', 191)->nullable()->index('tracking_statuses_company_uuid_foreign');
-            $table->string('tracking_number_uuid', 191)->nullable()->index('tracking_statuses_tracking_number_uuid_foreign');
+            $table->uuid('company_uuid')->nullable()->index('tracking_statuses_company_uuid_foreign');
+            $table->uuid('tracking_number_uuid')->nullable()->index('tracking_statuses_tracking_number_uuid_foreign');
             $table->char('proof_uuid', 36)->nullable();
             $table->json('meta')->nullable();
             $table->string('status', 191)->nullable()->index();

package/server/migrations/2023_04_27_053456_create_vehicles_table.php

@@ -18,9 +18,9 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->index();
-            $table->string('company_uuid', 191)->nullable()->index();
-            $table->string('vendor_uuid', 191)->nullable()->index('vehicles_vendor_uuid_foreign');
-            $table->string('photo_uuid', 191)->nullable()->index('vehicles_photo_uuid_foreign');
+            $table->uuid('company_uuid')->nullable()->index();
+            $table->uuid('vendor_uuid')->nullable()->index('vehicles_vendor_uuid_foreign');
+            $table->uuid('photo_uuid')->nullable()->index('vehicles_photo_uuid_foreign');
             $table->string('avatar_url', 300)->nullable();
             $table->string('make', 191)->nullable()->index();
             $table->string('model', 191)->nullable()->index();

package/server/migrations/2023_04_27_053456_create_vendors_table.php

@@ -18,11 +18,11 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->unique();
-            $table->string('company_uuid', 191)->nullable()->index();
-            $table->string('place_uuid', 191)->nullable()->index('vendors_place_uuid_foreign');
-            $table->string('type_uuid', 191)->nullable()->index('vendors_type_uuid_foreign');
-            $table->string('connect_company_uuid', 191)->nullable()->index('vendors_connect_company_uuid_foreign');
-            $table->string('logo_uuid', 191)->nullable()->index('vendors_logo_uuid_foreign');
+            $table->uuid('company_uuid')->nullable()->index();
+            $table->uuid('place_uuid')->nullable()->index('vendors_place_uuid_foreign');
+            $table->uuid('type_uuid')->nullable()->index('vendors_type_uuid_foreign');
+            $table->uuid('connect_company_uuid')->nullable()->index('vendors_connect_company_uuid_foreign');
+            $table->uuid('logo_uuid')->nullable()->index('vendors_logo_uuid_foreign');
             $table->string('name')->nullable();
             $table->string('internal_id', 191)->nullable()->index();
             $table->string('business_id')->nullable();

package/server/migrations/2023_04_27_053456_create_waypoints_table.php

@@ -18,10 +18,10 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id')->nullable();
-            $table->string('company_uuid', 191)->nullable()->index('waypoints_company_uuid_foreign');
-            $table->string('place_uuid', 191)->nullable()->index('waypoints_place_uuid_foreign');
-            $table->string('payload_uuid', 191)->nullable()->index('waypoints_payload_uuid_foreign');
-            $table->string('tracking_number_uuid', 191)->nullable()->index();
+            $table->uuid('company_uuid')->nullable()->index('waypoints_company_uuid_foreign');
+            $table->uuid('place_uuid')->nullable()->index('waypoints_place_uuid_foreign');
+            $table->uuid('payload_uuid')->nullable()->index('waypoints_payload_uuid_foreign');
+            $table->uuid('tracking_number_uuid')->nullable()->index();
             $table->string('_import_id', 191)->nullable()->index();
             $table->string('type')->nullable();
             $table->integer('order')->nullable();

package/server/migrations/2023_04_27_053456_create_zones_table.php

@@ -18,8 +18,8 @@ return new class extends Migration
             $table->string('_key')->nullable();
             $table->string('uuid', 191)->nullable()->index();
             $table->string('public_id', 191)->nullable()->unique();
-            $table->string('company_uuid', 191)->nullable()->index('zones_company_uuid_foreign');
-            $table->string('service_area_uuid', 191)->nullable()->index();
+            $table->uuid('company_uuid')->nullable()->index('zones_company_uuid_foreign');
+            $table->uuid('service_area_uuid')->nullable()->index();
             $table->string('name')->nullable();
             $table->mediumText('description')->nullable();
             $table->polygon('border')->nullable();

package/server/migrations/2023_11_09_041807_add_status_column_to_fuel_reports_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddStatusColumnToFuelReportsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('fuel_reports', function (Blueprint $table) {
+            $table->string('status')->nullable()->after('meta');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('fuel_reports', function (Blueprint $table) {
+            $table->dropColumn('status');
+        });
+    }
+}

package/server/migrations/2023_11_15_062814_add_comments_column_and_resolved_at_column_to_vehicle_device_events_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddCommentsColumnAndResolvedAtColumnToVehicleDeviceEventsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('vehicle_device_events', function (Blueprint $table) {
+            $table->timestamp('resolved_at')->nullable()->after('reason')->index();
+            $table->mediumText('comment')->nullable()->after('reason');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('vehicle_device_events', function (Blueprint $table) {
+            $table->dropColumn(['comment', 'resolved_at']);
+        });
+    }
+}

package/server/migrations/2023_11_17_053001_add_category_uuid_to_entities_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddCategoryUuidToEntitiesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('entities', function (Blueprint $table) {
+            $table->foreignUuid('category_uuid')->nullable()->after('photo_uuid')->references('uuid')->on('categories');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('entities', function (Blueprint $table) {
+            $table->dropForeign(['category_uuid']);
+            $table->dropColumn(['category_uuid']);
+        });
+    }
+}

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

@@ -43,7 +43,7 @@ class DriverController extends Controller
     public function create(CreateDriverRequest $request)
     {
         // get request input
-        $input = $request->except(['name', 'password', 'email', 'phone', 'location', 'meta']);
+        $input = $request->except(['name', 'password', 'email', 'phone', 'location', 'altitude', 'heading', 'speed', 'meta']);
 
         // get user details for driver
         $userDetails                 = $request->only(['name', 'password', 'email', 'phone']);
@@ -118,7 +118,7 @@ class DriverController extends Controller
         }
 
         // get request input
-        $input = $request->except(['name', 'password', 'email', 'phone', 'location', 'meta']);
+        $input = $request->except(['name', 'password', 'email', 'phone', 'location', 'altitude', 'heading', 'speed', 'meta']);
 
         // get user details for driver
         $userDetails = $request->only(['name', 'password', 'email', 'phone']);

package/server/src/Http/Controllers/Api/v1/EntityController.php

@@ -41,6 +41,7 @@ class EntityController extends Controller
             'sku',
             'currency',
             'meta',
+            'supplier_uuid',
         ]);
 
         // payload assignment
@@ -126,6 +127,7 @@ class EntityController extends Controller
             'sku',
             'currency',
             'meta',
+            'supplier_uuid',
         ]);
 
         // payload assignment

package/server/src/Http/Controllers/Api/v1/VehicleController.php

@@ -24,7 +24,7 @@ class VehicleController extends Controller
     public function create(CreateVehicleRequest $request)
     {
         // get request input
-        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta']);
+        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta', 'location', 'altitude', 'heading', 'speed']);
         // make sure company is set
         $input['company_uuid'] = session('company');
 
@@ -90,7 +90,7 @@ class VehicleController extends Controller
         }
 
         // get request input
-        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta']);
+        $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta', 'location', 'altitude', 'heading', 'speed']);
 
         // vendor assignment
         if ($request->has('vendor')) {

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

@@ -13,7 +13,6 @@ use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
 use Fleetbase\Notifications\UserInvited;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
@@ -78,7 +77,7 @@ class DriverController extends FleetOpsController
 
                     // create driver profile for user
                     $input = collect($input)
-                        ->except(['name', 'password', 'email', 'phone', 'location', 'meta', 'avatar_uuid', 'photo_uuid'])
+                        ->except(['name', 'password', 'email', 'phone', 'meta', 'avatar_uuid', 'photo_uuid'])
                         ->filter()
                         ->toArray();
 
@@ -87,10 +86,6 @@ class DriverController extends FleetOpsController
                     $input['user_uuid']    = $existingUser->uuid;
                     $input['slug']         = $existingUser->slug;
 
-                    if ($request->missing('location')) {
-                        $input['location'] = new Point(0, 0);
-                    }
-
                     // create the profile
                     $driverProfile = Driver::create($input);
 
@@ -135,12 +130,12 @@ class DriverController extends FleetOpsController
                     }
 
                     $input = $input
-                        ->except(['name', 'password', 'email', 'phone', 'location', 'meta', 'avatar_uuid', 'photo_uuid'])
+                        ->except(['name', 'password', 'email', 'phone', 'meta', 'avatar_uuid', 'photo_uuid'])
                         ->filter()
                         ->toArray();
 
                     if (!isset($input['password'])) {
-                        $input['password'] = $userInput['phone'] ?? Str::random(14);
+                        $input['password'] = data_get($userInput, 'phone', Str::random(14));
                     }
 
                     $userInput['company_uuid'] = session('company');
@@ -164,10 +159,6 @@ class DriverController extends FleetOpsController
 
                     $input['user_uuid'] = $user->uuid;
                     $input['slug']      = $user->slug;
-
-                    if ($request->missing('location')) {
-                        $input['location'] = new Point(0, 0);
-                    }
                 },
                 function ($request, &$driver) {
                     $driver->load(['user']);
@@ -210,14 +201,14 @@ class DriverController extends FleetOpsController
                 $request,
                 $id,
                 function (&$request, &$driver, &$input) {
-                    $driver->load(['user']);
+                    $driver->load(['user'])->guard(['user_uuid']);
                     $input     = collect($input);
                     $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();
+                    $input     = $input->except(['name', 'password', 'email', 'phone', 'meta', 'avatar_uuid', 'photo_uuid'])->toArray();
 
                     $driver->user->update($userInput);
                     $driver->flushAttributesCache();

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

@@ -39,8 +39,6 @@ class OrderController extends FleetOpsController
     /**
      * Creates a record with request payload.
      *
-     * @param Illuminate\Http\Request $request
-     *
      * @return \Illuminate\Http\Response
      */
     public function createRecord(Request $request)
@@ -319,7 +317,7 @@ class OrderController extends FleetOpsController
     public function start(Request $request)
     {
         /**
-         * @var \Fleetbase\Models\Order
+         * @var \Fleetbase\FleetOps\Models\Order
          */
         $order = Order::where('uuid', $request->input('order'))->withoutGlobalScopes()->first();
 

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

@@ -37,6 +37,16 @@ class ContactFilter extends Filter
         $this->builder->searchWhere('public_id', $publicId);
     }
 
+    public function name(?string $name)
+    {
+        $this->builder->searchWhere('name', $name);
+    }
+
+    public function title(?string $title)
+    {
+        $this->builder->searchWhere('title', $title);
+    }
+
     public function type(?string $type)
     {
         $this->builder->searchWhere('type', $type);

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

@@ -46,7 +46,7 @@ class FleetFilter extends Filter
         $this->builder->whereHas(
             'zone',
             function ($query) use ($zone) {
-                $query->where('uuid', $zone);
+                $query->where('zone_uuid', $zone);
             }
         );
     }
@@ -59,6 +59,8 @@ class FleetFilter extends Filter
                 $query->where('uuid', $fleet);
             }
         );
+
+        $this->builder->searchWhere('parent_fleet_uuid', $fleet);
     }
 
     public function vendor(?string $vendor)
@@ -71,11 +73,6 @@ class FleetFilter extends Filter
         );
     }
 
-    public function internalId(?string $internalId)
-    {
-        $this->builder->searchWhere('internal_id', $internalId);
-    }
-
     public function publicId(?string $publicId)
     {
         $this->builder->searchWhere('public_id', $publicId);
@@ -86,6 +83,11 @@ class FleetFilter extends Filter
         $this->builder->searchWhere('task', $task);
     }
 
+    public function name(?string $name)
+    {
+        $this->builder->searchWhere('name', $name);
+    }
+
     public function status(?string $status)
     {
         $this->builder->searchWhere('status', $status);

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

@@ -23,11 +23,23 @@ class FuelReportFilter extends Filter
         $this->builder->searchWhere('public_id', $publicId);
     }
 
+    public function volume(?string $volume)
+    {
+        $this->builder->searchWhere('volume', $volume);
+    }
+
+    public function odometer(?string $odometer)
+    {
+        $this->builder->searchWhere('odometer', $odometer);
+    }
+
     public function reporter(?string $reporter)
     {
         $this->builder->whereHas('reportedBy', function ($q) use ($reporter) {
             if (Str::isUuid($reporter)) {
                 $q->where('uuid', $reporter);
+            } elseif (Utils::isPublicId($reporter)) {
+                $q->where('public_id', $reporter);
             } else {
                 $q->search($reporter);
             }
@@ -55,4 +67,43 @@ class FuelReportFilter extends Filter
             $this->builder->whereDate('updated_at', $updatedAt);
         }
     }
+
+    public function driver(?string $driver)
+    {
+        $this->builder->whereHas('driver', function ($q) use ($driver) {
+            if (Str::isUuid($driver)) {
+                $q->where('uuid', $driver);
+            } elseif (Utils::isPublicId($driver)) {
+                $q->where('public_id', $driver);
+            } else {
+                $q->search($driver);
+            }
+        });
+    }
+
+    public function vehicle(?string $vehicle)
+    {
+        $this->builder->whereHas('vehicle', function ($q) use ($vehicle) {
+            if (Str::isUuid($vehicle)) {
+                $q->where('uuid', $vehicle);
+            } elseif (Utils::isPublicId($vehicle)) {
+                $q->where('public_id', $vehicle);
+            } else {
+                $q->search($vehicle);
+            }
+        });
+    }
+
+    public function status($status)
+    {
+        if (Str::contains($status, ',')) {
+            $status = explode(',', $status);
+        }
+
+        if (is_array($status)) {
+            $this->builder->whereIn('status', $status);
+        } else {
+            $this->builder->where('status', $status);
+        }
+    }
 }

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

@@ -23,24 +23,80 @@ class IssueFilter extends Filter
         $this->builder->searchWhere('public_id', $publicId);
     }
 
+    public function priority($priority)
+    {
+        if (Str::contains($priority, ',')) {
+            $priority = explode(',', $priority);
+        }
+
+        if (is_array($priority)) {
+            $this->builder->whereIn('priority', $priority);
+        } else {
+            $this->builder->where('priority', $priority);
+        }
+    }
+
+    public function status($status)
+    {
+        if (Str::contains($status, ',')) {
+            $status = explode(',', $status);
+        }
+
+        if (is_array($status)) {
+            $this->builder->whereIn('status', $status);
+        } else {
+            $this->builder->where('status', $status);
+        }
+    }
+
+    public function assignee(?string $assignee)
+    {
+        $this->builder->whereHas('assignedTo', function ($q) use ($assignee) {
+            if (Str::isUuid($assignee)) {
+                $q->where('uuid', $assignee);
+            } elseif (Utils::isPublicId($assignee)) {
+                $q->where('public_id', $assignee);
+            } else {
+                $q->search($assignee);
+            }
+        });
+    }
+
     public function reporter(?string $reporter)
     {
         $this->builder->whereHas('reportedBy', function ($q) use ($reporter) {
             if (Str::isUuid($reporter)) {
                 $q->where('uuid', $reporter);
+            } elseif (Utils::isPublicId($reporter)) {
+                $q->where('public_id', $reporter);
             } else {
                 $q->search($reporter);
             }
         });
     }
 
-    public function assignee(?string $assignee)
+    public function driver(?string $driver)
     {
-        $this->builder->whereHas('assignedBy', function ($q) use ($assignee) {
-            if (Str::isUuid($assignee)) {
-                $q->where('uuid', $assignee);
+        $this->builder->whereHas('driver', function ($q) use ($driver) {
+            if (Str::isUuid($driver)) {
+                $q->where('uuid', $driver);
+            } elseif (Utils::isPublicId($driver)) {
+                $q->where('public_id', $driver);
             } else {
-                $q->search($assignee);
+                $q->search($driver);
+            }
+        });
+    }
+
+    public function vehicle(?string $vehicle)
+    {
+        $this->builder->whereHas('vehicle', function ($q) use ($vehicle) {
+            if (Str::isUuid($vehicle)) {
+                $q->where('uuid', $vehicle);
+            } elseif (Utils::isPublicId($vehicle)) {
+                $q->where('public_id', $vehicle);
+            } else {
+                $q->search($vehicle);
             }
         });
     }

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

@@ -20,14 +20,14 @@ class PlaceFilter extends Filter
         $this->builder->search($searchQuery);
     }
 
-    public function internalId(?string $internalId)
+    public function publicId(?string $publicId)
     {
-        $this->builder->searchWhere('internal_id', $internalId);
+        $this->builder->searchWhere('public_id', $publicId);
     }
 
-    public function publicId(?string $publicId)
+    public function postalCode(?string $postalCode)
     {
-        $this->builder->searchWhere('public_id', $publicId);
+        $this->builder->searchWhere('postal_code', $postalCode);
     }
 
     public function phone(?string $phone)
@@ -35,9 +35,29 @@ class PlaceFilter extends Filter
         $this->builder->searchWhere('phone', $phone);
     }
 
-    public function email(?string $email)
+    public function city(?string $city)
+    {
+        $this->builder->searchWhere('city', $city);
+    }
+
+    public function neighborhood(?string $neighborhood)
+    {
+        $this->builder->searchWhere('neighborhood', $neighborhood);
+    }
+
+    public function state(?string $state)
+    {
+        $this->builder->searchWhere('province', $state);
+    }
+
+    public function name(?string $name)
     {
-        $this->builder->searchWhere('email', $email);
+        $this->builder->searchWhere('name', $name);
+    }
+
+    public function address(?string $address)
+    {
+        $this->builder->searchWhere(['street1', 'street2'], $address);
     }
 
     public function country(?string $country)
@@ -45,6 +65,28 @@ class PlaceFilter extends Filter
         $this->builder->where('country', $country);
     }
 
+    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);
+        }
+    }
+
     public function within($within)
     {
         // search for places within a radius of center coordinates

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

@@ -17,9 +17,9 @@ class VehicleFilter extends Filter
         $this->builder->search($query);
     }
 
-    public function name(?string $name)
+    public function display_name(?string $display_name)
     {
-        $this->builder->searchWhere(['year', 'model_make_display', 'make', 'model', 'trim', 'plate_number'], $name);
+        $this->builder->searchWhere(['year', 'make', 'model', 'plate_number'], $display_name);
     }
 
     public function vin(?string $vin)
@@ -37,14 +37,19 @@ class VehicleFilter extends Filter
         $this->builder->searchWhere('plate_number', $plateNumber);
     }
 
-    public function vehicleMake(?string $make)
+    public function vehicleMake(?string $vehicleMake)
     {
-        $this->builder->searchWhere('make', $make);
+        $this->builder->searchWhere('make', $vehicleMake);
     }
 
-    public function vehicleModel(?string $model)
+    public function vehicleModel(?string $vehicle_model)
     {
-        $this->builder->searchWhere('model', $model);
+        $this->builder->searchWhere('model', $vehicle_model);
+    }
+
+    public function vehicleYear(?string $vehicleYear)
+    {
+        $this->builder->searchWhere('year', $vehicleYear);
     }
 
     public function driver(?string $driverId)
@@ -57,6 +62,16 @@ class VehicleFilter extends Filter
         );
     }
 
+    public function vendor(?string $vendorId)
+    {
+        $this->builder->whereHas(
+            'vendor',
+            function ($query) use ($vendorId) {
+                $query->where('uuid', $vendorId);
+            }
+        );
+    }
+
     public function driverUuid(?string $driverId)
     {
         $this->builder->whereHas(