Bump newrelic from 11.0.1 to 11.1.0 (#2086)

Bumps [newrelic](https://github.com/newrelic/newrelic-python-agent) from 11.0.1 to 11.1.0.
- [Release notes](https://github.com/newrelic/newrelic-python-agent/releases)
- [Commits](https://github.com/newrelic/newrelic-python-agent/compare/v11.0.1...v11.1.0)

---
updated-dependencies:
- dependency-name: newrelic
  dependency-version: 11.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.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 @@ GENERAL_TOKEN_ERROR_MESSAGE = TOKEN_MESSAGE_ONE + TOKEN_MESSAGE_TWO
 
 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 @@ from flask import current_app
 
 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 sqlalchemy.sql.expression import case, literal
 
 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 import create_uuid, db
 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 @@ class RateLimitError(InvalidRequest):
         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)

app/exceptions.py

@@ -1,5 +1,6 @@
 class DVLAException(Exception):
     def __init__(self, message):
+        super().__init__(message)
         self.message = message
 
 

app/organization/rest.py

@@ -1,4 +1,6 @@
 import json
+from datetime import datetime
+from zoneinfo import ZoneInfo
 
 from flask import Blueprint, abort, current_app, jsonify, request
 from sqlalchemy.exc import IntegrityError
@@ -8,6 +10,10 @@ from app.config import QueueNames
 from app.dao.annual_billing_dao import set_default_free_allowance_for_service
 from app.dao.dao_utils import transaction
 from app.dao.fact_billing_dao import fetch_usage_year_for_organization
+from app.dao.notifications_dao import (
+    dao_get_notification_counts_per_service,
+    dao_get_recent_sms_template_per_service,
+)
 from app.dao.organization_dao import (
     dao_add_service_to_organization,
     dao_add_user_to_organization,
@@ -20,7 +26,10 @@ from app.dao.organization_dao import (
     dao_remove_user_from_organization,
     dao_update_organization,
 )
-from app.dao.services_dao import dao_fetch_service_by_id
+from app.dao.services_dao import (
+    dao_fetch_service_by_id,
+    dao_get_service_primary_contacts,
+)
 from app.dao.templates_dao import dao_get_template_by_id
 from app.dao.users_dao import get_user_by_id
 from app.enums import KeyType
@@ -148,6 +157,7 @@ def get_organization_services_usage(organization_id):
         year = int(request.args.get("year", "none"))
     except ValueError:
         return jsonify(result="error", message="No valid year provided"), 400
+
     services = fetch_usage_year_for_organization(organization_id, year)
     list_services = services.values()
     sorted_services = sorted(
@@ -156,6 +166,47 @@ def get_organization_services_usage(organization_id):
     return jsonify(services=sorted_services)
 
 
+@organization_blueprint.route("/<uuid:organization_id>/dashboard", methods=["GET"])
+def get_organization_dashboard(organization_id):
+
+    check_suspicious_id(organization_id)
+
+    try:
+        year = int(request.args.get("year", "none"))
+    except ValueError:
+        return jsonify(result="error", message="No valid year provided"), 400
+
+    services_with_usage = fetch_usage_year_for_organization(
+        organization_id, year, include_all_services=True
+    )
+
+    service_ids = [service_data["service_id"] for service_data in services_with_usage.values()]
+
+    if not service_ids:
+        return jsonify(services=[]), 200
+
+    recent_templates = dao_get_recent_sms_template_per_service(service_ids)
+    primary_contacts = dao_get_service_primary_contacts(service_ids)
+
+    for service_data in services_with_usage.values():
+        service_uuid = service_data["service_id"]
+        service_data["recent_sms_template_name"] = recent_templates.get(service_uuid)
+        service_data["primary_contact"] = primary_contacts.get(service_uuid)
+
+    services_list = list(services_with_usage.values())
+    sorted_services = sorted(
+        services_list,
+        key=lambda s: (
+            0 if (s["active"] and not s["restricted"]) else
+            1 if (s["active"] and s["restricted"]) else
+            2,
+            s["service_name"].lower()
+        )
+    )
+
+    return jsonify(services=sorted_services)
+
+
 @organization_blueprint.route(
     "/<uuid:organization_id>/users/<uuid:user_id>", methods=["POST"]
 )
@@ -259,3 +310,49 @@ def send_notifications_on_mou_signed(organization_id):
         organization.agreement_signed_by.email_address,
         personalisation,
     )
+
+
+@organization_blueprint.route(
+    "/<uuid:organization_id>/message-allowance", methods=["GET"]
+)
+def get_organization_message_allowance(organization_id):
+
+    check_suspicious_id(organization_id)
+
+    dao_get_organization_by_id(organization_id)
+
+    services = dao_get_organization_services(organization_id)
+
+    if not services:
+        return (
+            jsonify(
+                {
+                    "messages_sent": 0,
+                    "messages_remaining": 0,
+                    "total_message_limit": 0,
+                }
+            ),
+            200,
+        )
+
+    current_year = datetime.now(tz=ZoneInfo("UTC")).year
+    service_ids = [service.id for service in services]
+
+    messages_by_service = dao_get_notification_counts_per_service(
+        service_ids, current_year
+    )
+
+    total_messages_sent = sum(messages_by_service.get(s.id, 0) for s in services)
+    total_message_limit = sum(s.total_message_limit for s in services)
+    total_messages_remaining = total_message_limit - total_messages_sent
+
+    return (
+        jsonify(
+            {
+                "messages_sent": total_messages_sent,
+                "messages_remaining": total_messages_remaining,
+                "total_message_limit": total_message_limit,
+            }
+        ),
+        200,
+    )

notifications_python_client/errors.py

@@ -18,6 +18,7 @@ class TokenError(Exception):
             else TOKEN_ERROR_DEFAULT_ERROR_MESSAGE
         )
         self.token = token
+        super().__init__(self.message, token)
 
 
 class TokenExpiredError(TokenError):
@@ -48,6 +49,7 @@ class APIError(Exception):
     def __init__(self, response: Response = None, message: str = None):
         self.response = response
         self._message = message
+        super().__init__(response, message)
 
     def __str__(self):
         return f"{self.status_code} - {self.message}"

notifications_utils/clients/antivirus/antivirus_client.py

@@ -4,6 +4,7 @@ from flask import current_app
 
 class AntivirusError(Exception):
     def __init__(self, message=None, status_code=None):
+        super().__init__(message, status_code)
         self.message = message
         self.status_code = status_code
 

notifications_utils/clients/zendesk/zendesk_client.py

@@ -4,6 +4,7 @@ from flask import current_app
 
 class ZendeskError(Exception):
     def __init__(self, response):
+        super().__init__(str(response))
         self.response = response
 
 

notifications_utils/recipients.py

@@ -515,9 +515,6 @@ def is_us_phone_number(number):
     try:
         return _get_country_code(number) == us_prefix
     except NumberParseException:
-        current_app.logger.exception(
-            "NumberParseException checking if phone number is US number"
-        )
         return False
 
 
@@ -606,7 +603,6 @@ def validate_us_phone_number(number):
             raise InvalidPhoneError("Phone number range is not in use")
         raise InvalidPhoneError("Phone number is not possible")
     except NumberParseException as exc:
-        current_app.logger.exception("NumberParseException validating US phone number")
         raise InvalidPhoneError(exc._msg) from exc
 
 
@@ -663,9 +659,6 @@ def try_validate_and_format_phone_number(number, international=None, log_msg=Non
     try:
         return validate_and_format_phone_number(number, international)
     except InvalidPhoneError as exc:
-        current_app.logger.exception(
-            "InvalidPhoneNumber while trying to validate and format phone number"
-        )
         if log_msg:
             current_app.logger.warning("{}: {}".format(log_msg, exc))
         return number

pyproject.toml

@@ -9,7 +9,7 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.13.2"
-alembic = "==1.17.0"
+alembic = "==1.17.1"
 amqp = "==5.3.1"
 beautifulsoup4 = "==4.14.2"
 boto3 = "^1.38.27"
@@ -24,7 +24,7 @@ click-datetime = "==0.4.0"
 click-didyoumean = "==0.3.1"
 click-plugins = "==1.1.1.2"
 click-repl = "==0.3.0"
-deprecated = "==1.2.18"
+deprecated = "==1.3.1"
 gevent = "==25.5.1"
 expiringdict = "==1.2.2"
 flask = "~=3.1"
@@ -36,30 +36,30 @@ gunicorn = {version = "==23.0.0", extras = ["gevent"]}
 iso8601 = "==2.1.0"
 jsonschema = {version = "==4.25.1", extras = ["format"]}
 lxml = "==6.0.2"
-marshmallow = "^4.0.1"
+marshmallow = "^4.1.0"
 marshmallow-sqlalchemy = "^1.4.2"
-newrelic = "^11.0.1"
+newrelic = "^11.1.0"
 packaging = "==25.0"
 poetry-dotenv-plugin = "==0.2.0"
 psycopg2-binary = "==2.9.11"
 pyjwt = "==2.10.1"
-python-dotenv = "==1.1.1"
+python-dotenv = "==1.2.1"
 sqlalchemy = "==2.0.44"
 werkzeug = "^3.0.6"
-faker = "^37.8.0"
+faker = "^37.12.0"
 async-timeout = "^5.0.1"
-bleach = "^6.1.0"
+bleach = "^6.3.0"
 geojson = "^3.2.0"
-numpy = "^2.3.3"
+numpy = "^2.3.4"
 ordered-set = "^4.1.0"
-phonenumbers = "^9.0.16"
+phonenumbers = "^9.0.17"
 python-json-logger = "^4.0.0"
-regex = "^2025.9.18"
+regex = "^2025.11.3"
 shapely = "^2.1.2"
 smartypants = "^2.0.1"
 mistune = "^3.1.4"
 blinker = "^1.9.0"
-cryptography = "^46.0.2"
+cryptography = "^46.0.3"
 idna = "^3.11"
 jmespath = "^1.0.1"
 markupsafe = "^3.0.3"
@@ -74,11 +74,11 @@ itsdangerous = "^2.2.0"
 jinja2 = "^3.1.6"
 redis = "^5.0.8"
 requests = "^2.32.5"
-virtualenv = "^20.35.3"
+virtualenv = "^20.35.4"
 marshmallow-enum = "^1.5.1"
 awscli = "^1.40.36"
 typing-extensions = "^4.15.0"
-aiohttp = "^3.12.15"
+aiohttp = "^3.13.2"
 pytest = "^8.4.2"
 
 
@@ -86,17 +86,17 @@ pytest = "^8.4.2"
 awscli = "^1.33.32"
 bandit = "*"
 black = "^25.9.0"
-cyclonedx-python-lib = "^11.1.0"
+cyclonedx-python-lib = "^11.5.0"
 cloudfoundry-client = "*"
 exceptiongroup = "==1.3.0"
 flake8 = "^7.3.0"
-flake8-bugbear = "^24.12.12"
+flake8-bugbear = "^25.10.21"
 freezegun = "^1.5.5"
-hypothesis = "^6.141.0"
+hypothesis = "^6.145.1"
 honcho = "*"
 isort = "^7.0.0"
 jinja2-cli = {version = "==0.8.2", extras = ["yaml"]}
-moto = "==5.1.14"
+moto = "==5.1.16"
 pip-audit = "*"
 pre-commit = "^4.3.0"
 pytest = "^8.4.2"

terraform/demo/providers.tf

@@ -5,6 +5,10 @@ terraform {
       source  = "cloudfoundry-community/cloudfoundry"
       version = "0.53.1"
     }
+    cfcommunity = {
+      source  = "cloudfoundry-community/cloudfoundry"
+      version = "0.53.1"
+    }
   }
 
   backend "s3" {
@@ -16,7 +20,16 @@ terraform {
   }
 }
 
+# Official provider (should be default but aliased for now)
 provider "cloudfoundry" {
+  alias    = "official"
+  api_url  = "https://api.fr.cloud.gov"
+  user     = var.cf_user
+  password = var.cf_password
+}
+
+# Community provider (should be aliased but default for now)
+provider "cfcommunity" {
   api_url      = "https://api.fr.cloud.gov"
   user         = var.cf_user
   password     = var.cf_password

terraform/production/providers.tf

@@ -5,6 +5,10 @@ terraform {
       source  = "cloudfoundry-community/cloudfoundry"
       version = "0.53.1"
     }
+    cfcommunity = {
+      source  = "cloudfoundry-community/cloudfoundry"
+      version = "0.53.1"
+    }
   }
 
   backend "s3" {
@@ -16,7 +20,16 @@ terraform {
   }
 }
 
+# Official provider (should be default but aliased for now)
 provider "cloudfoundry" {
+  alias    = "official"
+  api_url  = "https://api.fr.cloud.gov"
+  user     = var.cf_user
+  password = var.cf_password
+}
+
+# Community provider (should be aliased but default for now)
+provider "cfcommunity" {
   api_url      = "https://api.fr.cloud.gov"
   user         = var.cf_user
   password     = var.cf_password

terraform/staging/main.tf

@@ -12,6 +12,13 @@ resource "null_resource" "prevent_destroy" {
   }
 }
 
+
+data "cloudfoundry_space" "space" {
+  provider = cloudfoundry.official
+  org      = "9e428562-a2d9-41b4-9c23-1ef5237fb44e"
+  name     = local.cf_space_name
+}
+
 module "database" {
   source = "github.com/GSA-TTS/terraform-cloudgov//database?ref=v1.0.0"
 
@@ -21,11 +28,14 @@ module "database" {
   rds_plan_name = "small-psql"
 }
 
-module "redis-v70" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
 
-  cf_org_name     = local.cf_org_name
-  cf_space_name   = local.cf_space_name
+module "redis-v70" {
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
+  # Right now the default is cfcommunity, remove this when default is cloudfoundry
+  providers = {
+    cloudfoundry = cloudfoundry.official
+  }
+  cf_space_id     = data.cloudfoundry_space.space.id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
   json_params = jsonencode(
@@ -55,8 +65,7 @@ module "egress-space" {
 }
 
 module "ses_email" {
-  source = "../shared/ses"
-
+  source              = "../shared/ses"
   cf_org_name         = local.cf_org_name
   cf_space_name       = local.cf_space_name
   name                = "${local.app_name}-ses-${local.env}"

terraform/staging/providers.tf

@@ -2,6 +2,10 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
+    }
+    cfcommunity = {
       source  = "cloudfoundry-community/cloudfoundry"
       version = "0.53.1"
     }
@@ -16,7 +20,16 @@ terraform {
   }
 }
 
+# Official provider (should be default but aliased for now)
 provider "cloudfoundry" {
+  alias    = "official"
+  api_url  = "https://api.fr.cloud.gov"
+  user     = var.cf_user
+  password = var.cf_password
+}
+
+# Community provider (should be aliased but default for now)
+provider "cfcommunity" {
   api_url      = "https://api.fr.cloud.gov"
   user         = var.cf_user
   password     = var.cf_password

tests/app/dao/test_fact_billing_dao.py

@@ -924,7 +924,7 @@ def test_fetch_usage_year_for_organization(notify_db_session):
     results = fetch_usage_year_for_organization(fixtures["org_1"].id, 2019)
 
     assert len(results) == 3
-    first_row = results[str(fixtures["service_1_sms_and_letter"].id)]
+    first_row = results[fixtures["service_1_sms_and_letter"].id]
     assert first_row["service_id"] == fixtures["service_1_sms_and_letter"].id
     assert first_row["service_name"] == fixtures["service_1_sms_and_letter"].name
     assert first_row["free_sms_limit"] == 10
@@ -933,7 +933,7 @@ def test_fetch_usage_year_for_organization(notify_db_session):
     assert first_row["sms_cost"] == 0.0
     assert first_row["emails_sent"] == 0
 
-    second_row = results[str(service_with_emails_for_org.id)]
+    second_row = results[service_with_emails_for_org.id]
     assert second_row["service_id"] == service_with_emails_for_org.id
     assert second_row["service_name"] == service_with_emails_for_org.name
     assert second_row["free_sms_limit"] == 0
@@ -942,7 +942,7 @@ def test_fetch_usage_year_for_organization(notify_db_session):
     assert second_row["sms_cost"] == 0
     assert second_row["emails_sent"] == 1100
 
-    third_row = results[str(fixtures["service_with_out_ft_billing_this_year"].id)]
+    third_row = results[fixtures["service_with_out_ft_billing_this_year"].id]
     assert (
         third_row["service_id"] == fixtures["service_with_out_ft_billing_this_year"].id
     )
@@ -1025,11 +1025,11 @@ def test_fetch_usage_year_for_organization_calculates_cost_from_multiple_rates(
     )
 
     assert len(results) == 1
-    assert results[str(service_1.id)]["free_sms_limit"] == 3
-    assert results[str(service_1.id)]["sms_remainder"] == 0
-    assert results[str(service_1.id)]["sms_billable_units"] == 6
-    assert results[str(service_1.id)]["chargeable_billable_sms"] == 3
-    assert results[str(service_1.id)]["sms_cost"] == 8.0
+    assert results[service_1.id]["free_sms_limit"] == 3
+    assert results[service_1.id]["sms_remainder"] == 0
+    assert results[service_1.id]["sms_billable_units"] == 6
+    assert results[service_1.id]["chargeable_billable_sms"] == 3
+    assert results[service_1.id]["sms_cost"] == 8.0
 
 
 @freeze_time("2022-05-01 13:30")
@@ -1051,11 +1051,11 @@ def test_fetch_usage_year_for_organization_when_no_usage(notify_db_session):
     )
 
     assert len(results) == 1
-    assert results[str(service_1.id)]["free_sms_limit"] == 3
-    assert results[str(service_1.id)]["sms_remainder"] == 3
-    assert results[str(service_1.id)]["sms_billable_units"] == 0
-    assert results[str(service_1.id)]["chargeable_billable_sms"] == 0
-    assert results[str(service_1.id)]["sms_cost"] == 0.0
+    assert results[service_1.id]["free_sms_limit"] == 3
+    assert results[service_1.id]["sms_remainder"] == 3
+    assert results[service_1.id]["sms_billable_units"] == 0
+    assert results[service_1.id]["chargeable_billable_sms"] == 0
+    assert results[service_1.id]["sms_cost"] == 0.0
 
 
 @freeze_time("2022-05-01 13:30")
@@ -1112,9 +1112,9 @@ def test_fetch_usage_year_for_organization_only_queries_present_year(notify_db_s
     results = fetch_usage_year_for_organization(organization_id=org.id, year=last_year)
 
     assert len(results) == 1
-    assert results[str(service_1.id)]["sms_billable_units"] == 2
-    assert results[str(service_1.id)]["chargeable_billable_sms"] == 2
-    assert results[str(service_1.id)]["sms_cost"] == 2.0
+    assert results[service_1.id]["sms_billable_units"] == 2
+    assert results[service_1.id]["chargeable_billable_sms"] == 2
+    assert results[service_1.id]["sms_cost"] == 2.0
 
 
 @freeze_time("2020-02-27 13:30")
@@ -1165,8 +1165,8 @@ def test_fetch_usage_year_for_organization_only_returns_data_for_live_services(
     results = fetch_usage_year_for_organization(organization_id=org.id, year=2020)
 
     assert len(results) == 1
-    assert results[str(live_service.id)]["sms_billable_units"] == 19
-    assert results[str(live_service.id)]["emails_sent"] == 0
+    assert results[live_service.id]["sms_billable_units"] == 19
+    assert results[live_service.id]["emails_sent"] == 0
 
 
 @freeze_time("2022-04-27 13:30")

tests/app/organization/test_rest.py

@@ -928,3 +928,112 @@ def test_missing_both():
             {"org_id": ["Can't be empty"]},
             {"name": ["Can't be empty"]},
         ]
+
+
+@freeze_time("2025-01-15 10:00:00")
+def test_get_organization_message_allowance(admin_request, sample_organization, mocker):
+    service_1 = create_service(service_name="Service 1")
+    service_2 = create_service(service_name="Service 2")
+
+    service_1.total_message_limit = 100000
+    service_2.total_message_limit = 50000
+
+    dao_add_service_to_organization(service_1, sample_organization.id)
+    dao_add_service_to_organization(service_2, sample_organization.id)
+
+    mock_get_counts = mocker.patch(
+        "app.organization.rest.dao_get_notification_counts_per_service"
+    )
+    mock_get_counts.return_value = {
+        service_1.id: 30000,
+        service_2.id: 20000,
+    }
+
+    response = admin_request.get(
+        "organization.get_organization_message_allowance",
+        organization_id=sample_organization.id,
+        _expected_status=200,
+    )
+
+    assert response["messages_sent"] == 50000
+    assert response["messages_remaining"] == 100000
+    assert response["total_message_limit"] == 150000
+
+    assert mock_get_counts.call_count == 1
+    mock_get_counts.assert_called_once()
+    args, _ = mock_get_counts.call_args
+    assert set(args[0]) == {service_1.id, service_2.id}
+    assert args[1] == 2025
+
+
+def test_get_organization_message_allowance_no_services(
+    admin_request, sample_organization
+):
+    response = admin_request.get(
+        "organization.get_organization_message_allowance",
+        organization_id=sample_organization.id,
+        _expected_status=200,
+    )
+
+    assert response["messages_sent"] == 0
+    assert response["messages_remaining"] == 0
+    assert response["total_message_limit"] == 0
+
+
+def test_get_organization_message_allowance_invalid_org_id(admin_request):
+    fake_uuid = "00000000-0000-0000-0000-000000000000"
+    admin_request.get(
+        "organization.get_organization_message_allowance",
+        organization_id=fake_uuid,
+        _expected_status=404,
+    )
+
+
+def test_get_organization_dashboard(admin_request, mocker):
+    org_id = uuid.uuid4()
+    service_id = uuid.uuid4()
+
+    mock_usage = mocker.patch("app.organization.rest.fetch_usage_year_for_organization")
+    mock_usage.return_value = {
+        service_id: {
+            "service_id": service_id,
+            "service_name": "Test Service",
+            "active": True,
+            "restricted": False,
+            "emails_sent": 100,
+            "sms_billable_units": 5,
+            "sms_remainder": 245,
+            "sms_cost": 1.50,
+            "free_sms_limit": 250,
+            "chargeable_billable_sms": 0,
+        }
+    }
+
+    mock_templates = mocker.patch("app.organization.rest.dao_get_recent_sms_template_per_service")
+    mock_templates.return_value = {service_id: "Welcome SMS"}
+
+    mock_contacts = mocker.patch("app.organization.rest.dao_get_service_primary_contacts")
+    mock_contacts.return_value = {service_id: "billing@example.com"}
+
+    response = admin_request.get(
+        "organization.get_organization_dashboard",
+        organization_id=org_id,
+        **{"year": 2025},
+    )
+
+    assert len(response["services"]) == 1
+    service_data = response["services"][0]
+
+    assert service_data["service_id"] == str(service_id)
+    assert service_data["service_name"] == "Test Service"
+    assert service_data["active"] is True
+    assert service_data["restricted"] is False
+    assert service_data["sms_billable_units"] == 5
+    assert service_data["free_sms_limit"] == 250
+    assert service_data["sms_remainder"] == 245
+    assert service_data["recent_sms_template_name"] == "Welcome SMS"
+    assert service_data["primary_contact"] == "billing@example.com"
+
+    mock_usage.assert_called_once_with(org_id, 2025, include_all_services=True)
+    mock_templates.assert_called_once_with([service_id])
+    mock_contacts.assert_called_once_with([service_id])