Fixed

Author: Sebastian BURGIN-FIX (ext)

.env.example

@@ -1,24 +1,22 @@
 APP_NAME="codebar Solutions AG"
 APP_ENV=local
-APP_KEY=base64:F+mHMDBbavrsp/I3WYA5lDSwDJJI/0wQG4eM3csq/lo=
+APP_KEY=
 APP_DEBUG=true
 APP_URL=https://web.codebar.test
 
-NOVA_LICENSE_KEY=
-
 LOG_CHANNEL=stack
 LOG_STACK=single,flare
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
 FLARE_KEY=
 
-DB_CONNECTION=mysql
+DB_CONNECTION=pgsql
 DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=laravel-template
-DB_USERNAME=root
-DB_PASSWORD=
+DB_PORT=5432
+DB_DATABASE=web-codebar
+DB_USERNAME=postgres
+DB_PASSWORD=postgres
 
 FPH_ENABLED=true
 CSP_ENABLED=true

app/Actions/FetchLlmUsageAction.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Actions;
 
 use Carbon\CarbonImmutable;

app/Actions/LlmUsageStatsAction.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Actions;
 
 use App\Models\AiModelDailyUsage;
@@ -66,16 +68,6 @@ public function lastSyncedAt(): ?Carbon
         });
     }
 
