Merge pull request #2094 from GSA/main

11/12/2025 Production Deploy

Author: ccostino

.github/workflows/deploy.yml

@@ -36,6 +36,7 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
       run: terraform init
+
     - name: Terraform apply
       working-directory: terraform/staging
       env:

.github/workflows/drift.yml

@@ -44,44 +44,44 @@ jobs:
             exit $exit_code
           fi
 
-  check_demo_drift:
-    runs-on: ubuntu-latest
-    name: Check for drift of demo terraform configuration
-    environment: demo
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: 'production'
+  # check_demo_drift:
+  #   runs-on: ubuntu-latest
+  #   name: Check for drift of demo terraform configuration
+  #   environment: demo
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         ref: 'production'
 
-      # Looks like we need to install Terraform ourselves now!
-      # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
-      - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v3
-        with:
-          terraform_version: "^1.7.5"
-          terraform_wrapper: false
+  #     # Looks like we need to install Terraform ourselves now!
+  #     # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
+  #     - name: Setup Terraform
+  #       uses: hashicorp/setup-terraform@v3
+  #       with:
+  #         terraform_version: "^1.7.5"
+  #         terraform_wrapper: false
 
-      - name: Check for drift
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
-          TF_VAR_cf_user: ${{ secrets.CLOUDGOV_USERNAME }}
-          TF_VAR_cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
-        run: |
-          cd terraform/demo
-          terraform init
-          terraform plan -detailed-exitcode
-          exit_code=$?
-          if [ $exit_code -eq 0 ]; then
-            echo "No changes detected.  Intrastructure is up-to-date."
-          elif [ $exit_code -eq 2 ]; then
-            echo "Changes detected.  Infrastructure drift found."
-            exit 1
-          else
-            echo "Error running terraform plan."
-            exit $exit_code
-          fi
+  #     - name: Check for drift
+  #       env:
+  #         AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
+  #         AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
+  #         TF_VAR_cf_user: ${{ secrets.CLOUDGOV_USERNAME }}
+  #         TF_VAR_cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
+  #       run: |
+  #         cd terraform/demo
+  #         terraform init
+  #         terraform plan -detailed-exitcode
+  #         exit_code=$?
+  #         if [ $exit_code -eq 0 ]; then
+  #           echo "No changes detected.  Intrastructure is up-to-date."
+  #         elif [ $exit_code -eq 2 ]; then
+  #           echo "Changes detected.  Infrastructure drift found."
+  #           exit 1
+  #         else
+  #           echo "Error running terraform plan."
+  #           exit $exit_code
+  #         fi
 
   check_prod_drift:
     runs-on: ubuntu-latest

.github/workflows/terraform-staging.yml

@@ -41,6 +41,7 @@ jobs:
         id: validation
         run: terraform validate -no-color
 
+
       - name: Terraform plan
         id: plan
         env:

app/authentication/auth.py

@@ -29,6 +29,7 @@
 
 class AuthError(Exception):
     def __init__(self, message, code, service_id=None, api_key_id=None):
+        super().__init__(message, code, service_id, api_key_id)
         self.message = {"token": [message]}
         self.short_message = message
         self.code = code

app/clients/document_download.py

@@ -4,6 +4,7 @@
 
 class DocumentDownloadError(Exception):
     def __init__(self, message, status_code):
+        super().__init__(message, status_code)
         self.message = message
         self.status_code = status_code
 

app/clients/sms/__init__.py

