Optimierung 4.3/4.4 (Newsrooms): Page-Data-Service + Invokable Controller

Newsrooms-Verzeichnis-Closure in NewsroomsPageData + Web\NewsroomsController
verschoben. Verhalten unveraendert, 92 Web-Tests gruen.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

app/Http/Controllers/Web/NewsroomsController.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Controllers\Web;
+
+use App\Http\Controllers\Controller;
+use App\Services\Web\NewsroomsPageData;
+use App\Support\WebPortalContext;
+use Illuminate\Contracts\View\View;
+
+class NewsroomsController extends Controller
+{
+    public function __invoke(NewsroomsPageData $pageData): View
+    {
+        return view('web.newsrooms', $pageData->build(WebPortalContext::fromRequest()));
+    }
+}

app/Services/Web/NewsroomsPageData.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Services\Web;
+
+use App\Models\Company;
+use App\Models\PressRelease;
+use App\Scopes\PortalScope;
+use App\Support\EditorialClock;
+use App\Support\WebPortalContext;
+use Illuminate\Database\Eloquent\Builder;
+
+/**
+ * Datenaufbereitung des Newsrooms-Verzeichnisses je Ausgabe: alle aktiven
+ * Unternehmen mit veröffentlichten Meldungen (optional gefiltert per `q`).
+ */
+class NewsroomsPageData
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function build(WebPortalContext $context): array
+    {
+        $portalValues = $context->portalValues;
+        $language = $context->language;
+        $referenceNow = EditorialClock::reference($portalValues, $language);
+        $recentSince = $referenceNow->copy()->subDays(30);
+
+        $term = trim((string) request('q', ''));
+
+        $published = static function (Builder $query) use ($portalValues, $language): void {
+            $query
+                ->forPortalValues($portalValues)
+                ->forLanguage($language)
+                ->visibleInArchive();
+        };
+
+        $activeCompanies = static fn (): Builder => Company::query()
+            ->withoutGlobalScope(PortalScope::class)
+            ->whereIn('portal', $portalValues)
+            ->where('is_active', true)
+            ->whereHas('pressReleases', fn (Builder $query) => $published($query));
+
+        $newsrooms = $activeCompanies()
+            ->when($term !== '', fn (Builder $query) => $query->whereLike('name', '%'.$term.'%'))
+            ->withCount([
+                'pressReleases as releases_count' => fn (Builder $query) => $published($query),
+                'pressReleases as recent_count' => function (Builder $query) use ($published, $recentSince): void {
+                    $published($query);
+                    $query->where('published_at', '>=', $recentSince);
+                },
+            ])
+            ->withMax(['pressReleases as latest_published_at' => fn (Builder $query) => $published($query)], 'published_at')
+            ->orderByDesc('recent_count')
+            ->orderByDesc('releases_count')
+            ->orderBy('name')
+            ->paginate(24)
+            ->withQueryString();
+
+        $archiveTotal = PressRelease::query()
+            ->withoutGlobalScope(PortalScope::class)
+            ->tap(fn (Builder $query) => $published($query))
+            ->count();
+
+        return [
+            'newsrooms' => $newsrooms,
+            'term' => $term,
+            'referenceNow' => $referenceNow,
+            'totalNewsrooms' => (clone $activeCompanies())->count(),
+            'activeNewsroomsCount' => $activeCompanies()
+                ->whereHas('pressReleases', function (Builder $query) use ($published, $recentSince): void {
+                    $published($query);
+                    $query->where('published_at', '>=', $recentSince);
+                })
+                ->count(),
+            'archiveTotal' => $archiveTotal,
+        ];
+    }
+}

routes/web.php

@@ -2,6 +2,7 @@
 
 use App\Enums\Portal;
 use App\Http\Controllers\PressReleasePreviewController;
+use App\Http\Controllers\Web\NewsroomsController;
 use App\Http\Controllers\Web\PreiseController;
 use App\Http\Controllers\Web\SucheController;
 use App\Http\Controllers\Web\VeroeffentlichenController;
@@ -519,65 +520,6 @@ $releaseDetailPage = static function (string $edition, string $slug) {
     ]);
 };
 
