diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/Dawn/utils.py | 8 | ||||
| -rw-r--r-- | python/process_queue.py | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/python/Dawn/utils.py b/python/Dawn/utils.py index 75ef43d7..8fa45e93 100644 --- a/python/Dawn/utils.py +++ b/python/Dawn/utils.py @@ -10,4 +10,10 @@ def bump_rev(filename): return "{0} rev{1}.pdf".format(begin, rev_number) def simple_serialize(obj): - return dumps({c.name: getattr(obj, c.name) for c in obj.__table__.columns}) + d = {c.name: getattr(obj, c.name) for c in obj.__table__.columns} + # add data from foreign relationship + if obj.__table__.name == 'wires': + d.update({'Counterparty': obj.account.counterparty, + 'cashaccount': obj.account.cash_account, + 'custodian': obj.account.custodian}) + return dumps(d) diff --git a/python/process_queue.py b/python/process_queue.py index 5c78b268..e8ea369b 100644 --- a/python/process_queue.py +++ b/python/process_queue.py @@ -328,12 +328,6 @@ def cds_trade_process(serenitasdb, dawndb, session, trade): trade['curr_notional'] = trade['notional'] * factor return trade -def wire_process(dawndb, trade): - sql_str = "SELECT cash_account, custodian FROM accounts WHERE code = %(code)s" - with dawndb.cursor() as c: - c.execute(sql_str, trade) - trade['cashaccount'], trade['custodian'] = c.fetchone() - def generate_csv(l, queue_name='bond_trades'): output = StringIO() csvwriter = csv.writer(output) @@ -402,9 +396,6 @@ if __name__=="__main__": with init_bbg_session(BBG_IP) as session: for trade in list_trades: cds_trade_process(serenitasdb, dawndb, session, trade) - elif queue_name == 'wires': - for trade in list_trades: - wire_process(dawndb, trade) buf = generate_csv(list_trades, queue_name) timestamp = write_buffer(buf, queue_name) |