darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 07:35:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into add-user-to-job

Browse Source
This commit is contained in:
Rebecca Law
2016-05-11 12:08:39 +01:00
parent aff0abb78c 1b82612ea3
commit eb9f47af68
4 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/schemas.py
View File

@@ -123,9 +123,19 @@ class TemplateSchema(BaseTemplateSchema):
raise ValidationError('Invalid template subject', 'subject')
class TemplateHistorySchema(BaseTemplateSchema):
class TemplateHistorySchema(BaseSchema):
created_by = field_for(models.Template, 'created_by', required=True)
class Meta:
# Use the base model class that the history class is created from
model = models.Template
# We have to use a method here because the relationship field on the
# history object is not created.
created_by = fields.Method("populate_created_by", dump_only=True)
created_at = field_for(models.Template, 'created_at', format='%Y-%m-%d %H:%M:%S.%f')
def populate_created_by(self, data):
usr = models.User.query.filter_by(id=data.created_by_id).one()
return {'id': str(usr.id), 'name': usr.name, 'email_address': usr.email_address}
class NotificationsStatisticsSchema(BaseSchema):

17
app/template/rest.py
View File

@@ -99,12 +99,13 @@ def get_template_by_id_and_service_id(service_id, template_id):
@template.route('/<uuid:template_id>/version/<int:version>')
def get_template_version(service_id, template_id, version):
fetched_template = dao_get_template_by_id_and_service_id(
template_id=template_id,
service_id=service_id,
version=version
data, errors = template_history_schema.dump(
dao_get_template_by_id_and_service_id(
template_id=template_id,
service_id=service_id,
version=version
)
)
data, errors = template_history_schema.dump(fetched_template)
if errors:
return json_resp(result='error', message=errors), 400
return jsonify(data=data)
@@ -112,8 +113,10 @@ def get_template_version(service_id, template_id, version):
@template.route('/<uuid:template_id>/version')
def get_template_versions(service_id, template_id):
fetched_templates = dao_get_template_versions(service_id, template_id)
data, errors = template_history_schema.dump(fetched_templates, many=True)
data, errors = template_history_schema.dump(
dao_get_template_versions(service_id, template_id),
many=True
)
if errors:
return json_resp(result='error', message=errors), 400
return jsonify(data=data)