-    /**
-     * The most recent day usage data is available for.
-     */
-    public function latestDate(): ?Carbon
-    {
-        return $this->remember('latest_date', function (): ?Carbon {
-            return $this->toDate(AiModelDailyUsage::query()->max('date'));
-        });
-    }
-
     private function toDate(mixed $value): ?Carbon
     {
         return match (true) {

app/Actions/LocaleAction.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Actions;
 
 use App\Enums\SessionKeyEnum;

app/Actions/PageAction.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Actions;
 
 use App\DTO\PageDTO;

app/Actions/StoreLlmUsageAction.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Actions;
 
 use App\Models\AiModel;

app/Actions/ViewDataAction.php

@@ -1,9 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Actions;
 
 use App\DTO\ContactDTO;
 use App\Enums\AiModelCategoryEnum;
+use App\Enums\CacheKeyEnum;
 use App\Enums\ContactSectionEnum;
 use App\Models\AiModel;
 use App\Models\Contact;
@@ -14,7 +17,6 @@
 use App\Models\Technology;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Str;
 
 class ViewDataAction
 {
@@ -23,7 +25,7 @@ class ViewDataAction
      */
     public function products(string $locale): Collection
     {
-        $key = Str::slug("products_published_{$locale}");
+        $key = CacheKeyEnum::PRODUCTS_PUBLISHED->forLocale($locale);
 
         return Cache::rememberForever($key, function () {
             return Product::where('published', true)->orderBy('order')->get();
@@ -35,7 +37,7 @@ public function products(string $locale): Collection
      */
     public function services(string $locale): Collection
     {
-        $key = Str::slug("services_published_{$locale}");
+        $key = CacheKeyEnum::SERVICES_PUBLISHED->forLocale($locale);
 
         return Cache::rememberForever($key, function () {
             return Service::where('published', true)->orderBy('order')->get();
@@ -47,7 +49,7 @@ public function services(string $locale): Collection
      */
     public function news(string $locale): Collection
     {
-        $key = Str::slug("news_published_{$locale}");
+        $key = CacheKeyEnum::NEWS_PUBLISHED->forLocale($locale);
 
         return Cache::rememberForever($key, function () {
             // Eager loaded: the cards read the series title and the author's picture,
@@ -65,7 +67,7 @@ public function news(string $locale): Collection
      */
     public function technologies(string $locale): Collection
     {
-        $key = Str::slug("technologies_published_{$locale}");
+        $key = CacheKeyEnum::TECHNOLOGIES_PUBLISHED->forLocale($locale);
 
         return Cache::rememberForever($key, function () {
             return Technology::where('published', true)->orderBy('order')->get();
@@ -77,7 +79,7 @@ public function technologies(string $locale): Collection
      */
     public function aiModelGroups(): Collection
     {
-        return Cache::rememberForever('ai_models_active', function () {
+        return Cache::rememberForever(CacheKeyEnum::AI_MODELS_ACTIVE->value, function () {
             return $this->groupAiModelsByCategory(
                 AiModel::whereNull('archived_at')->orderBy('order')->get()
             );
@@ -89,7 +91,7 @@ public function aiModelGroups(): Collection
      */
     public function aiModelArchive(): Collection
     {
-        return Cache::rememberForever('ai_models_archived', function () {
+        return Cache::rememberForever(CacheKeyEnum::AI_MODELS_ARCHIVED->value, function () {
             return $this->groupAiModelsByCategory(
                 AiModel::whereNotNull('archived_at')->with('replacedBy')->orderBy('order')->get()
             );
@@ -116,7 +118,7 @@ private function groupAiModelsByCategory(Collection $models): Collection
      */
     public function openSource(string $locale): Collection
     {
-        $key = Str::slug("open_source_published_{$locale}");
+        $key = CacheKeyEnum::OPEN_SOURCE_PUBLISHED->forLocale($locale);
 
         return Cache::rememberForever($key, function () {
             return OpenSource::where('published', true)->orderByDesc('downloads')->get();
@@ -125,7 +127,7 @@ public function openSource(string $locale): Collection
 
     public function contacts(string $locale): \stdClass
     {
-        $key = Str::slug("contacts_published_{$locale}");
+        $key = CacheKeyEnum::CONTACTS_PUBLISHED->forLocale($locale);
 
         return Cache::rememberForever($key, function () use ($locale) {
             // Ordered by the `sort` field from the YAML files rather than alphabetically:

app/Checks/FailedJobsCheck.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Checks;
 
 use Illuminate\Support\Facades\DB;

app/Checks/FilesystemsDefaultCheck.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Checks;
 
 use App\Enums\CacheKeyEnum;

app/Checks/JobsCheck.php

@@ -1,43 +1,53 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Checks;
 
-use Illuminate\Support\Collection;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 use Spatie\Health\Checks\Check;
 use Spatie\Health\Checks\Result;
 
+/**
+ * A queue is healthy when it is either empty or moving. Depth alone says nothing —
+ * a thousand jobs dispatched a second ago is fine, one job stuck for an hour is not.
+ * The age of the oldest pending job is what separates the two, and it costs one query
+ * rather than sampling the depth once a second for a minute and a half.
+ */
 class JobsCheck extends Check
 {
-    public const int TIME = 90;
+    public const int STALLED_AFTER_MINUTES = 5;
 
     public function run(): Result
     {
-        $count = DB::table('jobs')->count();
+        $pending = DB::table('jobs')->count();
 
-        $result = Result::make();
-        $result->shortSummary("jobs table count: {$count}");
+        $result = Result::make()->shortSummary("pending jobs: {$pending}");
 
-        if ($count <= 0) {
+        if ($pending === 0) {
             return $result->ok();
         }
 
-        $newCounts = Collection::times(self::TIME, function () {
-            $count = DB::table('jobs')->count();
-            sleep(1);
+        $waitingMinutes = $this->oldestPendingJobAgeInMinutes();
 
-            return $count;
-        });
+        if ($waitingMinutes === null || $waitingMinutes < self::STALLED_AFTER_MINUTES) {
+            return $result->ok();
+        }
 
-        $allMatch = $newCounts->every(fn (int $value) => $value === $count);
+        return $result->failed(
+            "The queue is not draining: {$pending} pending job(s), the oldest waiting {$waitingMinutes} minute(s)."
+        );
+    }
 
-        $result->shortSummary("jobs table count: {$allMatch}");
+    private function oldestPendingJobAgeInMinutes(): ?int
+    {
+        $availableAt = DB::table('jobs')->min('available_at');
 
-        if ($count != $allMatch) {
-            return $result->ok();
+        if (! is_numeric($availableAt)) {
+            return null;
         }
 
-        return $result->failed();
-
+        return (int) Carbon::createFromTimestamp((int) $availableAt)->diffInMinutes(absolute: true);
     }
 }