darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-20 22:39:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removed template subject uniqueness

Browse Source
This commit is contained in:
Nicholas Staples
2016-05-18 10:00:09 +01:00
parent 9407273381
commit 6e7383de33
4 changed files with 28 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models.py
View File

@@ -178,7 +178,7 @@ class Template(db.Model, Versioned):
archived = db.Column(db.Boolean, index=False, nullable=False, default=False)
service_id = db.Column(UUID(as_uuid=True), db.ForeignKey('services.id'), index=True, unique=False, nullable=False)
service = db.relationship('Service', backref=db.backref('templates', lazy='dynamic'))
subject = db.Column(db.Text, index=False, unique=True, nullable=True)
subject = db.Column(db.Text, index=False, unique=False, nullable=True)
created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False)
created_by = db.relationship('User')

11
app/template/rest.py
View File

@@ -50,16 +50,7 @@ def create_template(service_id):
new_template.template_type)
if over_limit:
return json_resp, 400
try:
dao_create_template(new_template)
except IntegrityError as ex:
current_app.logger.debug(ex)
message = "Failed to create template"
if "templates_subject_key" in str(ex):
message = 'Duplicate template subject'
return jsonify(result="error", message={'subject': [message]}), 400
return jsonify(result="error", message=message), 500
dao_create_template(new_template)
return jsonify(data=template_schema.dump(new_template).data), 201