@@ -10,6 +10,7 @@ class SmsClientResponseException(ClientException):
     """
 
     def __init__(self, message):
+        super().__init__(message)
         self.message = message
 
     def __str__(self):

app/dao/fact_billing_dao.py

@@ -7,7 +7,10 @@
 
 from app import db
 from app.dao.date_util import get_calendar_year_dates, get_calendar_year_for_datetime
-from app.dao.organization_dao import dao_get_organization_live_services
+from app.dao.organization_dao import (
+    dao_get_organization_live_services,
+    dao_get_organization_services,
+)
 from app.enums import KeyType, NotificationStatus, NotificationType
 from app.models import (
     AnnualBilling,
@@ -613,6 +616,7 @@ def fetch_sms_billing_for_organization(organization_id, financial_year):
             func.coalesce(chargeable_sms, 0).label("chargeable_billable_sms"),
             func.coalesce(sms_cost, 0).label("sms_cost"),
             Service.active,
+            Service.restricted,
         )
         .select_from(Service)
         .outerjoin(
@@ -695,10 +699,16 @@ def query_organization_sms_usage_for_year(organization_id, year):
     )
 
 
-def fetch_usage_year_for_organization(organization_id, year):
+def fetch_usage_year_for_organization(
+    organization_id, year, include_all_services=False
+):
     year_start, year_end = get_calendar_year_dates(year)
     today = utc_now().date()
-    services = dao_get_organization_live_services(organization_id)
+
+    if include_all_services:
+        services = dao_get_organization_services(organization_id)
+    else:
+        services = dao_get_organization_live_services(organization_id)
 
     # if year end date is less than today, we are calculating for data in the past and have no need for deltas.
     if year_end >= today:
@@ -709,7 +719,7 @@ def fetch_usage_year_for_organization(organization_id, year):
     service_with_usage = {}
     # initialise results
     for service in services:
-        service_with_usage[str(service.id)] = {
+        service_with_usage[service.id] = {
             "service_id": service.id,
             "service_name": service.name,
             "free_sms_limit": 0,
@@ -719,13 +729,14 @@ def fetch_usage_year_for_organization(organization_id, year):
             "sms_cost": 0.0,
             "emails_sent": 0,
             "active": service.active,
+            "restricted": service.restricted,
         }
     sms_usages = fetch_sms_billing_for_organization(organization_id, year)
     email_usages = fetch_email_usage_for_organization(
         organization_id, year_start, year_end
     )
     for usage in sms_usages:
-        service_with_usage[str(usage.service_id)] = {
+        service_with_usage[usage.service_id] = {
             "service_id": usage.service_id,
             "service_name": usage.service_name,
             "free_sms_limit": usage.free_sms_fragment_limit,
@@ -735,9 +746,10 @@ def fetch_usage_year_for_organization(organization_id, year):
             "sms_cost": float(usage.sms_cost),
             "emails_sent": 0,
             "active": usage.active,
+            "restricted": usage.restricted,
         }
     for email_usage in email_usages:
-        service_with_usage[str(email_usage.service_id)][
+        service_with_usage[email_usage.service_id][
             "emails_sent"
         ] = email_usage.emails_sent
 

app/dao/notifications_dao.py

@@ -27,7 +27,12 @@
 from app.dao.dao_utils import autocommit
 from app.dao.inbound_sms_dao import Pagination
 from app.enums import KeyType, NotificationStatus, NotificationType
-from app.models import FactNotificationStatus, Notification, NotificationHistory
+from app.models import (
+    FactNotificationStatus,
+    Notification,
+    NotificationHistory,
+    Template,
+)
 from app.utils import (
     escape_special_characters,
     get_midnight_in_utc,
@@ -340,6 +345,86 @@ def dao_get_notification_count_for_service_message_ratio(service_id, current_yea
     return recent_count + old_count
 
 
+def dao_get_notification_counts_per_service(service_ids, current_year):
+    """
+    Get notification counts for multiple services in a single organization.
+    """
+    if not service_ids:
+        return {}
+
+    start_date = datetime(current_year, 6, 16)
+    end_date = datetime(current_year + 1, 6, 16)
+
+    stmt1 = (
+        select(Notification.service_id, func.count().label("count"))
+        .where(
+            Notification.service_id.in_(service_ids),
+            Notification.status
+            not in [
+                NotificationStatus.CANCELLED,
+                NotificationStatus.CREATED,
+                NotificationStatus.SENDING,
+            ],
+            Notification.created_at >= start_date,
+            Notification.created_at < end_date,
+        )
+        .group_by(Notification.service_id)
+    )
+
+    stmt2 = (
+        select(NotificationHistory.service_id, func.count().label("count"))
+        .where(
+            NotificationHistory.service_id.in_(service_ids),
+            NotificationHistory.status
+            not in [
+                NotificationStatus.CANCELLED,
+                NotificationStatus.CREATED,
+                NotificationStatus.SENDING,
+            ],
+            NotificationHistory.created_at >= start_date,
+            NotificationHistory.created_at < end_date,
+        )
+        .group_by(NotificationHistory.service_id)
+    )
+
+    result_dict = {}
+
+    recent_results = db.session.execute(stmt1).all()
+    for service_id, count in recent_results:
+        result_dict[service_id] = count
+
+    history_results = db.session.execute(stmt2).all()
+    for service_id, count in history_results:
+        result_dict[service_id] = result_dict.get(service_id, 0) + count
+
+    return result_dict
+
+
+def dao_get_recent_sms_template_per_service(service_ids):
+
+    if not service_ids:
+        return {}
+
+    stmt = (
+        select(
+            Notification.service_id,
+            Template.name.label("template_name"),
+        )
+        .join(Template, Template.id == Notification.template_id)
+        .where(
+            Notification.service_id.in_(service_ids),
+            Notification.notification_type == NotificationType.SMS,
+            Notification.key_type != KeyType.TEST,
+        )
+        .distinct(Notification.service_id)
+        .order_by(Notification.service_id, desc(Notification.created_at))
+    )
+
+    results = db.session.execute(stmt).all()
+
+    return {service_id: template_name for service_id, template_name in results}
+
+
 def dao_get_failed_notification_count():
     stmt = select(func.count(Notification.id)).where(
         Notification.status == NotificationStatus.FAILED

app/dao/services_dao.py

@@ -254,6 +254,21 @@ def dao_fetch_all_services_created_by_user(user_id):
     return db.session.execute(stmt).scalars().all()
 
 
+def dao_get_service_primary_contacts(service_ids):
+
+    if not service_ids:
+        return {}
+
+    stmt = select(
+        Service.id.label("service_id"),
+        Service.billing_contact_email_addresses.label("email_address"),
+    ).where(Service.id.in_(service_ids))
+
+    results = db.session.execute(stmt).all()
+
+    return {service_id: email_address for service_id, email_address in results}
+
+
 @autocommit
 @version_class(
     VersionOptions(ApiKey, must_write_history=False),

app/errors.py

@@ -15,7 +15,7 @@ class InvalidRequest(Exception):
     fields = []
 
     def __init__(self, message, status_code):
-        super().__init__()
+        super().__init__(message, status_code)
         self.message = message
         self.status_code = status_code
 
@@ -115,16 +115,20 @@ class TooManyRequestsError(InvalidRequest):
     status_code = 429
     message_template = "Exceeded send limits ({}) for today"
 
-    def __init__(self, sending_limit):
+    def __init__(self, sending_limit):  # noqa: B042
         self.message = self.message_template.format(sending_limit)
+        self.sending_limit = sending_limit
+        super().__init__(self.message, self.status_code)
 
 
 class TotalRequestsError(InvalidRequest):
     status_code = 429
     message_template = "Exceeded total application limits ({}) for today"
 
-    def __init__(self, sending_limit):
+    def __init__(self, sending_limit):  # noqa: B042
         self.message = self.message_template.format(sending_limit)
+        self.sending_limit = sending_limit
+        super().__init__(self.message, self.status_code)
 
 
 class RateLimitError(InvalidRequest):
@@ -133,7 +137,7 @@ class RateLimitError(InvalidRequest):
         "Exceeded rate limit for key type {} of {} requests per {} seconds"
     )
 
-    def __init__(self, sending_limit, interval, key_type):
+    def __init__(self, sending_limit, interval, key_type):  # noqa: B042
         # normal keys are spoken of as "live" in the documentation
         # so using this in the error messaging
         if key_type == KeyType.NORMAL:
@@ -142,12 +146,17 @@ def __init__(self, sending_limit, interval, key_type):
         self.message = self.message_template.format(
             key_type.upper(), sending_limit, interval
         )
+        self.sending_limit = sending_limit
+        self.interval = interval
+        self.key_type = key_type
+        super().__init__(self.message, self.status_code)
 
 
 class BadRequestError(InvalidRequest):
     message = "An error occurred"
 
-    def __init__(self, fields=None, message=None, status_code=400):
-        self.status_code = status_code
+    def __init__(self, fields=None, message=None, status_code=400):  # noqa: B042
         self.fields = fields or []
         self.message = message if message else self.message
+        self.status_code = status_code
+        super().__init__(self.message, self.status_code)