Merge pull request #150 from fleetbase/dev-v1.6.11

v1.6.11 ~ optimized environment mapper settings merge

Author: roncodes

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/core-api",
-    "version": "1.6.10",
+    "version": "1.6.11",
     "description": "Core Framework and Resources for Fleetbase API",
     "keywords": [
         "fleetbase",

src/Http/Controllers/Internal/v1/SettingController.php

@@ -11,6 +11,8 @@
 use Illuminate\Http\Request;
 use Illuminate\Notifications\AnonymousNotifiable;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Storage;
@@ -95,6 +97,9 @@ public function saveFilesystemConfig(AdminRequest $request)
         Setting::configureSystem('filesystem.gcs', $gcs);
         Setting::configureSystem('filesystem.s3', array_merge(config('filesystems.disks.s3', []), $s3));
 
+        // Refresh config
+        $this->refreshConfigCache();
+
         return response()->json(['status' => 'OK']);
     }
 
@@ -273,6 +278,9 @@ public function saveMailConfig(AdminRequest $request)
         Setting::configureSystem('services.sendgrid', $sendgrid);
         Setting::configureSystem('services.resend', $resend);
 
+        // Refresh config
+        $this->refreshConfigCache();
+
         return response()->json(['status' => 'OK']);
     }
 
@@ -379,6 +387,9 @@ public function saveQueueConfig(AdminRequest $request)
         Setting::configureSystem('queue.sqs', array_merge(config('queue.connections.sqs'), $sqs));
         Setting::configureSystem('queue.beanstalkd', array_merge(config('queue.connections.beanstalkd'), $beanstalkd));
 
+        // Refresh config
+        $this->refreshConfigCache();
+
         return response()->json(['status' => 'OK']);
     }
 
@@ -471,6 +482,9 @@ public function saveServicesConfig(AdminRequest $request)
         Setting::configureSystem('services.twilio', array_merge(config('services.twilio', []), $twilio));
         Setting::configureSystem('services.sentry', array_merge(config('sentry', []), $sentry));
 
+        // Refresh config
+        $this->refreshConfigCache();
+
         return response()->json(['status' => 'OK']);
     }
 
@@ -520,6 +534,9 @@ public function saveNotificationChannelsConfig(AdminRequest $request)
         Setting::configureSystem('broadcasting.apn', array_merge(config('broadcasting.connections.apn', []), $apn));
         Setting::configureSystem('firebase.app', array_merge(config('firebase.projects.app', []), $firebase));
 
+        // Refresh config
+        $this->refreshConfigCache();
+
         return response()->json(['status' => 'OK']);
     }
 
@@ -836,4 +853,17 @@ public function testSocketcluster(AdminRequest $request)
             ]
         );
     }
+
+    /**
+     * Refresh config cache.
+     */
+    private function refreshConfigCache()
+    {
+        try {
+            Artisan::call('config:clear');
+            Artisan::call('config:cache');
+        } catch (\Exception $e) {
+            Log::error('Failed to refresh config cache.', ['error' => $e->getMessage()]);
+        }
+    }
 }

src/Http/Middleware/MergeConfigFromSettings.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Fleetbase\Http\Middleware;
+
+use Fleetbase\Support\EnvironmentMapper;
+use Illuminate\Http\Request;
+
+class MergeConfigFromSettings
+{
+    public function handle(Request $request, \Closure $next)
+    {
+        EnvironmentMapper::mergeConfigFromSettingsOptimized();
+
+        return $next($request);
+    }
+}

src/Providers/CoreServiceProvider.php

@@ -39,6 +39,7 @@ class CoreServiceProvider extends ServiceProvider
     public $globalMiddlewares = [
         \Fleetbase\Http\Middleware\RequestTimer::class,
         \Fleetbase\Http\Middleware\ResetJsonResourceWrap::class,
+        \Fleetbase\Http\Middleware\MergeConfigFromSettings::class,
     ];
 
     /**
@@ -181,7 +182,7 @@ public function registerCustomBladeComponents()
      */
     public function mergeConfigFromSettings()
     {
-        EnvironmentMapper::mergeConfigFromSettings();
+        EnvironmentMapper::mergeConfigFromSettingsOptimized();
     }
 
     /**

src/Support/EnvironmentMapper.php

@@ -4,6 +4,7 @@
 
 use Fleetbase\Models\Setting;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 
 /**
  * The EnvironmentMapper class is responsible for mapping system settings stored in the database
@@ -216,4 +217,107 @@ protected static function setDefaultMailFrom(): void
             config()->set('mail.from.address', Utils::getDefaultMailFromAddress());
         }
     }
+
+    /**
+     * Optimized merge of database settings into application config.
+     *
+     * Batch-fetches all relevant setting records in one query, builds
+     * a combined config payload, and applies it with a single config() call.
+     */
+    public static function mergeConfigFromSettingsOptimized(): void
+    {
+        if (Setting::doesntHaveConnection()) {
+            return;
+        }
+
+        // Build DB keys for env vars (prefixed with 'system.')
+        $envDbKeys = array_map(fn ($path) => Str::startsWith($path, 'system.')
+            ? $path
+            : 'system.' . $path, array_values(static::$environmentVariables)
+        );
+
+        // Build DB keys for settings (use first two segments for nested keys)
+        $settingDbKeys = array_map(function ($map) {
+            $key      = $map['settingsKey'];
+            $segments = explode('.', $key);
+            if (count($segments) >= 3) {
+                return 'system.' . $segments[0] . '.' . $segments[1];
+            }
+
+            return Str::startsWith($key, 'system.')
+                ? $key
+                : 'system.' . $key;
+        }, static::$settings);
+
+        // Unique list of keys to fetch
+        $fetchKeys = array_unique(array_merge($envDbKeys, $settingDbKeys));
+
+        // Fetch all values in one query
+        $dbSettings = Setting::whereIn('key', $fetchKeys)
+            ->pluck('value', 'key')
+            ->all();
+
+        // Apply environment variables
+        static::setEnvironmentVariablesOptimized($dbSettings);
+
+        // Build new config payload
+        $newConfig = [];
+        foreach (static::$settings as $map) {
+            $settingsKey = $map['settingsKey'];
+            $configKey   = $map['configKey'];
+            $segments    = explode('.', $settingsKey);
+
+            // Determine the DB key we fetched
+            $dbKey = count($segments) >= 3
+                ? 'system.' . $segments[0] . '.' . $segments[1]
+                : 'system.' . $settingsKey;
+
+            if (!isset($dbSettings[$dbKey])) {
+                continue;
+            }
+
+            $rawValue = $dbSettings[$dbKey];
+
+            // Extract nested subkey if needed
+            $value = count($segments) >= 3
+                ? data_get($rawValue, implode('.', array_slice($segments, 2)))
+                : $rawValue;
+
+            // Merge arrays rather than overwrite
+            if (is_array($value) && is_array(config($configKey))) {
+                $value = array_merge(config($configKey), array_filter($value));
+            }
+
+            $newConfig[$configKey] = $value;
+        }
+
+        // Apply all config changes at once
+        if (!empty($newConfig)) {
+            config($newConfig);
+        }
+
+        // Ensure default mail 'from' fallback
+        static::setDefaultMailFrom();
+    }
+
+    /**
+     * Sets environment variables using pre-fetched DB settings.
+     *
+     * @param array<string,mixed> $dbSettings Map of DB key => raw value
+     */
+    protected static function setEnvironmentVariablesOptimized(array $dbSettings): void
+    {
+        foreach (static::$environmentVariables as $envVar => $configPath) {
+            $dbKey = Str::startsWith($configPath, 'system.')
+                ? $configPath
+                : 'system.' . $configPath;
+
+            if (empty(env($envVar)) && isset($dbSettings[$dbKey])) {
+                $value = $dbSettings[$dbKey];
+                if (is_string($value) && $value !== '') {
+                    putenv(sprintf('%s="%s"', $envVar, addcslashes($value, '"')));
+                }
+            }
+        }
+    }
 }

src/Support/Telemetry.php

@@ -228,22 +228,7 @@ public static function isSourceModified(): bool
      */
     public static function getCurrentCommitHash(): ?string
     {
-        try {
-            $hash = trim(shell_exec('git rev-parse HEAD'));
-
-            if (preg_match('/^[a-f0-9]{40}$/', $hash)) {
-                return $hash;
-            }
-        } catch (\Throwable $e) {
-            Log::error('[Telemetry] Git hash lookup failed.', ['error' => $e->getMessage()]);
-        }
-
-        // Fallback: maybe allow CURRENT_HASH file in rare non-git builds
-        $path = base_path('../CURRENT_HASH');
-        if (file_exists($path)) {
-            return trim(file_get_contents($path));
-        }
-
+        // @todo Implement a method to get current git hash
         return null;
     }