handle abolished subscriptions (emails, cli, controller app)

Author: dlpbc

rctab/routers/accounting/approvals.py

@@ -116,6 +116,12 @@ async def check_approval(approval: Approval) -> None:
 
     current_date = datetime.date.today()
 
+    if subscription_summary.abolished and not approval.force:
+        raise HTTPException(
+            status_code=400,
+            detail="Abolished subscription. Force approve if you are certain that the subscription has not been abolished.",
+        )
+
     if approval.date_to < current_date:
         raise HTTPException(
             status_code=400,

rctab/routers/accounting/desired_states.py

@@ -96,20 +96,23 @@ async def get_desired_states(
             (summaries.c.desired_status == True, SubscriptionState("Enabled")),
         ).label("desired_state"),
     ).where(
-        or_(
-            and_(
-                summaries.c.desired_status == False,
-                or_(
-                    summaries.c.status == SubscriptionState("Enabled"),
-                    summaries.c.status == SubscriptionState("PastDue"),
+        and_(
+            summaries.c.abolished == False,
+            or_(
+                and_(
+                    summaries.c.desired_status == False,
+                    or_(
+                        summaries.c.status == SubscriptionState("Enabled"),
+                        summaries.c.status == SubscriptionState("PastDue"),
+                    ),
                 ),
-            ),
-            and_(
-                summaries.c.desired_status == True,
-                or_(
-                    summaries.c.status == SubscriptionState("Disabled"),
-                    summaries.c.status == SubscriptionState("Warned"),
-                    summaries.c.status == SubscriptionState("Expired"),
+                and_(
+                    summaries.c.desired_status == True,
+                    or_(
+                        summaries.c.status == SubscriptionState("Disabled"),
+                        summaries.c.status == SubscriptionState("Warned"),
+                        summaries.c.status == SubscriptionState("Expired"),
+                    ),
                 ),
             ),
         )

rctab/routers/accounting/routes.py

@@ -48,6 +48,7 @@ class SubscriptionSummary(BaseModel):
     total_cost: float
     first_usage: Optional[datetime.date]
     latest_usage: Optional[datetime.date]
+    abolished: bool
 
 
 @db_select

rctab/routers/accounting/send_emails.py

@@ -12,7 +12,7 @@
 from jinja2 import Environment, PackageLoader, exceptions
 from rctab_models.models import SubscriptionState, SubscriptionStatus
 from sendgrid import Mail, SendGridAPIClient
-from sqlalchemy import asc, desc, func, insert, or_, select
+from sqlalchemy import and_, asc, desc, func, insert, or_, select
 from sqlalchemy.sql import Select
 
 from rctab.constants import (
@@ -412,7 +412,12 @@ async def check_for_subs_nearing_expiry(database: Database) -> None:
     # We don't _have_ to filter on approved_to, but it might make things slightly quicker
     expiry_query = (
         select(summary.c.subscription_id, summary.c.approved_to, summary.c.status)
-        .where(summary.c.approved_to <= date.today() + timedelta(days=30))
+        .where(
+            and_(
+                summary.c.abolished == False,  # pylint: disable=singleton-comparison
+                summary.c.approved_to <= date.today() + timedelta(days=30),
+            )
+        )
         .order_by(summary.c.approved_to)
     )
     rows = await database.fetch_all(expiry_query)
@@ -436,7 +441,12 @@ async def check_for_overbudget_subs(database: Database) -> None:
 
     overbudget_query = (
         select(summary.c.subscription_id, summary.c.allocated, summary.c.total_cost)
-        .where(summary.c.total_cost > summary.c.allocated)
+        .where(
+            and_(
+                summary.c.abolished == False,  # pylint: disable=singleton-comparison
+                summary.c.total_cost > summary.c.allocated,
+            )
+        )
         .where(
             or_(
                 summary.c.status == SubscriptionState("Enabled"),