tests updates

2026-07-24 14:19:51 +01:00
parent 927514562b
commit 63e00d99c1
7 changed files with 122 additions and 39 deletions
@@ -1,20 +1,76 @@
 <?php
+
 namespace Modules\Sites\Services;
+
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Schema;
 use Modules\Sites\Models\Site;
+
 final class SiteManager
 {
    private ?Site $current = null;
-    public function current(): ?Site { return $this->current; }
-    public function setCurrent(?Site $site): void { $this->current = $site; if ($site) { app()->instance(Site::class, $site); } }
-    public function all(): Collection { return Site::query()->active()->orderByDesc('is_default')->orderBy('name')->get(); }
+
+    public function current(): ?Site
+    {
+        return $this->current;
+    }
+
+    public function setCurrent(?Site $site): void
+    {
+        $this->current = $site;
+
+        if ($site) {
+            app()->instance(Site::class, $site);
+            app()->instance('currentSite', $site);
+        }
+    }
+
+    public function all(): Collection
+    {
+        if (! $this->tablesExist()) {
+            return collect();
+        }
+
+        return Site::query()
+            ->active()
+            ->orderByDesc('is_default')
+            ->orderBy('name')
+            ->get();
+    }
+
    public function resolve(Request $request): ?Site
    {
+        if (! $this->tablesExist()) {
+            $this->setCurrent(null);
+
+            return null;
+        }
+
        $host = strtolower(preg_replace('/:\d+$/', '', $request->getHost()));
-        $site = Site::query()->with(['domains','settings'])->whereHas('domains', fn ($q) => $q->where('domain', $host)->where('is_active', true))->first();
-        if (! $site && config('sites.fallback_to_default')) { $site = Site::query()->with(['domains','settings'])->active()->where('is_default', true)->first(); }
+
+        $site = Site::query()
+            ->with(['domains', 'settings'])
+            ->whereHas('domains', fn ($query) => $query
+                ->where('domain', $host)
+                ->where('is_active', true))
+            ->first();
+
+        if (! $site && config('sites.fallback_to_default')) {
+            $site = Site::query()
+                ->with(['domains', 'settings'])
+                ->active()
+                ->where('is_default', true)
+                ->first();
+        }
+
        $this->setCurrent($site);
+
        return $site;
    }
+
+    private function tablesExist(): bool
+    {
+        return Schema::hasTable('sites') && Schema::hasTable('site_domains');
+    }
 }