Cleaning things up, trying to get tests to work.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-01-17 17:28:46 -05:00
parent e0b9ac0827
commit 95ee8b7c2e
8 changed files with 21 additions and 21 deletions

View File

@@ -1,4 +1,4 @@
from app.models import BRANDING_TYPES
from app.enums import BrandType
post_create_email_branding_schema = {
"$schema": "http://json-schema.org/draft-07/schema#",
@@ -9,7 +9,7 @@ post_create_email_branding_schema = {
"name": {"type": "string"},
"text": {"type": ["string", "null"]},
"logo": {"type": ["string", "null"]},
"brand_type": {"enum": BRANDING_TYPES},
"brand_type": {"enum": [e.value for e in BrandType]},
},
"required": ["name"],
}
@@ -23,7 +23,7 @@ post_update_email_branding_schema = {
"name": {"type": ["string", "null"]},
"text": {"type": ["string", "null"]},
"logo": {"type": ["string", "null"]},
"brand_type": {"enum": BRANDING_TYPES},
"brand_type": {"enum": [e.value for e in BrandType]},
},
"required": [],
}

View File

@@ -13,7 +13,7 @@ from marshmallow import (
validates,
validates_schema,
)
from marshmallow_sqlalchemy import field_for
from marshmallow_sqlalchemy import auto_field, field_for
from notifications_utils.recipients import (
InvalidEmailError,
InvalidPhoneError,
@@ -464,7 +464,7 @@ class JobSchema(BaseSchema):
processing_started = FlexibleDateTime()
processing_finished = FlexibleDateTime()
job_status = field_for(models.JobStatus, "name", required=False)
job_status = auto_field()
scheduled_for = FlexibleDateTime()
service_name = fields.Nested(