@fleetbase/fleetops-engine 0.6.45 → 0.6.46

package/server/src/Orchestration/Engines/VroomOrchestrationEngine.php

@@ -20,13 +20,16 @@ use Illuminate\Support\Facades\Log;
  *
  * Resolution order for configuration:
  *
- *   1. Company-level setting  — `Setting::lookupCompany('vroom', 'api_key')`
- *      (written by the fleetbase/vroom extension settings page, if installed)
- *   2. Environment variable   — `VROOM_API_KEY`
- *   3. No key                 — requests are sent without an api_key parameter
+ *   1. Company-level setting  — organization override
+ *   2. System-level setting   — admin default
+ *   3. Environment/config fallback
+ *   4. No key                 — requests are sent without an api_key parameter
  *      (works for self-hosted VROOM instances that do not require auth)
  *
- *   Base URI: `config('vroom.base_uri')` → `VROOM_HOST` env → default production URL
+ *   Base URI and endpoint mode follow the same precedence, with endpoint mode
+ *   controlling whether requests are posted to `/solve` or directly to the
+ *   configured binary host.
+ *
  *   Timeout:  `VROOM_TIMEOUT` env (default 30 s)
  *
  * The VROOM HTTP API endpoint used is `POST {base_uri}/solve`, matching the
@@ -101,27 +104,17 @@ class VroomOrchestrationEngine implements OrchestrationEngineInterface
         unset($job);
 
         // ── Resolve connection config ─────────────────────────────────────────
-        // Base URI: prefer the vroom extension config, then VROOM_HOST env, then
-        // the production verso-optim.com hosted service.
-        $baseUri = config('vroom.base_uri', env('VROOM_HOST', 'https://api.verso-optim.com/vrp/v1'));
+        $baseUri = $this->resolveVroomBaseUri();
+        $endpointMode = $this->resolveVroomEndpointMode();
         $timeout = (int) env('VROOM_TIMEOUT', 30);
 
-        // ── Resolve API key ───────────────────────────────────────────────────
-        // 1. Company-level setting (written by fleetbase/vroom extension UI)
-        // 2. VROOM_API_KEY env var
-        // 3. null — no key appended (for self-hosted instances)
-        $apiKey = null;
-        try {
-            $apiKey = Setting::lookupCompany('vroom', ['api_key' => null])['api_key'] ?? null;
-        } catch (\Throwable) {
-            // Setting table may not exist in minimal installs — ignore
-        }
-        if (!$apiKey) {
-            $apiKey = env('VROOM_API_KEY');
-        }
+        $apiKey = $this->resolveVroomApiKey();
 
-        // Build the solve URL — append api_key as query param when present
-        $solveUrl = rtrim($baseUri, '/') . '/solve';
+        // Build the solve URL — append api_key as query param when present.
+        $solveUrl = rtrim($baseUri, '/');
+        if ($endpointMode !== 'binary') {
+            $solveUrl .= '/solve';
+        }
         if ($apiKey) {
             $solveUrl .= '?api_key=' . urlencode($apiKey);
         }
@@ -189,4 +182,47 @@ class VroomOrchestrationEngine implements OrchestrationEngineInterface
             'summary'     => $vroomResult['summary'] ?? [],
         ];
     }
+
+    protected function resolveVroomBaseUri(): string
+    {
+        return $this->resolveVroomSetting('api_host', config('vroom.base_uri', env('VROOM_HOST', 'https://api.verso-optim.com/vrp/v1')));
+    }
+
+    protected function resolveVroomApiKey(): ?string
+    {
+        return $this->resolveVroomSetting('api_key', env('VROOM_API_KEY'));
+    }
+
+    protected function resolveVroomEndpointMode(): string
+    {
+        return $this->resolveVroomSetting('endpoint_mode', config('vroom.endpoint_mode', env('VROOM_ENDPOINT_MODE', 'saas')));
+    }
+
+    protected function resolveVroomSetting(string $key, $default = null)
+    {
+        try {
+            $organizationValue = data_get(Setting::lookupCompany('vroom', []), $key);
+            if ($this->hasConfiguredValue($organizationValue)) {
+                return $organizationValue;
+            }
+
+            $systemValue = data_get(Setting::lookup('vroom', []), $key);
+            if ($this->hasConfiguredValue($systemValue)) {
+                return $systemValue;
+            }
+        } catch (\Throwable) {
+            // Setting table may not exist in minimal installs — ignore
+        }
+
+        return $default;
+    }
+
+    protected function hasConfiguredValue($value): bool
+    {
+        if (is_string($value)) {
+            return trim($value) !== '';
+        }
+
+        return $value !== null;
+    }
 }

