Updated the base engine class

Signed-off-by: Jan Henckens <jan@henckens.be>

Author: janhenckens

src/engines/Engine.php

@@ -12,7 +12,7 @@ abstract class Engine
     /** @var ScoutIndex */
     public $scoutIndex;
 
-    abstract public function __construct(ScoutIndex $scoutIndex, SearchClient $algolia);
+    abstract public function __construct(ScoutIndex $scoutIndex, ?int $siteId = null);
 
     abstract public function update($models);
 

src/models/Settings.php

@@ -125,14 +125,26 @@ public function getApplicationId(?int $siteId = null): string
     {
         $siteHandle = $siteId ? Craft::$app->getSites()->getSiteById($siteId)->handle : null;
         $value = ConfigHelper::localizedValue($this->application_id, $siteHandle);
-        return App::parseEnv($value);
+        $parsedValue = App::parseEnv($value);
+        
+        if (empty($parsedValue)) {
+            throw new Exception("Scout application_id is empty for site " . ($siteHandle ?: 'default') . " (siteId: $siteId). Check your Scout plugin settings.");
+        }
+        
+        return $parsedValue;
     }
 
     public function getAdminApiKey(?int $siteId = null): string
     {
         $siteHandle = $siteId ? Craft::$app->getSites()->getSiteById($siteId)->handle : null;
         $value = ConfigHelper::localizedValue($this->admin_api_key, $siteHandle);
-        return App::parseEnv($value);
+        $parsedValue = App::parseEnv($value);
+        
+        if (empty($parsedValue)) {
+            throw new Exception("Scout admin_api_key is empty for site " . ($siteHandle ?: 'default') . " (siteId: $siteId). Check your Scout plugin settings.");
+        }
+        
+        return $parsedValue;
     }
 
     public function getSearchApiKey(?int $siteId = null): string