diff --git a/app/public_schemas/public.py b/app/public_schemas/public.py index 0a52d3540..c54db8a87 100644 --- a/app/public_schemas/public.py +++ b/app/public_schemas/public.py @@ -1,10 +1,8 @@ -from datetime import timezone, datetime +from datetime import datetime, timezone from uuid import UUID -from marshmallow import EXCLUDE, Schema, fields, post_dump, pre_dump +from marshmallow import EXCLUDE, Schema, fields, post_dump -from app.schemas import FlexibleDateTime, JobSchema, TemplateSchema -from app import ma class PublicTemplateSchema(Schema): id = fields.UUID(required=True) @@ -63,7 +61,9 @@ class PublicNotificationResponseSchema(PublicNotificationSchema): # Fallback content template = data.get("template", {}) - body = data.get("body") or (template.get("content") if isinstance(template, dict) else "") + body = data.get("body") or ( + template.get("content") if isinstance(template, dict) else "" + ) data["body"] = body or "" data["content_char_count"] = len(data["body"]) diff --git a/app/schemas.py b/app/schemas.py index 142fafb1e..7abc1f11a 100644 --- a/app/schemas.py +++ b/app/schemas.py @@ -20,7 +20,7 @@ from app import ma, models from app.dao.permissions_dao import permission_dao from app.enums import NotificationStatus, ServicePermissionType, TemplateType from app.models import ServicePermission -from app.utils import DATETIME_FORMAT_NO_TIMEZONE, get_template_instance, utc_now +from app.utils import DATETIME_FORMAT_NO_TIMEZONE, utc_now from notifications_utils.recipients import ( InvalidEmailError, InvalidPhoneError, diff --git a/tests/app/public_contracts/test_GET_notification.py b/tests/app/public_contracts/test_GET_notification.py index 47dd44c29..04f68d23d 100644 --- a/tests/app/public_contracts/test_GET_notification.py +++ b/tests/app/public_contracts/test_GET_notification.py @@ -1,5 +1,3 @@ -import pytest - from app.dao.api_key_dao import save_model_api_key from app.enums import KeyType from app.models import ApiKey @@ -46,8 +44,9 @@ def test_get_job_sms_contract(client, sample_notification): validate_v0(response_json, "GET_notification_return_sms.json") - -def test_get_notifications_contract(client, sample_notification, sample_email_notification): +def test_get_notifications_contract( + client, sample_notification, sample_email_notification +): response_json = return_json_from_response( _get_notification(client, sample_notification, "/notifications") )