api: Ziel-Portal einer Einreichung explizit auflösen statt vom Konto erben
Legacy-API-Kunden mit Keys beider Altportale — vor allem connektar — senden jede Meldung an presseecho.de UND businessportal24.de. Weil die Firma ihr Portal vom User und die Meldung es von der Firma erbte, landeten beide Kopien im selben Portal, die zweite mit Slug-Suffix "-2". Verifiziert wurde das über die Token-Hashes gegen die Legacy-Datenbanken. Das Portal wird jetzt in fester Reihenfolge aufgelöst: expliziter portal-Parameter, sonst die aufgerufene Domain, sonst das Portal des Firmenprofils, zuletzt Portal::Both — genau der Default, den beide Spalten ohnehin tragen. Die Auflösung ist damit nicht-nullbar; vorher konnte sie null liefern, was als SQL-Fehler und damit als 500er beim Alt-Client gelandet wäre. Ein Update über die v1-API verschiebt eine bestehende Meldung ausschließlich über den expliziten Parameter, nie über die aufgerufene Domain. press-releases:fix-api-portal-duplicates repariert die Altdaten: Es findet Paare (gleicher User, Titel, Sprache und Portal, beide per API eingereicht, kurz nacheinander) und verschiebt die zweite Kopie samt ihrer exklusiven Firma ins jeweils andere Portal, mit neu vergebenem Slug. Web-Doppel-Submits ohne Status-Log source=api und Legacy-Sync-Daten mit gesetzter legacy_id werden geschont. Auf Live ausgeführt und verifiziert. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
2024df9d28
commit
48d401e68f
15 changed files with 720 additions and 13 deletions
|
|
@ -0,0 +1,34 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Api\Concerns;
|
||||
|
||||
use App\Enums\Portal;
|
||||
use App\Services\CurrentPortalContext;
|
||||
|
||||
/**
|
||||
* Löst das Ziel-Portal eines API-Schreibzugriffs auf.
|
||||
*
|
||||
* Reihenfolge (Entscheidung 13.08.2026, API-Portal-Fix):
|
||||
* 1. Explizit mitgesendeter portal-Parameter (überstimmt alles).
|
||||
* 2. Domain des Requests (CurrentPortalContext, gesetzt via SetCurrentPortal:
|
||||
* presseecho.de → presseecho, businessportal24.de → businessportal24).
|
||||
* 3. Aufrufer-spezifischer Fallback (Portal der Firma bzw. des Users) —
|
||||
* greift z. B. bei Calls über die Portal-/Admin-Domain ohne Parameter.
|
||||
* 4. `Portal::Both` als letzter Ausweg.
|
||||
*
|
||||
* Stufe 4 macht die Rückgabe bewusst nicht-nullbar: `press_releases.portal` und
|
||||
* `companies.portal` sind NOT-NULL-ENUMs mit genau diesem Default. Ein `null`
|
||||
* aus dieser Methode landete also als SQL-Fehler und damit als 500er beim
|
||||
* Alt-Client, statt als verwertbare Antwort — und die Aufrufer, die das
|
||||
* Ergebnis direkt mit `->value` weiterreichen, wären ein Fatal Error.
|
||||
*/
|
||||
trait ResolvesRequestedPortal
|
||||
{
|
||||
private function resolveRequestedPortal(?string $requestedPortal, ?Portal $fallback): Portal
|
||||
{
|
||||
return Portal::tryFrom((string) $requestedPortal)
|
||||
?? CurrentPortalContext::get()
|
||||
?? $fallback
|
||||
?? Portal::Both;
|
||||
}
|
||||
}
|
||||
|
|
@ -3,10 +3,13 @@
|
|||
namespace App\Http\Controllers\Api\Legacy;
|
||||
|
||||
use App\Enums\CompanyType;
|
||||
use App\Enums\Portal;
|
||||
use App\Http\Controllers\Api\Concerns\ResolvesRequestedPortal;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Company;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
||||
/**
|
||||
|
|
@ -16,7 +19,7 @@ use Illuminate\Validation\ValidationException;
|
|||
*/
|
||||
class LegacyCompanyController extends Controller
|
||||
{
|
||||
use RespondsLikeLegacyApi;
|
||||
use ResolvesRequestedPortal, RespondsLikeLegacyApi;
|
||||
|
||||
public function store(Request $request): JsonResponse
|
||||
{
|
||||
|
|
@ -26,6 +29,7 @@ class LegacyCompanyController extends Controller
|
|||
$validated = $request->validate([
|
||||
'company' => ['required', 'array'],
|
||||
'company.name' => ['required', 'string', 'max:255'],
|
||||
'company.portal' => ['nullable', Rule::enum(Portal::class)->only([Portal::Presseecho, Portal::Businessportal24])],
|
||||
'company.address' => ['nullable', 'string', 'max:1000'],
|
||||
'company.country_id' => ['nullable', 'integer'],
|
||||
'company.phone' => ['nullable', 'string', 'max:100'],
|
||||
|
|
@ -39,8 +43,14 @@ class LegacyCompanyController extends Controller
|
|||
|
||||
$user = $request->user();
|
||||
|
||||
// Portal aus Parameter/Domain, sonst wie bisher vom User — der
|
||||
// User-Fallback allein ließ alle Firmen (und damit deren PMs) von
|
||||
// Kunden mit Keys beider Altportale im selben Portal landen.
|
||||
$company = new Company([
|
||||
'portal' => $user->portal?->value,
|
||||
'portal' => $this->resolveRequestedPortal(
|
||||
$validated['portal'] ?? null,
|
||||
$user->portal,
|
||||
)->value,
|
||||
'type' => CompanyType::Company->value,
|
||||
'name' => $validated['name'],
|
||||
'address' => $validated['address'] ?? null,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@
|
|||
namespace App\Http\Controllers\Api\Legacy;
|
||||
|
||||
use App\Enums\AiTextDeclaration;
|
||||
use App\Enums\Portal;
|
||||
use App\Enums\PressReleaseStatus;
|
||||
use App\Http\Controllers\Api\Concerns\ResolvesRequestedPortal;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\AppSetting;
|
||||
use App\Models\Category;
|
||||
|
|
@ -18,6 +20,7 @@ use App\Services\PressRelease\QuotaExceededException;
|
|||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Str;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
||||
use function Illuminate\Support\defer;
|
||||
|
|
@ -36,7 +39,7 @@ use function Illuminate\Support\defer;
|
|||
*/
|
||||
class LegacyPressReleaseController extends Controller
|
||||
{
|
||||
use RespondsLikeLegacyApi;
|
||||
use ResolvesRequestedPortal, RespondsLikeLegacyApi;
|
||||
|
||||
public const SETTING_AI_REVIEW = 'legacy_api_ai_review';
|
||||
|
||||
|
|
@ -53,6 +56,7 @@ class LegacyPressReleaseController extends Controller
|
|||
'press_release.company_id' => ['required', 'integer'],
|
||||
'press_release.category_id' => ['required', 'integer'],
|
||||
'press_release.language' => ['nullable', 'string', 'max:5'],
|
||||
'press_release.portal' => ['nullable', Rule::enum(Portal::class)->only([Portal::Presseecho, Portal::Businessportal24])],
|
||||
'press_release.title' => ['required', 'string', 'max:255'],
|
||||
'press_release.text' => ['required', 'string'],
|
||||
'press_release.backlink_url' => ['nullable', 'url', 'max:255'],
|
||||
|
|
@ -104,7 +108,10 @@ class LegacyPressReleaseController extends Controller
|
|||
]);
|
||||
$pressRelease->uuid = (string) Str::uuid();
|
||||
$pressRelease->user_id = $user->id;
|
||||
$pressRelease->portal = $company->portal?->value;
|
||||
$pressRelease->portal = $this->resolveRequestedPortal(
|
||||
$validated['portal'] ?? null,
|
||||
$company->portal,
|
||||
);
|
||||
$pressRelease->ai_declaration_confirmed_at = now();
|
||||
$pressRelease->slug = $pressRelease->generateUniqueSlug($pressRelease->title, [
|
||||
'portal' => $pressRelease->portal,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@
|
|||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Enums\AiTextDeclaration;
|
||||
use App\Enums\Portal;
|
||||
use App\Enums\PressReleaseStatus;
|
||||
use App\Http\Controllers\Api\Concerns\ResolvesRequestedPortal;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Api\V1\StorePressReleaseRequest;
|
||||
use App\Http\Requests\Api\V1\UpdatePressReleaseRequest;
|
||||
|
|
@ -25,6 +27,8 @@ use Illuminate\Validation\Rule;
|
|||
|
||||
class PressReleaseController extends Controller
|
||||
{
|
||||
use ResolvesRequestedPortal;
|
||||
|
||||
public function index(Request $request): AnonymousResourceCollection
|
||||
{
|
||||
abort_unless($request->user()->tokenCan('press-releases:read'), 403);
|
||||
|
|
@ -45,11 +49,14 @@ class PressReleaseController extends Controller
|
|||
$company = $this->findOwnedCompany((int) $validated['company_id'], $request);
|
||||
abort_unless($company !== null, 403);
|
||||
|
||||
// Ziel-Portal: expliziter Parameter > Request-Domain > Firmen-Portal.
|
||||
$portal = $this->resolveRequestedPortal($validated['portal'] ?? null, $company->portal)->value;
|
||||
|
||||
$pressRelease = new PressRelease([
|
||||
...$validated,
|
||||
'uuid' => (string) Str::uuid(),
|
||||
'user_id' => $request->user()->id,
|
||||
'portal' => $company->portal->value,
|
||||
'portal' => $portal,
|
||||
// Über die API angelegte PMs sind immer Entwürfe. Der Übergang nach
|
||||
// `review` erfolgt ausschließlich über die explizite submit-Route,
|
||||
// damit Blacklist-/Quota-/Log-Prüfung garantiert durchlaufen werden.
|
||||
|
|
@ -65,11 +72,11 @@ class PressReleaseController extends Controller
|
|||
] : []),
|
||||
]);
|
||||
$pressRelease->slug = $pressRelease->generateUniqueSlug($validated['title'], [
|
||||
'portal' => $company->portal->value,
|
||||
'portal' => $portal,
|
||||
'language' => $validated['language'],
|
||||
]);
|
||||
$pressRelease->saveWithUniqueSlugRetry($validated['title'], [
|
||||
'portal' => $company->portal->value,
|
||||
'portal' => $portal,
|
||||
'language' => $validated['language'],
|
||||
]);
|
||||
|
||||
|
|
@ -108,7 +115,12 @@ class PressReleaseController extends Controller
|
|||
|
||||
$language = $validated['language'] ?? $pressRelease->language;
|
||||
$title = $validated['title'] ?? $pressRelease->title;
|
||||
$portal = $company->portal->value;
|
||||
// Beim Update verschiebt nur ein expliziter portal-Parameter die PM —
|
||||
// weder Request-Domain noch Firmen-Portal ändern eine bestehende
|
||||
// Zuordnung stillschweigend.
|
||||
$portal = (Portal::tryFrom((string) ($validated['portal'] ?? ''))
|
||||
?? $pressRelease->portal
|
||||
?? $company->portal)->value;
|
||||
|
||||
$pressRelease->fill([
|
||||
...$validated,
|
||||
|
|
|
|||
|
|
@ -2,8 +2,10 @@
|
|||
|
||||
namespace App\Http\Requests\Api\V1;
|
||||
|
||||
use App\Enums\Portal;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class StorePressReleaseRequest extends FormRequest
|
||||
{
|
||||
|
|
@ -23,6 +25,7 @@ class StorePressReleaseRequest extends FormRequest
|
|||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'portal' => ['nullable', Rule::enum(Portal::class)->only([Portal::Presseecho, Portal::Businessportal24])],
|
||||
'company_id' => ['required', 'integer', 'exists:companies,id'],
|
||||
'category_id' => ['required', 'integer', 'exists:categories,id'],
|
||||
'language' => ['required', 'string', 'size:2'],
|
||||
|
|
|
|||
|
|
@ -2,8 +2,10 @@
|
|||
|
||||
namespace App\Http\Requests\Api\V1;
|
||||
|
||||
use App\Enums\Portal;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class UpdatePressReleaseRequest extends FormRequest
|
||||
{
|
||||
|
|
@ -23,6 +25,7 @@ class UpdatePressReleaseRequest extends FormRequest
|
|||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'portal' => ['nullable', Rule::enum(Portal::class)->only([Portal::Presseecho, Portal::Businessportal24])],
|
||||
'company_id' => ['sometimes', 'required', 'integer', 'exists:companies,id'],
|
||||
'category_id' => ['sometimes', 'required', 'integer', 'exists:categories,id'],
|
||||
'language' => ['sometimes', 'required', 'string', 'size:2'],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue