darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-23 07:46:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Create a new constant for datetime formats without timezone

Browse Source
This commit is contained in:
Rebecca Law
2019-12-27 10:26:58 +00:00
parent e9baece3e7
commit 63bdb0208b
5 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/schemas.py
View File

@@ -22,7 +22,7 @@ from notifications_utils.recipients import (
validate_and_format_phone_number
)
from app import ma
from app import ma, DATETIME_FORMAT_NO_TIMEZONE
from app import models
from app.models import ServicePermission
from app.dao.permissions_dao import permission_dao
@@ -84,8 +84,8 @@ class BaseSchema(ma.ModelSchema):
class UserSchema(BaseSchema):
permissions = fields.Method("user_permissions", dump_only=True)
password_changed_at = field_for(models.User, 'password_changed_at', format='%Y-%m-%d %H:%M:%S.%f')
created_at = field_for(models.User, 'created_at', format='%Y-%m-%d %H:%M:%S.%f')
password_changed_at = field_for(models.User, 'password_changed_at', format=DATETIME_FORMAT_NO_TIMEZONE)
created_at = field_for(models.User, 'created_at', format=DATETIME_FORMAT_NO_TIMEZONE)
auth_type = field_for(models.User, 'auth_type')
def user_permissions(self, usr):
@@ -210,7 +210,7 @@ class ServiceSchema(BaseSchema):
organisation = field_for(models.Service, 'organisation')
override_flag = False
letter_contact_block = fields.Method(serialize="get_letter_contact")
go_live_at = field_for(models.Service, 'go_live_at', format='%Y-%m-%d %H:%M:%S.%f')
go_live_at = field_for(models.Service, 'go_live_at', format=DATETIME_FORMAT_NO_TIMEZONE)
def get_letter_logo_filename(self, service):
return service.letter_branding and service.letter_branding.filename
@@ -345,7 +345,7 @@ class TemplateHistorySchema(BaseSchema):
reply_to_text = fields.Method("get_reply_to_text", allow_none=True)
created_by = fields.Nested(UserSchema, only=['id', 'name', 'email_address'], dump_only=True)
created_at = field_for(models.Template, 'created_at', format='%Y-%m-%d %H:%M:%S.%f')
created_at = field_for(models.Template, 'created_at', format=DATETIME_FORMAT_NO_TIMEZONE)
def get_reply_to(self, template):
return template.reply_to