From 244367af2afa0ff91be0666dcf17fbe5e62515fa Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Wed, 30 Dec 2020 23:37:40 +1100
Subject: [PATCH] CRUD for series is now trapped for DB errors

---
 series.py | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/series.py b/series.py
index 91f582d..adfc3ae 100644
--- a/series.py
+++ b/series.py
@@ -3,6 +3,7 @@ from flask_wtf import FlaskForm
 from flask import request, render_template, redirect
 from wtforms.fields.html5 import DateField
 from __main__ import db, app, ma
+from sqlalchemy.exc import SQLAlchemyError
 from status import st, Status
 
 ################################################################################
@@ -59,7 +60,7 @@ def ListOfSeriesWithMissingBooks():
 @app.route("/seriess", methods=["GET"])
 def seriess():
     seriess = Series.query.all()
-    return render_template("seriess.html", seriess=seriess)
+    return render_template("seriess.html", seriess=seriess, message=st.GetMessage(), alert=st.GetAlert())
 
 ################################################################################
 # /series -> GET/POST -> creates a new series type and when created, takes you back to /seriess
@@ -67,14 +68,20 @@ def seriess():
 @app.route("/series", methods=["GET", "POST"])
 def new_series():
     form = SeriesForm(request.form)
+    page_title='Create new Series'
     if 'title' not in request.form:
-        return render_template("series.html", form=form, page_title='Create new Series' )
+        return render_template("series.html", form=form, page_title=page_title, message=st.GetMessage(), alert=st.GetAlert() )
     else:
         series = Series( title=request.form["title"], num_books=request.form["num_books"], note=request.form["note"], calcd_rating=0 )
-        db.session.add(series)
-        db.session.commit()
-        st.SetMessage( "Created new Series (id={})".format(series.id) )
-        return redirect( '/seriess' )
+        try:
+            db.session.add(series)
+            db.session.commit()
+            st.SetMessage( "Created new Series (id={})".format(series.id) )
+            return redirect( '/seriess' )
+        except SQLAlchemyError as e:
+            st.SetAlert( "danger" )
+            st.SetMessage( "<b>Failed to add Series:</b>&nbsp;{}".format( e.orig) )
+            return render_template("series.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
 
 ################################################################################
 # /series/<id> -> GET/POST(save or delete) -> shows/edits/delets a single series
@@ -84,29 +91,35 @@ def series(id):
     ### DDP: should this be request.form or request.values?
     form = SeriesForm(request.form)
     page_title='Edit Series'
-    if request.method == 'POST' and form.validate():
+    if request.method == 'POST':
         try:
             series = Series.query.get(id)
             if 'delete' in request.form:
                 st.SetMessage("Successfully deleted (id={}, title={})".format( series.id, series.title ) )
                 series = Series.query.filter(Series.id==id).delete()
-            if 'submit' in request.form:
+            if 'submit' in request.form and form.validate():
                 st.SetMessage("Successfully Updated Series (id={})".format(id) )
                 series.title = request.form['title']
                 series.num_books = request.form['num_books']
                 series.calcd_rating = CalcAvgRating(id)
                 series.note = request.form['note']
+            else:
+                message="<b>Failed to update Series:</b>"
+                for field in form.errors:
+                    message = "{}<br>{}={}".format( message, field, form.errors[field] )
+                st.SetAlert("danger")
+                st.SetMessage(message)
+                return render_template("edit_id_name.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
             db.session.commit()
             return redirect( '/seriess' )
         except SQLAlchemyError as e:
-            print("series -- error!")
             st.SetAlert( "danger" )
             st.SetMessage( "<b>Failed to modify Series:</b>&nbsp;{}".format(e.orig) )
             return render_template("edit_id_name.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
     else:
         series = Series.query.get(id)
         form = SeriesForm(request.values, obj=series)
-    return render_template("series.html", form=form, page_title=page_title )
+    return render_template("series.html", form=form, page_title=page_title, message=st.GetMessage(), alert=st.GetAlert() )
 
 ################################################################################
 # Gets the Series matching id from DB, helper func in jinja2 code to show books