mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-04 10:21:14 -05:00
Fixed some linting errors
This commit is contained in:
@@ -1,10 +1,8 @@
|
|||||||
from datetime import timezone, datetime
|
from datetime import datetime, timezone
|
||||||
from uuid import UUID
|
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):
|
class PublicTemplateSchema(Schema):
|
||||||
id = fields.UUID(required=True)
|
id = fields.UUID(required=True)
|
||||||
@@ -63,7 +61,9 @@ class PublicNotificationResponseSchema(PublicNotificationSchema):
|
|||||||
|
|
||||||
# Fallback content
|
# Fallback content
|
||||||
template = data.get("template", {})
|
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["body"] = body or ""
|
||||||
data["content_char_count"] = len(data["body"])
|
data["content_char_count"] = len(data["body"])
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ from app import ma, models
|
|||||||
from app.dao.permissions_dao import permission_dao
|
from app.dao.permissions_dao import permission_dao
|
||||||
from app.enums import NotificationStatus, ServicePermissionType, TemplateType
|
from app.enums import NotificationStatus, ServicePermissionType, TemplateType
|
||||||
from app.models import ServicePermission
|
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 (
|
from notifications_utils.recipients import (
|
||||||
InvalidEmailError,
|
InvalidEmailError,
|
||||||
InvalidPhoneError,
|
InvalidPhoneError,
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
import pytest
|
|
||||||
|
|
||||||
from app.dao.api_key_dao import save_model_api_key
|
from app.dao.api_key_dao import save_model_api_key
|
||||||
from app.enums import KeyType
|
from app.enums import KeyType
|
||||||
from app.models import ApiKey
|
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")
|
validate_v0(response_json, "GET_notification_return_sms.json")
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_notifications_contract(
|
||||||
def test_get_notifications_contract(client, sample_notification, sample_email_notification):
|
client, sample_notification, sample_email_notification
|
||||||
|
):
|
||||||
response_json = return_json_from_response(
|
response_json = return_json_from_response(
|
||||||
_get_notification(client, sample_notification, "/notifications")
|
_get_notification(client, sample_notification, "/notifications")
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user