diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/Dawn/views.py | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/python/Dawn/views.py b/python/Dawn/views.py index 510a0594..ab334c15 100644 --- a/python/Dawn/views.py +++ b/python/Dawn/views.py @@ -15,6 +15,7 @@ from flask import ( send_file, g, jsonify, + session, ) from .models import ( @@ -304,7 +305,7 @@ def split_direction(g, direction): raise ValueError("direction can be one of 'outgoing' or 'incoming'") -def gen_cashflow_deals(form, session, wire_id=None): +def gen_cashflow_deals(form, sql_session, wire_id=None): to_date = datetime.date.fromisoformat d = { "action": form.get("action"), @@ -337,7 +338,7 @@ def gen_cashflow_deals(form, session, wire_id=None): yield cf else: cf = CashFlowDeal(**d) - session.add(cf) + sql_session.add(cf) yield cf @@ -391,7 +392,7 @@ def terminate(dealid, kind): table = kind if kind.endswith("s") else kind + "s" if form.validate_on_submit(): form.populate_obj(termination) - session = form.get_session() + sql_session = form.get_session() rec = db.session.execute( "SELECT notional, coalesce(terminated_amount, 0.), currency, b.globeop_id, cp_code " f"FROM {table} " @@ -413,12 +414,12 @@ def terminate(dealid, kind): if termination.termination_cp is None: termination.termination_cp = cp_code is_assignment = False - session.add(termination) + sql_session.add(termination) try: - session.commit() + sql_session.commit() except IntegrityError as e: app.logger.error(e) - session.rollback() + sql_session.rollback() else: buf = simple_serialize( termination, @@ -455,9 +456,9 @@ def trade_manage(tradeid, kind): form.cp_code.choices = form.cp_code.choices + list(cp_choices(kind)) if form.validate_on_submit(): form.populate_obj(trade) - session = form.get_session() + sql_session = form.get_session() if not tradeid: - session.add(trade) + sql_session.add(trade) if kind == "bond": save_ticket(trade, old_ticket_name) if kind == "capfloor": @@ -475,10 +476,10 @@ def trade_manage(tradeid, kind): trade.cashaccount = trade.fcm_account.cash_account trade.custodian = trade.fcm_account.custodian try: - session.commit() + sql_session.commit() except IntegrityError as e: app.logger.error(e) - session.rollback() + sql_session.rollback() return render_template( "trade_entry.html", form=form, @@ -575,9 +576,9 @@ def edit_counterparty(cpcode): old_instructions = cp.instructions or None if cp_form.validate_on_submit(): cp_form.populate_obj(cp) - session = cp_form.get_session() + sql_session = cp_form.get_session() if not cpcode: - session.add(cp) + sql_session.add(cp) instructions = cp_form.instructions if not instructions.data: cp.instructions = old_instructions @@ -586,7 +587,7 @@ def edit_counterparty(cpcode): instructions.data.save( os.path.join(app.config["CP_FOLDER"], cp.instructions) ) - session.commit() + sql_session.commit() return redirect(url_for("list_counterparties")) else: return render_template( |