package/server/src/Support/Utils.php

@@ -3,9 +3,9 @@
 namespace Fleetbase\FleetOps\Support;
 
 use Fleetbase\FleetOps\Flow\Activity;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Models\Company;
 use Fleetbase\Models\Setting;
-use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Utils as FleetbaseUtils;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
@@ -45,7 +45,7 @@ class Utils extends FleetbaseUtils
 
         if (filled($companyUuid)) {
             $accountingSettings = Setting::lookup('company.' . $companyUuid . '.ledger.accounting-settings', []);
-            $baseCurrency = data_get($accountingSettings, 'base_currency');
+            $baseCurrency       = data_get($accountingSettings, 'base_currency');
 
             if (filled($baseCurrency)) {
                 return strtoupper($baseCurrency);
@@ -244,6 +244,10 @@ class Utils extends FleetbaseUtils
             $coordinates = $coordinates->getSpatialValue();
         }
 
+        if ($coordinates instanceof \Illuminate\Database\Query\Expression) {
+            $coordinates = static::extractPointWktFromQueryExpression($coordinates) ?? $coordinates;
+        }
+
         if ($coordinates instanceof Point) {
             $latitude  = $coordinates->getLat();
             $longitude = $coordinates->getLng();
@@ -369,6 +373,32 @@ class Utils extends FleetbaseUtils
         return new Point((float) $latitude, (float) $longitude);
     }
 
+    /**
+     * Attempts to extract a WKT POINT string from a query expression.
+     */
+    protected static function extractPointWktFromQueryExpression(\Illuminate\Database\Query\Expression $expression): ?string
+    {
+        $expressionValue = null;
+
+        if (method_exists($expression, 'getValue')) {
+            try {
+                $expressionValue = $expression->getValue(DB::connection()->getQueryGrammar());
+            } catch (\Throwable $e) {
+                $expressionValue = null;
+            }
+        }
+
+        if (!is_string($expressionValue) || blank($expressionValue)) {
+            return null;
+        }
+
+        if (preg_match("/POINT\\(\\s*([-+]?\\d*\\.?\\d+)\\s+([-+]?\\d*\\.?\\d+)\\s*\\)/i", $expressionValue, $matches)) {
+            return sprintf('POINT(%s %s)', $matches[1], $matches[2]);
+        }
+
+        return null;
+    }
+
     /**
      * Always return spatial point.
      *
@@ -414,6 +444,10 @@ class Utils extends FleetbaseUtils
             $coordinates = $coordinates->getSpatialValue();
         }
 
+        if ($coordinates instanceof \Illuminate\Database\Query\Expression) {
+            $coordinates = static::extractPointWktFromQueryExpression($coordinates) ?? $coordinates;
+        }
+
         if ($coordinates instanceof Point) {
             return $coordinates;
         }

package/server/src/routes.php

@@ -546,6 +546,10 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                                         $router->post('notification-settings', 'SettingController@saveNotificationSettings');
                                         $router->get('routing-settings', 'SettingController@getRoutingSettings');
                                         $router->post('routing-settings', 'SettingController@saveRoutingSettings');
+                                        $router->get('map', 'SettingController@getMapSettings');
+                                        $router->post('map', 'SettingController@saveMapSettings');
+                                        $router->get('admin-map', 'SettingController@getAdminMapSettings');
+                                        $router->post('admin-map', 'SettingController@saveAdminMapSettings');
                                         $router->get('scheduling-settings', 'SettingController@getSchedulingSettings');
                                         $router->post('scheduling-settings', 'SettingController@saveSchedulingSettings');
                                         $router->get('orchestrator-settings', 'SettingController@getOrchestratorSettings');