@fleetbase/fleetops-engine 0.4.19 → 0.4.21

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

@@ -0,0 +1,18 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\Http\Filter\Filter;
+
+class TrackingNumberFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+}

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

@@ -11,6 +11,11 @@ class TrackingStatusFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function trackingNumber(string $trackingNumber)
     {
         $this->builder->whereHas('trackingNumber', function ($query) use ($trackingNumber) {

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

@@ -12,6 +12,11 @@ class VehicleFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $query)
     {
         $this->builder->search($query);

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

@@ -12,6 +12,11 @@ class VendorFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->search($searchQuery);

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

@@ -10,4 +10,9 @@ class ZoneFilter extends Filter
     {
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
 }

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

@@ -39,6 +39,7 @@ class Order extends FleetbaseResource
             'service_quote_uuid'   => $this->when(Http::isInternalRequest(), $this->service_quote_uuid),
             'has_driver_assigned'  => $this->when(Http::isInternalRequest(), $this->has_driver_assigned),
             'is_scheduled'         => $this->when(Http::isInternalRequest(), $this->is_scheduled),
+            'order_config_id'      => $this->when(Http::isInternalRequest(), $this->order_config_id),
             'order_config'         => $this->when(Http::isInternalRequest(), $this->whenLoaded('orderConfig', $this->orderConfig), data_get($this->orderConfig, 'public_id')),
             'custom_field_values'  => $this->when(Http::isInternalRequest(), $this->customFieldValues),
             'customer'             => $this->setCustomerType(Resolve::resourceForMorph($this->customer_type, $this->customer_uuid)),

package/server/src/Models/Driver.php

@@ -157,7 +157,7 @@ class Driver extends Model
      *
      * @var array
      */
-    protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet', 'photo_uuid', 'avatar_uuid'];
+    protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet', 'photo_uuid', 'avatar_uuid', 'avatar_value'];
 
     /**
      * Get the activity log options for the model.

package/server/src/Models/Order.php

@@ -1505,13 +1505,11 @@ class Order extends Model
      *
      * @return Order the updated Order instance
      */
-    public function setDistanceAndTime(): Order
+    public function setDistanceAndTime($options = []): Order
     {
         $origin      = $this->getCurrentOriginPosition();
         $destination = $this->getDestinationPosition();
-
-        $matrix = Utils::getDrivingDistanceAndTime($origin, $destination);
-
+        $matrix      = Utils::getDrivingDistanceAndTime($origin, $destination, $options);
         if ($origin === null || $destination === null) {
             return $this;
         }

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -48,6 +48,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         \Fleetbase\FleetOps\Console\Commands\TrackOrderDistanceAndTime::class,
         \Fleetbase\FleetOps\Console\Commands\FixDriverCompanies::class,
         \Fleetbase\FleetOps\Console\Commands\FixLegacyOrderConfigs::class,
+        \Fleetbase\FleetOps\Console\Commands\FixInvalidPolymorphicRelationTypeNamespaces::class,
     ];
 
     /**
@@ -80,9 +81,9 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         $this->registerObservers();
         $this->registerCommands();
         $this->scheduleCommands(function ($schedule) {
-            $schedule->command('fleetops:dispatch-orders')->everyMinute();
-            $schedule->command('fleetops:dispatch-adhoc')->everyMinute();
-            $schedule->command('fleetops:update-estimations')->everyFifteenMinutes();
+            $schedule->command('fleetops:dispatch-orders')->everyMinute()->withoutOverlapping()->storeOutputInDb();
+            $schedule->command('fleetops:dispatch-adhoc')->everyMinute()->withoutOverlapping()->storeOutputInDb();
+            $schedule->command('fleetops:update-estimations')->everyFiveMinutes()->withoutOverlapping();
         });
         $this->registerNotifications();
         $this->registerExpansionsFrom(__DIR__ . '/../Expansions');

package/server/src/Support/Algo.php

@@ -28,28 +28,4 @@ class Algo
 
         return $result;
     }
-
-    /**
-     * Calculates driving distance and time using Google distance matric.
-     *
-     * @return array
-     */
-    public static function calculateDrivingDistanceAndTime($lat1, $long1, $lat2, $long2)
-    {
-        $url =
-            'https://maps.googleapis.com/maps/api/distancematrix/json?origins=' . $lat1 . ',' . $long1 . '&destinations=' . $lat2 . ',' . $long2 . '&mode=driving&key=' . config('services.google.key');
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_PROXYPORT, 3128);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-        $response = curl_exec($ch);
-        curl_close($ch);
-        $response_a = json_decode($response, true);
-        $dist       = $response_a['rows'][0]['elements'][0]['distance']['value'];
-        $time       = $response_a['rows'][0]['elements'][0]['duration']['value'];
-
-        return ['distance' => $dist, 'time' => $time];
-    }
 }

package/server/src/Support/DistanceMatrix.php

@@ -14,7 +14,7 @@ namespace Fleetbase\FleetOps\Support;
  * @license  https://opensource.org/licenses/MIT MIT License
  * @author   Ronald A. Richardson
  */
-class DistanceMatrix
+class DistanceMatrix implements \JsonSerializable
 {
     public ?float $distance;
     public ?float $time;
@@ -24,4 +24,12 @@ class DistanceMatrix
         $this->distance = $distance;
         $this->time     = $time;
     }
+
+    public function jsonSerialize()
+    {
+        return [
+            'distance' => $this->distance,
+            'time'     => $this->time,
+        ];
+    }
 }

package/server/src/Support/OSRM.php

@@ -35,6 +35,13 @@ class OSRM
         }
 
         $coordinates = "{$start->getLng()},{$start->getLat()};{$end->getLng()},{$end->getLat()}";
+
+        return static::getRouteFromCoordinatesString($coordinates, $queryParameters);
+    }
+
+    public static function getRouteFromCoordinatesString(string $coordinates, array $queryParameters = [])
+    {
+        $cacheKey    = 'getRouteFromCoordinatesString:' . md5($coordinates . serialize($queryParameters));
         $url         = self::$baseUrl . "/route/v1/driving/{$coordinates}";
         $response    = Http::get($url, $queryParameters);
         $data        = $response->json();