Optimierung 4.3/4.4 (Veroeffentlichen): Page-Data-Service + Invokable Controller
Veroeffentlichen-Closure in VeroeffentlichenPageData + Web\VeroeffentlichenController verschoben. Verhalten unveraendert, 92 Web-Tests gruen. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
418a2bca4c
commit
fef6bbc9a6
3 changed files with 108 additions and 71 deletions
16
app/Http/Controllers/Web/VeroeffentlichenController.php
Normal file
16
app/Http/Controllers/Web/VeroeffentlichenController.php
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Http\Controllers\Web;
|
||||||
|
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use App\Services\Web\VeroeffentlichenPageData;
|
||||||
|
use App\Support\WebPortalContext;
|
||||||
|
use Illuminate\Contracts\View\View;
|
||||||
|
|
||||||
|
class VeroeffentlichenController extends Controller
|
||||||
|
{
|
||||||
|
public function __invoke(VeroeffentlichenPageData $pageData): View
|
||||||
|
{
|
||||||
|
return view('web.veroeffentlichen', $pageData->build(WebPortalContext::fromRequest()));
|
||||||
|
}
|
||||||
|
}
|
||||||
89
app/Services/Web/VeroeffentlichenPageData.php
Normal file
89
app/Services/Web/VeroeffentlichenPageData.php
Normal file
|
|
@ -0,0 +1,89 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Services\Web;
|
||||||
|
|
||||||
|
use App\Enums\PressReleaseStatus;
|
||||||
|
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;
|
||||||
|
use Illuminate\Support\Carbon;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Datenaufbereitung der Veröffentlichen-Marketingseite (Einreichung läuft im
|
||||||
|
* Publisher-Hub): Archiv-Kennzahlen, Beispiel-Meldung und aktive Newsrooms.
|
||||||
|
*/
|
||||||
|
class VeroeffentlichenPageData
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @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);
|
||||||
|
|
||||||
|
$publishedBase = static fn (): Builder => PressRelease::query()
|
||||||
|
->withoutGlobalScope(PortalScope::class)
|
||||||
|
->forPortalValues($portalValues)
|
||||||
|
->forLanguage($language)
|
||||||
|
->visibleInArchive();
|
||||||
|
|
||||||
|
$archiveTotal = $publishedBase()->count();
|
||||||
|
$publishedToday = $publishedBase()->whereDate('published_at', $referenceNow->toDateString())->count();
|
||||||
|
$oldest = $publishedBase()->min('published_at');
|
||||||
|
$oldestYear = $oldest ? (int) Carbon::parse($oldest)->format('Y') : null;
|
||||||
|
|
||||||
|
$inReview = PressRelease::query()
|
||||||
|
->withoutGlobalScope(PortalScope::class)
|
||||||
|
->whereIn('portal', $portalValues)
|
||||||
|
->where('status', PressReleaseStatus::Review)
|
||||||
|
->where('language', $language)
|
||||||
|
->count();
|
||||||
|
|
||||||
|
$exampleRelease = $publishedBase()
|
||||||
|
->with([
|
||||||
|
'company',
|
||||||
|
'category.translations' => fn ($query) => $query->where('locale', $language),
|
||||||
|
])
|
||||||
|
->orderByDesc('published_at')
|
||||||
|
->first();
|
||||||
|
|
||||||
|
$newsroomFilter = static function (Builder $query) use ($portalValues, $language, $recentSince): void {
|
||||||
|
$query
|
||||||
|
->forPortalValues($portalValues)
|
||||||
|
->forLanguage($language)
|
||||||
|
->published()
|
||||||
|
->where('published_at', '>=', $recentSince);
|
||||||
|
};
|
||||||
|
|
||||||
|
$newsroomQuery = Company::query()
|
||||||
|
->withoutGlobalScope(PortalScope::class)
|
||||||
|
->whereIn('portal', $portalValues)
|
||||||
|
->where('is_active', true)
|
||||||
|
->whereHas('pressReleases', fn (Builder $query) => $newsroomFilter($query));
|
||||||
|
|
||||||
|
$activeNewsroomsTotal = (clone $newsroomQuery)->count();
|
||||||
|
$activeNewsroomNames = (clone $newsroomQuery)
|
||||||
|
->withCount(['pressReleases as recent_count' => fn (Builder $query) => $newsroomFilter($query)])
|
||||||
|
->orderByDesc('recent_count')
|
||||||
|
->limit(10)
|
||||||
|
->pluck('name')
|
||||||
|
->all();
|
||||||
|
|
||||||
|
return [
|
||||||
|
'referenceNow' => $referenceNow,
|
||||||
|
'archiveTotal' => $archiveTotal,
|
||||||
|
'publishedToday' => $publishedToday,
|
||||||
|
'inReview' => $inReview,
|
||||||
|
'oldestYear' => $oldestYear,
|
||||||
|
'exampleRelease' => $exampleRelease,
|
||||||
|
'activeNewsroomNames' => $activeNewsroomNames,
|
||||||
|
'activeNewsroomsTotal' => $activeNewsroomsTotal,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Enums\Portal;
|
use App\Enums\Portal;
|
||||||
use App\Enums\PressReleaseStatus;
|
|
||||||
use App\Http\Controllers\PressReleasePreviewController;
|
use App\Http\Controllers\PressReleasePreviewController;
|
||||||
use App\Http\Controllers\Web\PreiseController;
|
use App\Http\Controllers\Web\PreiseController;
|
||||||
use App\Http\Controllers\Web\SucheController;
|
use App\Http\Controllers\Web\SucheController;
|
||||||
|
use App\Http\Controllers\Web\VeroeffentlichenController;
|
||||||
use App\Http\Middleware\SetEdition;
|
use App\Http\Middleware\SetEdition;
|
||||||
use App\Models\Category;
|
use App\Models\Category;
|
||||||
use App\Models\Company;
|
use App\Models\Company;
|
||||||
|
|
@ -519,74 +519,6 @@ $releaseDetailPage = static function (string $edition, string $slug) {
|
||||||
]);
|
]);
|
||||||
};
|
};
|
||||||
|
|
||||||
// Veröffentlichen-Marketingseite je Ausgabe (Einreichung läuft im Publisher-Hub).
|
|
||||||
$veroeffentlichenPage = static function (string $edition) {
|
|
||||||
$context = WebPortalContext::fromRequest();
|
|
||||||
$language = $context->language;
|
|
||||||
$portalValues = $context->portalValues;
|
|
||||||
$referenceNow = EditorialClock::reference($portalValues, $language);
|
|
||||||
$recentSince = $referenceNow->copy()->subDays(30);
|
|
||||||
|
|
||||||
$publishedBase = static fn (): Builder => PressRelease::query()
|
|
||||||
->withoutGlobalScope(PortalScope::class)
|
|
||||||
->forPortalValues($portalValues)
|
|
||||||
->forLanguage($language)
|
|
||||||
->visibleInArchive();
|
|
||||||
|
|
||||||
$archiveTotal = $publishedBase()->count();
|
|
||||||
$publishedToday = $publishedBase()->whereDate('published_at', $referenceNow->toDateString())->count();
|
|
||||||
$oldest = $publishedBase()->min('published_at');
|
|
||||||
$oldestYear = $oldest ? (int) Carbon::parse($oldest)->format('Y') : null;
|
|
||||||
|
|
||||||
$inReview = PressRelease::query()
|
|
||||||
->withoutGlobalScope(PortalScope::class)
|
|
||||||
->whereIn('portal', $portalValues)
|
|
||||||
->where('status', PressReleaseStatus::Review)
|
|
||||||
->where('language', $language)
|
|
||||||
->count();
|
|
||||||
|
|
||||||
$exampleRelease = $publishedBase()
|
|
||||||
->with([
|
|
||||||
'company',
|
|
||||||
'category.translations' => fn ($query) => $query->where('locale', $language),
|
|
||||||
])
|
|
||||||
->orderByDesc('published_at')
|
|
||||||
->first();
|
|
||||||
|
|
||||||
$newsroomFilter = static function (Builder $query) use ($portalValues, $language, $recentSince): void {
|
|
||||||
$query
|
|
||||||
->forPortalValues($portalValues)
|
|
||||||
->forLanguage($language)
|
|
||||||
->published()
|
|
||||||
->where('published_at', '>=', $recentSince);
|
|
||||||
};
|
|
||||||
|
|
||||||
$newsroomQuery = Company::query()
|
|
||||||
->withoutGlobalScope(PortalScope::class)
|
|
||||||
->whereIn('portal', $portalValues)
|
|
||||||
->where('is_active', true)
|
|
||||||
->whereHas('pressReleases', fn (Builder $query) => $newsroomFilter($query));
|
|
||||||
|
|
||||||
$activeNewsroomsTotal = (clone $newsroomQuery)->count();
|
|
||||||
$activeNewsroomNames = (clone $newsroomQuery)
|
|
||||||
->withCount(['pressReleases as recent_count' => fn (Builder $query) => $newsroomFilter($query)])
|
|
||||||
->orderByDesc('recent_count')
|
|
||||||
->limit(10)
|
|
||||||
->pluck('name')
|
|
||||||
->all();
|
|
||||||
|
|
||||||
return view('web.veroeffentlichen', [
|
|
||||||
'referenceNow' => $referenceNow,
|
|
||||||
'archiveTotal' => $archiveTotal,
|
|
||||||
'publishedToday' => $publishedToday,
|
|
||||||
'inReview' => $inReview,
|
|
||||||
'oldestYear' => $oldestYear,
|
|
||||||
'exampleRelease' => $exampleRelease,
|
|
||||||
'activeNewsroomNames' => $activeNewsroomNames,
|
|
||||||
'activeNewsroomsTotal' => $activeNewsroomsTotal,
|
|
||||||
]);
|
|
||||||
};
|
|
||||||
|
|
||||||
// Newsrooms-Verzeichnis je Ausgabe: alle aktiven Unternehmen mit Meldungen.
|
// Newsrooms-Verzeichnis je Ausgabe: alle aktiven Unternehmen mit Meldungen.
|
||||||
$newsroomsIndex = static function (string $edition) {
|
$newsroomsIndex = static function (string $edition) {
|
||||||
$context = WebPortalContext::fromRequest();
|
$context = WebPortalContext::fromRequest();
|
||||||
|
|
@ -898,7 +830,7 @@ Route::get('{path}', function (string $path) use ($htmlRedirect) {
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Öffentliche Inhalte je Ausgabe (Sprache): /de/... und /en/...
|
// Öffentliche Inhalte je Ausgabe (Sprache): /de/... und /en/...
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
Route::prefix('{edition}')->whereIn('edition', SetEdition::EDITIONS)->group(function () use ($applyWebDomainConfig, $webHomeData, $categoryPage, $releaseDetailPage, $veroeffentlichenPage, $newsroomsIndex, $newsroomDetail) {
|
Route::prefix('{edition}')->whereIn('edition', SetEdition::EDITIONS)->group(function () use ($applyWebDomainConfig, $webHomeData, $categoryPage, $releaseDetailPage, $newsroomsIndex, $newsroomDetail) {
|
||||||
// Startseite je Ausgabe
|
// Startseite je Ausgabe
|
||||||
Route::get('/', function (string $edition) use ($applyWebDomainConfig, $webHomeData) {
|
Route::get('/', function (string $edition) use ($applyWebDomainConfig, $webHomeData) {
|
||||||
$domain = request()->getHost();
|
$domain = request()->getHost();
|
||||||
|
|
@ -930,7 +862,7 @@ Route::prefix('{edition}')->whereIn('edition', SetEdition::EDITIONS)->group(func
|
||||||
Route::view('faq', 'web.faq')->name('faq');
|
Route::view('faq', 'web.faq')->name('faq');
|
||||||
Route::view('kontakt', 'web.kontakt')->name('kontakt');
|
Route::view('kontakt', 'web.kontakt')->name('kontakt');
|
||||||
Route::view('ueber-uns', 'web.ueber-uns')->name('ueber-uns');
|
Route::view('ueber-uns', 'web.ueber-uns')->name('ueber-uns');
|
||||||
Route::get('veroeffentlichen', $veroeffentlichenPage)->name('veroeffentlichen');
|
Route::get('veroeffentlichen', VeroeffentlichenController::class)->name('veroeffentlichen');
|
||||||
Route::get('suche', SucheController::class)->name('suche');
|
Route::get('suche', SucheController::class)->name('suche');
|
||||||
Route::get('newsrooms', $newsroomsIndex)->name('newsrooms');
|
Route::get('newsrooms', $newsroomsIndex)->name('newsrooms');
|
||||||
Route::get('newsroom/{slug}', $newsroomDetail)->name('newsroom');
|
Route::get('newsroom/{slug}', $newsroomDetail)->name('newsroom');
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue