bernard/RosterChief
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add plan deletion, with a confirmation screen listing affected clubs

Browse Source 
Due.plan is PROTECT -- a plan that has ever billed anyone can never
truly be removed, on purpose: amount/period_end/grace_until are
frozen on a Due precisely so a later change can't rewrite what was
actually charged, and losing the plan link off an old Due would do
exactly that to every historical invoice.

"Delete" therefore means one of two things, chosen automatically
(billing/services/plans.py):
- never billed anyone -> the row is removed outright.
- has billing history -> soft-deleted (Plan.deleted_at, is_active
  off): hidden from every picker/listing via the new opt-in
  Plan.objects.visible(), but the row survives so old invoices still
  show what they were billed under.

Either way, every club currently on the plan is unsubscribed outright
-- its Subscription row deleted, not just its plan field cleared.
"No plan" was already a fully-understood state everywhere else in the
app, so this reuses it instead of inventing a new one.

Also handles the easy-to-miss second group: a club on a DIFFERENT
plan, mid-trial, configured to convert to the plan being deleted
(Subscription.post_trial_plan). Left alone that would try to convert
onto a hidden/gone plan later; instead that club's trial is ended now
(both trial fields cleared, per the CheckConstraint requiring them
together) so it needs a new plan picked by hand.

The confirmation screen is a real page, not a modal like every other
billing action -- naming exactly which clubs are affected, in both
groups, and that list can be long.
This commit is contained in:
Bernard Siebens
2026-08-08 20:01:30 +02:00
parent 617271f0d0
commit ae31c1d544
12 changed files with 540 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
controlpanel/tests.py
View File

@@ -16,9 +16,9 @@ from django.urls import reverse
from django.utils import timezone
from waffle import get_waffle_flag_model, get_waffle_switch_model
from billing.models import DEFAULT_GRACE_DAYS, Due, Plan, PlanPrice
from billing.models import DEFAULT_GRACE_DAYS, Due, Plan, PlanPrice, Subscription
from billing.services import BillingError
from billing.services.dues import record_payment, subscribe, waive
from billing.services.dues import record_payment, start_trial, subscribe, waive
from club.models import Club, ClubMembership, ClubRole, Season
from events.models import Attendance, Event, Location
from features.models import Maintenance
@@ -1662,6 +1662,121 @@ class BillingFormRenderTests(ControlPanelTestBase):
self.assertContains(response, "remove them before waiving")
class PlanDeleteTests(ControlPanelTestBase):
"""billing.services.plans and controlpanel.views.PlanDeleteView."""
def setUp(self):
super().setUp()
self.today = timezone.localdate()
self.plan = Plan.objects.create(name="Standard")
PlanPrice.objects.create(plan=self.plan, active_from=self.today - datetime.timedelta(days=1200), amount=Decimal("500.00"))
def test_a_never_used_plan_is_removed_completely(self):
unused = Plan.objects.create(name="Unused")
response = self.client.get(reverse("controlpanel:plan_delete", args=[unused.pk]))
self.assertTrue(response.context["impact"].will_hard_delete)
self.client.post(reverse("controlpanel:plan_delete", args=[unused.pk]))
self.assertFalse(Plan.objects.filter(pk=unused.pk).exists())
def test_a_plan_with_billing_history_is_hidden_not_removed(self):
subscribe(self.club, self.plan)
self.client.post(reverse("controlpanel:plan_delete", args=[self.plan.pk]))
self.plan.refresh_from_db()
self.assertTrue(Plan.objects.filter(pk=self.plan.pk).exists())
self.assertTrue(self.plan.is_deleted)
self.assertFalse(self.plan.is_active)
self.assertIsNotNone(self.plan.deleted_at)
def test_deleting_unsubscribes_every_club_currently_on_it(self):
other = Club.objects.create(name="Feyenoord")
subscribe(self.club, self.plan)
subscribe(other, self.plan)
response = self.client.get(reverse("controlpanel:plan_delete", args=[self.plan.pk]))
self.assertCountEqual([c.pk for c in response.context["impact"].unsubscribed_clubs], [self.club.pk, other.pk])
self.assertContains(response, "Ajax United")
self.assertContains(response, "Feyenoord")
self.client.post(reverse("controlpanel:plan_delete", args=[self.plan.pk]))
self.assertFalse(hasattr(self.club, "subscription") and Subscription.objects.filter(club=self.club).exists())
self.assertFalse(Subscription.objects.filter(club=other).exists())
# The club itself, and its billing history, are untouched.
self.assertTrue(Club.objects.filter(pk=self.club.pk).exists())
self.assertEqual(self.club.dues.first().plan, self.plan)
def test_the_amount_and_dates_on_a_deleted_plans_dues_are_unchanged(self):
# The whole reason a plan with history can't be hard-deleted: Due.plan, .amount,
# .period_end and .grace_until are frozen snapshots, and deleting the plan must not
# touch any of them.
subscribe(self.club, self.plan)
due = self.club.dues.first()
amount, period_end, grace_until = due.amount, due.period_end, due.grace_until
self.client.post(reverse("controlpanel:plan_delete", args=[self.plan.pk]))
due.refresh_from_db()
self.assertEqual(due.amount, amount)
self.assertEqual(due.period_end, period_end)
self.assertEqual(due.grace_until, grace_until)
self.assertEqual(due.plan_id, self.plan.pk)
def test_a_club_mid_trial_scheduled_to_convert_to_the_deleted_plan_is_flagged(self):
trial_plan = Plan.objects.create(name="Trial", is_trial=True, duration_months=2, renewal_lead_days=7, grace_days=14)
PlanPrice.objects.create(plan=trial_plan, active_from=self.today - datetime.timedelta(days=1200), amount=Decimal("0.00"))
start_trial(self.club, trial_plan, post_trial_plan=self.plan)
response = self.client.get(reverse("controlpanel:plan_delete", args=[self.plan.pk]))
self.assertEqual([c.pk for c in response.context["impact"].broken_trial_clubs], [self.club.pk])
# Not double-counted as "currently on this plan" -- it's still on the trial plan.
self.assertEqual(response.context["impact"].unsubscribed_clubs, [])
self.client.post(reverse("controlpanel:plan_delete", args=[self.plan.pk]))
self.club.refresh_from_db()
subscription = self.club.subscription
self.assertEqual(subscription.plan, trial_plan)
self.assertIsNone(subscription.trial_ends_at)
self.assertIsNone(subscription.post_trial_plan)
def test_a_deleted_plan_is_removed_from_the_billing_page(self):
subscribe(self.club, self.plan)
self.client.post(reverse("controlpanel:plan_delete", args=[self.plan.pk]))
response = self.client.get(reverse("controlpanel:billing"))
self.assertNotIn(self.plan, response.context["plans"])
def test_a_deleted_plan_cannot_be_picked_for_a_new_subscription(self):
other = Club.objects.create(name="Feyenoord")
subscribe(self.club, self.plan)
self.client.post(reverse("controlpanel:plan_delete", args=[self.plan.pk]))
response = self.client.get(reverse("controlpanel:club_detail", args=[other.pk]))
self.assertNotIn(self.plan, response.context["subscription_form"].fields["plan"].queryset)
def test_visiting_an_already_deleted_plan_redirects_with_a_message(self):
subscribe(self.club, self.plan)
self.client.post(reverse("controlpanel:plan_delete", args=[self.plan.pk]))
response = self.client.get(reverse("controlpanel:plan_delete", args=[self.plan.pk]), follow=True)
self.assertRedirects(response, reverse("controlpanel:billing"))
self.assertContains(response, "already been deleted")
def test_a_plan_with_no_clubs_reports_no_impact(self):
response = self.client.get(reverse("controlpanel:plan_delete", args=[self.plan.pk]))
self.assertFalse(response.context["impact"].has_impact)
self.assertContains(response, "No club is currently on this plan")
class MaintenancePanelTests(ControlPanelTestBase):
def setUp(self):
super().setUp()