Phase 9E (Abschluss): Checkout-Flows und Plan-Kontingent statt Quota-Stub
- Checkout-Backend: me.checkout.subscription (Tarif-Abo monatlich/jährlich)
und me.checkout.single-pm (Einzel-PM 19 € netto, pending-Kauf mit
Webhook-Erfüllung); StripeCheckoutService als mockbarer Stripe-Wrapper;
Stripe Tax via Cashier::calculateTaxes() (Netto-Preise, USt-ID-Abfrage)
- Slot-Logik: Kontingent aus dem Tarif (plans.press_release_quota) plus
bezahlte Einmalkäufe; Verbrauch bei Veröffentlichung zuerst aus dem
Plan-Zähler, danach Einlösung des ältesten Einmalkaufs (consumed +
PM-Verknüpfung); Grandfathered = unbegrenzt (Entscheidung 12.06.2026,
Bestandsschutz); Stub-Spalte users.press_release_quota entfernt
- billing:sync-stripe-plans legt zusätzlich das Einzel-PM-Produkt an
(STRIPE_PRICE_SINGLE_PM); Test-Mode-Sync gelaufen
- Buchungs-Seite: Rückmeldung nach Checkout (erfolg/abbruch/Guard-Hinweis)
- Tests: PressReleaseQuotaTest auf Plan-Semantik neu geschrieben,
CheckoutFlowTest (8 Tests), Modal-/API-Tests angepasst; Suite 510 passed
- Doku: Billing-und-Rechnungskreise (Kontingent-Tabelle, Checkout-Routen,
Webhook-Events, Stripe-CLI-Hinweis), PHASE-9-Plan 9E ✅, Checkliste,
STATUS-ABGLEICH, PROGRESS
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
parent
38fab64e10
commit
c8dc99c3c8
24 changed files with 775 additions and 100 deletions
|
|
@ -2,10 +2,15 @@
|
|||
|
||||
use App\Console\Commands\ResetMonthlyPressReleaseQuota;
|
||||
use App\Enums\PressReleaseStatus;
|
||||
use App\Enums\SinglePurchaseStatus;
|
||||
use App\Enums\UserPaymentOptionStatus;
|
||||
use App\Models\Category;
|
||||
use App\Models\Company;
|
||||
use App\Models\Plan;
|
||||
use App\Models\PressRelease;
|
||||
use App\Models\SinglePurchase;
|
||||
use App\Models\User;
|
||||
use App\Models\UserPaymentOption;
|
||||
use App\Services\PressRelease\PressReleaseService;
|
||||
use App\Services\PressRelease\QuotaExceededException;
|
||||
use Database\Seeders\RolesAndPermissionsSeeder;
|
||||
|
|
@ -15,6 +20,9 @@ use Tests\TestCase;
|
|||
beforeEach(function (): void {
|
||||
/** @var TestCase $this */
|
||||
$this->seed(RolesAndPermissionsSeeder::class);
|
||||
|
||||
// Das Kontingent greift erst mit dem Launch-Schalter (sonst unbegrenzt).
|
||||
config()->set('billing.enforce_booking', true);
|
||||
});
|
||||
|
||||
function quotaTestPressRelease(User $user, string $status = 'draft'): PressRelease
|
||||
|
|
@ -31,25 +39,72 @@ function quotaTestPressRelease(User $user, string $status = 'draft'): PressRelea
|
|||
]);
|
||||
}
|
||||
|
||||
test('remaining quota reflects the used counter', function () {
|
||||
function quotaTestSubscriber(int $planQuota = 3, int $used = 0): User
|
||||
{
|
||||
$user = User::factory()->create([
|
||||
'press_release_quota' => 3,
|
||||
'press_release_quota_used_this_month' => 1,
|
||||
'press_release_quota_used_this_month' => $used,
|
||||
]);
|
||||
$user->assignRole('customer');
|
||||
|
||||
$plan = Plan::factory()->create([
|
||||
'press_release_quota' => $planQuota,
|
||||
'stripe_price_id_monthly' => 'price_test_m_'.fake()->unique()->randomNumber(6),
|
||||
]);
|
||||
|
||||
subscribeUserToPlan($user, $plan);
|
||||
|
||||
return $user;
|
||||
}
|
||||
|
||||
test('without the launch switch the quota is unlimited', function () {
|
||||
config()->set('billing.enforce_booking', false);
|
||||
|
||||
$user = User::factory()->create();
|
||||
|
||||
expect($user->pressReleaseQuotaRemaining())->toBeNull();
|
||||
expect($user->pressReleaseQuotaTotal())->toBeNull();
|
||||
});
|
||||
|
||||
test('a subscriber inherits the monthly quota of the plan', function () {
|
||||
$user = quotaTestSubscriber(planQuota: 3, used: 1);
|
||||
|
||||
expect($user->pressReleaseQuotaRemaining())->toBe(2);
|
||||
expect($user->pressReleaseQuotaTotal())->toBe(3);
|
||||
});
|
||||
|
||||
test('paid single purchases extend the quota', function () {
|
||||
$user = quotaTestSubscriber(planQuota: 3, used: 3);
|
||||
SinglePurchase::factory()->paid()->count(2)->create(['user_id' => $user->id]);
|
||||
SinglePurchase::factory()->consumed()->create(['user_id' => $user->id]);
|
||||
|
||||
expect($user->pressReleaseQuotaRemaining())->toBe(2);
|
||||
expect($user->pressReleaseQuotaTotal())->toBe(5);
|
||||
});
|
||||
|
||||
test('a grandfathered legacy user has an unlimited quota', function () {
|
||||
// Entscheidung 12.06.2026: Bestandsschutz — das Alt-Produkt sah
|
||||
// unbegrenzte PMs vor, am Kontingent wird nichts umgestellt.
|
||||
$user = User::factory()->create();
|
||||
$user->assignRole('customer');
|
||||
UserPaymentOption::factory()->create([
|
||||
'user_id' => $user->id,
|
||||
'status' => UserPaymentOptionStatus::Grandfathered->value,
|
||||
]);
|
||||
|
||||
expect($user->pressReleaseQuotaRemaining())->toBeNull();
|
||||
|
||||
$pr = quotaTestPressRelease($user, 'review');
|
||||
app(PressReleaseService::class)->publish($pr);
|
||||
|
||||
expect($pr->fresh()->status)->toBe(PressReleaseStatus::Published);
|
||||
expect($user->fresh()->press_release_quota_used_this_month)->toBe(0);
|
||||
});
|
||||
|
||||
test('submitting a press release does not consume a quota slot', function () {
|
||||
// Decision-Update §3.2: Der Slot zählt erst bei Veröffentlichung runter.
|
||||
Queue::fake();
|
||||
|
||||
$user = User::factory()->create([
|
||||
'press_release_quota' => 3,
|
||||
'press_release_quota_used_this_month' => 0,
|
||||
]);
|
||||
$user->assignRole('customer');
|
||||
|
||||
$user = quotaTestSubscriber();
|
||||
$pr = quotaTestPressRelease($user);
|
||||
|
||||
app(PressReleaseService::class)->submitForReview($pr);
|
||||
|
|
@ -58,13 +113,8 @@ test('submitting a press release does not consume a quota slot', function () {
|
|||
expect($user->fresh()->press_release_quota_used_this_month)->toBe(0);
|
||||
});
|
||||
|
||||
test('publishing consumes exactly one quota slot', function () {
|
||||
$user = User::factory()->create([
|
||||
'press_release_quota' => 3,
|
||||
'press_release_quota_used_this_month' => 0,
|
||||
]);
|
||||
$user->assignRole('customer');
|
||||
|
||||
test('publishing consumes exactly one plan slot', function () {
|
||||
$user = quotaTestSubscriber();
|
||||
$pr = quotaTestPressRelease($user, 'review');
|
||||
|
||||
app(PressReleaseService::class)->publish($pr);
|
||||
|
|
@ -74,12 +124,7 @@ test('publishing consumes exactly one quota slot', function () {
|
|||
});
|
||||
|
||||
test('re-publishing after archive does not consume a second slot', function () {
|
||||
$user = User::factory()->create([
|
||||
'press_release_quota' => 3,
|
||||
'press_release_quota_used_this_month' => 0,
|
||||
]);
|
||||
$user->assignRole('customer');
|
||||
|
||||
$user = quotaTestSubscriber();
|
||||
$pr = quotaTestPressRelease($user, 'review');
|
||||
$service = app(PressReleaseService::class);
|
||||
|
||||
|
|
@ -91,12 +136,7 @@ test('re-publishing after archive does not consume a second slot', function () {
|
|||
});
|
||||
|
||||
test('a rejected press release does not consume a quota slot', function () {
|
||||
$user = User::factory()->create([
|
||||
'press_release_quota' => 3,
|
||||
'press_release_quota_used_this_month' => 0,
|
||||
]);
|
||||
$user->assignRole('customer');
|
||||
|
||||
$user = quotaTestSubscriber();
|
||||
$pr = quotaTestPressRelease($user, 'review');
|
||||
|
||||
app(PressReleaseService::class)->reject($pr, 'Unzulässiger Inhalt.', 'ki');
|
||||
|
|
@ -105,15 +145,44 @@ test('a rejected press release does not consume a quota slot', function () {
|
|||
expect($user->fresh()->press_release_quota_used_this_month)->toBe(0);
|
||||
});
|
||||
|
||||
test('publishing past the plan quota consumes the oldest paid purchase', function () {
|
||||
$user = quotaTestSubscriber(planQuota: 1, used: 1);
|
||||
$older = SinglePurchase::factory()->paid()->create([
|
||||
'user_id' => $user->id,
|
||||
'paid_at' => now()->subDays(2),
|
||||
]);
|
||||
$newer = SinglePurchase::factory()->paid()->create([
|
||||
'user_id' => $user->id,
|
||||
'paid_at' => now()->subDay(),
|
||||
]);
|
||||
|
||||
$pr = quotaTestPressRelease($user, 'review');
|
||||
app(PressReleaseService::class)->publish($pr);
|
||||
|
||||
expect($user->fresh()->press_release_quota_used_this_month)->toBe(1);
|
||||
expect($older->fresh()->status)->toBe(SinglePurchaseStatus::Consumed);
|
||||
expect($older->fresh()->press_release_id)->toBe($pr->id);
|
||||
expect($newer->fresh()->status)->toBe(SinglePurchaseStatus::Paid);
|
||||
});
|
||||
|
||||
test('a purchase-only user consumes the purchase on publish', function () {
|
||||
$user = User::factory()->create();
|
||||
$user->assignRole('customer');
|
||||
$purchase = SinglePurchase::factory()->paid()->create(['user_id' => $user->id]);
|
||||
|
||||
expect($user->pressReleaseQuotaRemaining())->toBe(1);
|
||||
|
||||
$pr = quotaTestPressRelease($user, 'review');
|
||||
app(PressReleaseService::class)->publish($pr);
|
||||
|
||||
expect($purchase->fresh()->status)->toBe(SinglePurchaseStatus::Consumed);
|
||||
expect($purchase->fresh()->consumed_at)->not->toBeNull();
|
||||
});
|
||||
|
||||
test('submitting with an exhausted quota is blocked', function () {
|
||||
Queue::fake();
|
||||
|
||||
$user = User::factory()->create([
|
||||
'press_release_quota' => 3,
|
||||
'press_release_quota_used_this_month' => 3,
|
||||
]);
|
||||
$user->assignRole('customer');
|
||||
|
||||
$user = quotaTestSubscriber(planQuota: 3, used: 3);
|
||||
$pr = quotaTestPressRelease($user);
|
||||
|
||||
expect(fn () => app(PressReleaseService::class)->submitForReview($pr))
|
||||
|
|
@ -123,6 +192,7 @@ test('submitting with an exhausted quota is blocked', function () {
|
|||
});
|
||||
|
||||
test('monthly reset command zeroes the used counter', function () {
|
||||
/** @var TestCase $this */
|
||||
User::factory()->count(2)->create(['press_release_quota_used_this_month' => 2]);
|
||||
$untouched = User::factory()->create(['press_release_quota_used_this_month' => 0]);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue