Move check to settings model

Author: nolanpro

ProcessMaker/Models/Setting.php

@@ -5,6 +5,8 @@
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Validation\Rule;
 use Log;
 use ProcessMaker\Cache\Settings\SettingCacheFactory;
@@ -73,6 +75,12 @@ class Setting extends ProcessMakerModel implements HasMedia, PrometheusMetricInt
 
     public const SESSION_CONTROL_GROUP = 'Session Control';
 
+    private static bool $redisAvailable = false;
+
+    private static bool $settingsTableExists = false;
+
+    private static bool $readyToUseSettingsDatabase = false;
+
     /**
      * The attributes that aren't mass assignable.
      *
@@ -150,6 +158,10 @@ public static function messages()
      */
     public static function byKey(string $key)
     {
+        if (!self::readyToUseSettingsDatabase()) {
+            return null;
+        }
+
         $settingCache = SettingCacheFactory::getSettingsCache();
         $settingKey = $settingCache->createKey([
             'key' => $key,
@@ -520,4 +532,51 @@ public function getPrometheusMetricLabel(): string
     {
         return 'settings.' . $this->key;
     }
+
+    public static function readyToUseSettingsDatabase()
+    {
+        if (!self::$readyToUseSettingsDatabase) {
+            self::$readyToUseSettingsDatabase =
+                app('tenant-resolved') &&
+                self::databaseAvailable() &&
+                self::redisAvailable() &&
+                self::settingsTableExists();
+        }
+
+        return self::$readyToUseSettingsDatabase;
+    }
+
+    private static function databaseAvailable()
+    {
+        try {
+            DB::connection()->getPdo();
+
+            return true;
+        } catch (\PDOException $e) {
+            return false;
+        }
+    }
+
+    private static function redisAvailable()
+    {
+        if (!self::$redisAvailable) {
+            try {
+                Redis::connection()->ping();
+                self::$redisAvailable = true;
+            } catch (\Exception $e) {
+                self::$redisAvailable = false;
+            }
+        }
+
+        return self::$redisAvailable;
+    }
+
+    private static function settingsTableExists()
+    {
+        if (!self::$settingsTableExists) {
+            self::$settingsTableExists = Schema::hasTable('settings');
+        }
+
+        return self::$settingsTableExists;
+    }
 }

ProcessMaker/Repositories/SettingsConfigRepository.php

@@ -4,19 +4,10 @@
 
 use Illuminate\Config\Repository;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Redis;
-use Illuminate\Support\Facades\Schema;
 use ProcessMaker\Models\Setting;
 
 class SettingsConfigRepository extends Repository
 {
-    private bool $redisAvailable = false;
-
-    private bool $settingsTableExists = false;
-
-    private bool $readyToUseSettingsDatabase = false;
-
     /**
      * Determine if the given configuration value exists.
      *
@@ -86,7 +77,7 @@ public function getMany($keys)
 
     private function getFromSettings($key)
     {
-        if (!$this->readyToUseSettingsDatabase()) {
+        if (!Setting::readyToUseSettingsDatabase()) {
             return null;
         }
 
@@ -113,51 +104,4 @@ private function getFromSettings($key)
 
         return null;
     }
-
-    private function readyToUseSettingsDatabase()
-    {
-        if (!$this->readyToUseSettingsDatabase) {
-            $this->readyToUseSettingsDatabase =
-                app('tenant-resolved') &&
-                $this->databaseAvailable() &&
-                $this->redisAvailable() &&
-                $this->settingsTableExists();
-        }
-
-        return $this->readyToUseSettingsDatabase;
-    }
-
-    private function databaseAvailable()
-    {
-        try {
-            DB::connection()->getPdo();
-
-            return true;
-        } catch (\PDOException $e) {
-            return false;
-        }
-    }
-
-    private function redisAvailable()
-    {
-        if (!$this->redisAvailable) {
-            try {
-                Redis::connection()->ping();
-                $this->redisAvailable = true;
-            } catch (\Exception $e) {
-                $this->redisAvailable = false;
-            }
-        }
-
-        return $this->redisAvailable;
-    }
-
-    private function settingsTableExists()
-    {
-        if (!$this->settingsTableExists) {
-            $this->settingsTableExists = Schema::hasTable('settings');
-        }
-
-        return $this->settingsTableExists;
-    }
 }