ddp/books
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added error handling for DB exceptions

Browse Source
This commit is contained in:
Damien De Paoli
2020-12-30 22:21:01 +11:00
parent 9beec7de86
commit f9e2060741
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
condition.py
View File

@@ -3,6 +3,7 @@ from flask import request, render_template, redirect
from flask_wtf import FlaskForm from flask_wtf import FlaskForm
from __main__ import db, app, ma from __main__ import db, app, ma
from sqlalchemy import func, Sequence from sqlalchemy import func, Sequence
from sqlalchemy.exc import SQLAlchemyError
from status import st, Status from status import st, Status
################################################################################ ################################################################################
@@ -50,10 +51,15 @@ def new_condition():
return render_template("edit_id_name.html", form=form, page_title='Create new Condition' ) return render_template("edit_id_name.html", form=form, page_title='Create new Condition' )
else: else:
condition = Condition( name=request.form["name"] ) condition = Condition( name=request.form["name"] )
db.session.add(condition) try:
db.session.commit() db.session.add(condition)
st.SetMessage( "Created new Condition (id={})".format(condition.id) ) db.session.commit()
return redirect( '/conditions' ) st.SetMessage( "Created new Condition (id={})".format(condition.id) )
return redirect( '/conditions' )
except SQLAlchemyError as e:
st.SetAlert( "danger" )
st.SetMessage( "<b>Failed to add condition:</b>&nbsp;{}".format( e.orig) )
return render_template("edit_id_name.html", form=form, page_title='Create new Condition', alert=st.GetAlert(), message=st.GetMessage() )
################################################################################ ################################################################################
# /condition/<id> -> GET/POST(save or delete) -> shows/edits/delets a single condition # /condition/<id> -> GET/POST(save or delete) -> shows/edits/delets a single condition
@@ -63,15 +69,20 @@ def condition(id):
### DDP: should this be request.form or request.values? ### DDP: should this be request.form or request.values?
form = ConditionForm(request.form) form = ConditionForm(request.form)
if request.method == 'POST' and form.validate(): if request.method == 'POST' and form.validate():
condition = Condition.query.get(id) try:
if 'delete' in request.form: condition = Condition.query.get(id)
st.SetMessage("Successfully deleted (id={}, name={})".format( condition.id, condition.name ) ) if 'delete' in request.form:
condition = Condition.query.filter(Condition.id==id).delete() st.SetMessage("Successfully deleted (id={}, name={})".format( condition.id, condition.name ) )
if 'submit' in request.form: condition = Condition.query.filter(Condition.id==id).delete()
st.SetMessage("Successfully Updated Condition (id={})".format(id) ) if 'submit' in request.form:
condition.name = request.form['name'] st.SetMessage("Successfully Updated Condition (id={})".format(id) )
db.session.commit() condition.name = request.form['name']
return redirect( '/conditions' ) db.session.commit()
return redirect( '/conditions' )
except SQLAlchemyError as e:
st.SetAlert( "danger" )
st.SetMessage( "<b>Failed to modity condition:</b>&nbsp;{}".format(e.orig) )
return render_template("edit_id_name.html", form=form, page_title='Edit Condition', alert=st.GetAlert(), message=st.GetMessage() )
else: else:
condition = Condition.query.get(id) condition = Condition.query.get(id)
form = ConditionForm(request.values, obj=condition) form = ConditionForm(request.values, obj=condition)