Merge branch 'session' into Develop

2020-12-08 11:39:23 +01:00
parent c25afdc203 986d4c99bd
commit 8f36128fe3
15 changed files with 12911 additions and 927 deletions
--- a/cps/shelf.py
+++ b/cps/shelf.py
@ -322,8 +322,11 @@ def delete_shelf_helper(cur_shelf):
    ub.session.delete(cur_shelf)
    ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).delete()
    ub.session.add(ub.ShelfArchive(uuid=cur_shelf.uuid, user_id=cur_shelf.user_id))
-    ub.session.commit()
-    log.info("successfully deleted %s", cur_shelf)
+    try:
+        ub.session.commit()
+        log.info("successfully deleted %s", cur_shelf)
+    except OperationalError:
+        ub.session.rollback()