-// Newsrooms-Verzeichnis je Ausgabe: alle aktiven Unternehmen mit Meldungen.
-$newsroomsIndex = static function (string $edition) {
-    $context = WebPortalContext::fromRequest();
-    $language = $context->language;
-    $portalValues = $context->portalValues;
-    $referenceNow = EditorialClock::reference($portalValues, $language);
-    $recentSince = $referenceNow->copy()->subDays(30);
-
-    $term = trim((string) request('q', ''));
-
-    $published = static function (Builder $query) use ($portalValues, $language): void {
-        $query
-            ->forPortalValues($portalValues)
-            ->forLanguage($language)
-            ->visibleInArchive();
-    };
-
-    $activeCompanies = static fn (): Builder => Company::query()
-        ->withoutGlobalScope(PortalScope::class)
-        ->whereIn('portal', $portalValues)
-        ->where('is_active', true)
-        ->whereHas('pressReleases', fn (Builder $query) => $published($query));
-
-    $newsrooms = $activeCompanies()
-        ->when($term !== '', fn (Builder $query) => $query->whereLike('name', '%'.$term.'%'))
-        ->withCount([
-            'pressReleases as releases_count' => fn (Builder $query) => $published($query),
-            'pressReleases as recent_count' => function (Builder $query) use ($published, $recentSince): void {
-                $published($query);
-                $query->where('published_at', '>=', $recentSince);
-            },
-        ])
-        ->withMax(['pressReleases as latest_published_at' => fn (Builder $query) => $published($query)], 'published_at')
-        ->orderByDesc('recent_count')
-        ->orderByDesc('releases_count')
-        ->orderBy('name')
-        ->paginate(24)
-        ->withQueryString();
-
-    $archiveTotal = PressRelease::query()
-        ->withoutGlobalScope(PortalScope::class)
-        ->tap(fn (Builder $query) => $published($query))
-        ->count();
-
-    return view('web.newsrooms', [
-        'newsrooms' => $newsrooms,
-        'term' => $term,
-        'referenceNow' => $referenceNow,
-        'totalNewsrooms' => (clone $activeCompanies())->count(),
-        'activeNewsroomsCount' => $activeCompanies()
-            ->whereHas('pressReleases', function (Builder $query) use ($published, $recentSince): void {
-                $published($query);
-                $query->where('published_at', '>=', $recentSince);
-            })
-            ->count(),
-        'archiveTotal' => $archiveTotal,
-    ]);
-};
-
 // Newsroom-Markenseite eines Unternehmens je Ausgabe: alle Meldungen der Firma.
 $newsroomDetail = static function (string $edition, string $slug) {
     $context = WebPortalContext::fromRequest();
@@ -830,7 +772,7 @@ Route::get('{path}', function (string $path) use ($htmlRedirect) {
 // ---------------------------------------------------------------------------
 // Öffentliche Inhalte je Ausgabe (Sprache): /de/... und /en/...
 // ---------------------------------------------------------------------------
-Route::prefix('{edition}')->whereIn('edition', SetEdition::EDITIONS)->group(function () use ($applyWebDomainConfig, $webHomeData, $categoryPage, $releaseDetailPage, $newsroomsIndex, $newsroomDetail) {
+Route::prefix('{edition}')->whereIn('edition', SetEdition::EDITIONS)->group(function () use ($applyWebDomainConfig, $webHomeData, $categoryPage, $releaseDetailPage, $newsroomDetail) {
     // Startseite je Ausgabe
     Route::get('/', function (string $edition) use ($applyWebDomainConfig, $webHomeData) {
         $domain = request()->getHost();
@@ -864,7 +806,7 @@ Route::prefix('{edition}')->whereIn('edition', SetEdition::EDITIONS)->group(func
     Route::view('ueber-uns', 'web.ueber-uns')->name('ueber-uns');
     Route::get('veroeffentlichen', VeroeffentlichenController::class)->name('veroeffentlichen');
     Route::get('suche', SucheController::class)->name('suche');
-    Route::get('newsrooms', $newsroomsIndex)->name('newsrooms');
+    Route::get('newsrooms', NewsroomsController::class)->name('newsrooms');
     Route::get('newsroom/{slug}', $newsroomDetail)->name('newsroom');
     Route::view('api', 'web.api')->name('api');
     Route::view('team', 'web.team')->name('team');