Merge branch 'main' into fix-security-vulnerabilities

Bumps [black](https://github.com/psf/black) from 25.12.0 to 26.1.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/25.12.0...26.1.0)

---
updated-dependencies:
- dependency-name: black
  dependency-version: 26.1.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

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

.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

app/cloudfoundry_config.py

@@ -9,8 +9,8 @@ class CloudfoundryConfig:
         self.s3_buckets = {bucket["name"]: bucket["credentials"] for bucket in buckets}
         self._empty_bucket_credentials = {
             "bucket": "",
-            "access_key_id": "",
-            "secret_access_key": "",
+            "access_key_id": "",  # nosec B105
+            "secret_access_key": "",  # nosec B105
             "region": "",
         }
 

app/dao/fact_billing_dao.py

@@ -719,7 +719,7 @@ def fetch_usage_year_for_organization(
     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,
@@ -736,7 +736,7 @@ def fetch_usage_year_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,
@@ -749,7 +749,7 @@ def fetch_usage_year_for_organization(
             "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,7 +345,7 @@ def dao_get_notification_count_for_service_message_ratio(service_id, current_yea
     return recent_count + old_count
 
 
-def dao_get_notification_counts_for_organization(service_ids, current_year):
+def dao_get_notification_counts_per_service(service_ids, current_year):
     """
     Get notification counts for multiple services in a single organization.
     """
@@ -395,6 +400,31 @@ def dao_get_notification_counts_for_organization(service_ids, current_year):
     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/notifications/validators.py

@@ -35,11 +35,12 @@ def check_service_over_total_message_limit(key_type, service):
     # For now we are using calendar year
     # Switch to using service agreement dates when the Agreement model is ready
     # If the service stat has never been set before, compute the remaining seconds for 2025
-    # and set it (all services) to expire on 12/31/2025.
+    # and set it (all services) to expire on 12/31/2026.
     if service_stats is None:
         now_et = datetime.now(ZoneInfo("America/New_York"))
+
         target_time = datetime(
-            2025, 12, 31, 23, 59, 59, tzinfo=ZoneInfo("America/New_York")
+            2026, 12, 31, 23, 59, 59, tzinfo=ZoneInfo("America/New_York")
         )
         time_difference = target_time - now_et
         seconds_difference = int(time_difference.total_seconds())

app/organization/rest.py

@@ -10,7 +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_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,
@@ -23,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
@@ -151,11 +157,8 @@ 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
-    include_all = request.args.get("include_all_services", "false").lower() == "true"
 
-    services = fetch_usage_year_for_organization(
-        organization_id, year, include_all_services=include_all
-    )
+    services = fetch_usage_year_for_organization(organization_id, year)
     list_services = services.values()
     sorted_services = sorted(
         list_services, key=lambda s: (-s["active"], s["service_name"].lower())
@@ -163,6 +166,51 @@ 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"]
 )
@@ -294,7 +342,7 @@ def get_organization_message_allowance(organization_id):
     current_year = datetime.now(tz=ZoneInfo("UTC")).year
     service_ids = [service.id for service in services]
 
-    messages_by_service = dao_get_notification_counts_for_organization(
+    messages_by_service = dao_get_notification_counts_per_service(
         service_ids, current_year
     )
 

pyproject.toml

@@ -9,22 +9,22 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.13.2"
-alembic = "==1.17.0"
+alembic = "==1.18.1"
 amqp = "==5.3.1"
-beautifulsoup4 = "==4.14.2"
+beautifulsoup4 = "==4.14.3"
 boto3 = "^1.38.27"
 botocore = "^1.38.27"
-cachetools = "==6.2.1"
-celery = {version = "==5.5.3", extras = ["redis"]}
+cachetools = "==6.2.4"
+celery = {version = "==5.6.2", extras = ["redis"]}
 certifi = ">=2022.12.7"
 cffi = "==2.0.0"
 charset-normalizer = "^3.4.4"
-click = "==8.3.0"
+click = "==8.3.1"
 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"
@@ -34,30 +34,30 @@ flask-redis = "==0.4.0"
 flask-sqlalchemy = "^3.1.1"
 gunicorn = {version = "==23.0.0", extras = ["gevent"]}
 iso8601 = "==2.1.0"
-jsonschema = {version = "==4.25.1", extras = ["format"]}
+jsonschema = {version = "==4.26.0", extras = ["format"]}
 lxml = "==6.0.2"
-marshmallow = "^4.0.1"
+marshmallow = "^4.2.0"
 marshmallow-sqlalchemy = "^1.4.2"
-newrelic = "^11.0.1"
+newrelic = "^11.2.0"
 packaging = "==25.0"
 poetry-dotenv-plugin = "==0.2.0"
 psycopg2-binary = "==2.9.11"
 pyjwt = "==2.10.1"
-python-dotenv = "==1.1.1"
-sqlalchemy = "==2.0.44"
-werkzeug = "^3.0.6"
-faker = "^37.12.0"
+python-dotenv = "==1.2.1"
+sqlalchemy = "==2.0.45"
+werkzeug = "^3.1.5"
+faker = "^40.1.0"
 async-timeout = "^5.0.1"
-bleach = "^6.1.0"
+bleach = "^6.3.0"
 geojson = "^3.2.0"
-numpy = "^2.3.4"
+numpy = "^2.4.0"
 ordered-set = "^4.1.0"
-phonenumbers = "^9.0.17"
+phonenumbers = "^9.0.22"
 python-json-logger = "^4.0.0"
-regex = "^2025.10.23"
+regex = "^2025.11.3"
 shapely = "^2.1.2"
 smartypants = "^2.0.1"
-mistune = "^3.1.4"
+mistune = "^3.2.0"
 blinker = "^1.9.0"
 cryptography = "^46.0.3"
 idna = "^3.11"
@@ -68,38 +68,39 @@ python-dateutil = "^2.9.0.post0"
 pyyaml = "^6.0.3"
 s3transfer = "^0.13.1"
 six = "^1.16.0"
-urllib3 = "^2.5.0"
+urllib3 = "^2.6.3"
 webencodings = "^0.5.1"
 itsdangerous = "^2.2.0"
 jinja2 = "^3.1.6"
-redis = "^5.0.8"
+redis = "^6.4.0"
 requests = "^2.32.5"
-virtualenv = "^20.35.3"
+virtualenv = "^20.36.1"
 marshmallow-enum = "^1.5.1"
 awscli = "^1.40.36"
 typing-extensions = "^4.15.0"
-aiohttp = "^3.13.1"
-pytest = "^8.4.2"
+aiohttp = "^3.13.3"
+pytest = "^9.0.2"
+filelock = ">=3.20.3"
+pyasn1 = ">=0.6.2"
 
 
 [tool.poetry.group.dev.dependencies]
-awscli = "^1.33.32"
 bandit = "*"
-black = "^25.9.0"
-cyclonedx-python-lib = "^11.4.0"
+black = "^26.1.0"
+cyclonedx-python-lib = "^11.6.0"
 cloudfoundry-client = "*"
-exceptiongroup = "==1.3.0"
+exceptiongroup = "==1.3.1"
 flake8 = "^7.3.0"
-flake8-bugbear = "^25.10.21"
+flake8-bugbear = "^25.11.29"
 freezegun = "^1.5.5"
-hypothesis = "^6.142.3"
+hypothesis = "^6.150.2"
 honcho = "*"
 isort = "^7.0.0"
-jinja2-cli = {version = "==0.8.2", extras = ["yaml"]}
-moto = "==5.1.15"
+jinja2-cli = {version = "==1.0.0", extras = ["yaml"]}
+moto = "==5.1.19"
 pip-audit = "*"
-pre-commit = "^4.3.0"
-pytest = "^8.4.2"
+pre-commit = "^4.5.1"
+pytest = "^9.0.2"
 pytest-env = "^1.2.0"
 pytest-mock = "^3.15.1"
 pytest-cov = "^7.0.0"

terraform/demo/main.tf

@@ -50,7 +50,7 @@ module "egress-space" {
   cf_restricted_space_name = local.cf_space_name
   deployers = [
     var.cf_user,
-    "carlo.costino@gsa.gov"
+    "alex.janousek@gsa.gov"
   ]
 }
 

terraform/demo/providers.tf

@@ -2,8 +2,8 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
-      source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.53.1"
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
     }
     cfcommunity = {
       source  = "cloudfoundry-community/cloudfoundry"

terraform/production/providers.tf

@@ -2,8 +2,8 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
-      source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.53.1"
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
     }
     cfcommunity = {
       source  = "cloudfoundry-community/cloudfoundry"

terraform/sandbox/main.tf

@@ -50,7 +50,7 @@ module "egress-space" {
   cf_restricted_space_name = local.cf_space_name
   deployers = [
     var.cf_user,
-    "carlo.costino@gsa.gov"
+    "alex.janousek@gsa.gov"
   ]
 }
 

terraform/staging/main.tf

@@ -60,7 +60,7 @@ module "egress-space" {
   cf_restricted_space_name = local.cf_space_name
   deployers = [
     var.cf_user,
-    "carlo.costino@gsa.gov"
+    "alex.janousek@gsa.gov"
   ]
 }
 

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

@@ -942,7 +942,7 @@ def test_get_organization_message_allowance(admin_request, sample_organization,
     dao_add_service_to_organization(service_2, sample_organization.id)
 
     mock_get_counts = mocker.patch(
-        "app.organization.rest.dao_get_notification_counts_for_organization"
+        "app.organization.rest.dao_get_notification_counts_per_service"
     )
     mock_get_counts.return_value = {
         service_1.id: 30000,
@@ -987,3 +987,57 @@ def test_get_organization_message_allowance_invalid_org_id(admin_request):
         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])