darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-10 07:12:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple more enum schema fields and attempt to fix template_version field

Browse Source 
Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
This commit is contained in:
Carlo Costino
2025-05-06 13:31:50 -04:00
parent d2fc023622
commit f9f7333d72
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/schemas.py
View File

@@ -359,6 +359,7 @@ class NotificationModelSchema(BaseSchema):
class BaseTemplateSchema(BaseSchema): class BaseTemplateSchema(BaseSchema):
reply_to = fields.Method("get_reply_to", allow_none=True) reply_to = fields.Method("get_reply_to", allow_none=True)
reply_to_text = fields.Method("get_reply_to_text", allow_none=True) reply_to_text = fields.Method("get_reply_to_text", allow_none=True)
template_type = auto_field(by_value=True)
def get_reply_to(self, template): def get_reply_to(self, template):
return template.reply_to return template.reply_to
@@ -373,9 +374,8 @@ class BaseTemplateSchema(BaseSchema):
class TemplateSchema(BaseTemplateSchema, UUIDsAsStringsMixin): class TemplateSchema(BaseTemplateSchema, UUIDsAsStringsMixin):
created_by = field_for(models.Template, "created_by", required=True) created_by = field_for(models.Template, "created_by", required=True)
process_type = field_for(models.Template, "process_type") process_type = auto_field(by_value=True)
redact_personalisation = fields.Method("redact") redact_personalisation = fields.Method("redact")
template_type = auto_field(by_value=True)
created_at = FlexibleDateTime() created_at = FlexibleDateTime()
updated_at = FlexibleDateTime() updated_at = FlexibleDateTime()
@@ -442,7 +442,7 @@ class TemplateHistorySchema(BaseSchema):
class ApiKeySchema(BaseSchema): class ApiKeySchema(BaseSchema):
created_by = field_for(models.ApiKey, "created_by", required=True) created_by = field_for(models.ApiKey, "created_by", required=True)
key_type = field_for(models.ApiKey, "key_type", required=True) key_type = auto_field(by_value=True)
expiry_date = FlexibleDateTime() expiry_date = FlexibleDateTime()
created_at = FlexibleDateTime() created_at = FlexibleDateTime()
updated_at = FlexibleDateTime() updated_at = FlexibleDateTime()
@@ -566,12 +566,16 @@ class NotificationWithTemplateSchema(BaseSchema):
) )
status = fields.String(required=False) status = fields.String(required=False)
personalisation = fields.Dict(required=False) personalisation = fields.Dict(required=False)
key_type = field_for(models.Notification, "key_type", required=True) notification_type = auto_field(by_value=True)
key_type = auto_field(by_value=True)
key_name = fields.String() key_name = fields.String()
created_at = FlexibleDateTime() created_at = FlexibleDateTime()
updated_at = FlexibleDateTime() updated_at = FlexibleDateTime()
sent_at = FlexibleDateTime() sent_at = FlexibleDateTime()
# TODO: Figure out why this isn't essentially forcing the field to show up in the schema
template_version = auto_field()
@pre_dump @pre_dump
def add_api_key_name(self, in_data, **kwargs): def add_api_key_name(self, in_data, **kwargs):
if in_data.api_key: if in_data.api_key: