diff options
| -rw-r--r-- | python/csv_headers/bond_upload.py | 1 | ||||
| -rw-r--r-- | python/upload_bbh_trades.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/python/csv_headers/bond_upload.py b/python/csv_headers/bond_upload.py index c6ca15f1..4973fca7 100644 --- a/python/csv_headers/bond_upload.py +++ b/python/csv_headers/bond_upload.py @@ -63,6 +63,7 @@ bbh_bonds = [ "FX Cancel - For CANC instructions only", "Fund Accounting Only Trade (RPTO)", "Custody Only Trade (NACT)", + "Research Fee (RSCH)", ] bbh_swap = [ diff --git a/python/upload_bbh_trades.py b/python/upload_bbh_trades.py index d827e3ee..ccce36a2 100644 --- a/python/upload_bbh_trades.py +++ b/python/upload_bbh_trades.py @@ -1,18 +1,18 @@ import csv from serenitas.utils.db import dbconn, dawn_engine import datetime -from process_queue import rename_keys +from serenitas.utils.misc import rename_keys import pandas as pd from sqlalchemy.exc import IntegrityError from io import StringIO from serenitas.utils.env import DAILY_DIR from serenitas.utils.remote import SftpClient +from csv_headers.bond_upload import bbh_bonds if __name__ == "__main__": conn = dbconn("dawndb") with conn.cursor() as c: - c.execute("SELECT headers from csv_templates where template_name='bbh_bonds'") - (headers,) = c.fetchone() + headers = bbh_bonds sql_query = "SELECT bond_trades.*, counterparties.dtc_number FROM bond_trades LEFT JOIN counterparties ON cp_code=code WHERE cash_counterparty AND trade_date >= '2022-04-05' AND fund='BRINKER' and faceamount is not null and faceamount >0;" c.execute( sql_query, (datetime.date(2022, 4, 5),) |