diff --git a/dags/split_subkonto2.py b/dags/split_subkonto2.py index 86ff48b..c4d9476 100644 --- a/dags/split_subkonto2.py +++ b/dags/split_subkonto2.py @@ -243,9 +243,10 @@ def parse_contract_cell(cell_text): }) def read_dict_subkonto2_db(**kwargs): + engine = get_db_engine() df = pd.read_sql(""" select - osv.subkonto2 as subkonto2 + osv.subkonto2 as subkonto2 , dst.naimenovanie as naimenovanie , coalesce(dst.nomer , osv.nomer) as nomer , coalesce(dst.date_begin , osv.date_bedin) as date_bedin @@ -254,16 +255,17 @@ def read_dict_subkonto2_db(**kwargs): left join public.dict_subkonto_two as dst on dst.subkonto2 = osv.subkonto2 where osv.subkonto2 not in (select dst2.subkonto2 from dict_subkonto_two dst2) - """) + """, engine) return df.to_dict(orient='records') def split_subkonto_from_1C(**kwargs): + engine = get_db_engine() df = pd.read_sql(""" select distinct osv.subkonto2 as subkonto2 from public.oborotno_salbdovaya_vedomostb osv where osv.subkonto2 not in (select dst2.subkonto2 from dict_subkonto_two dst2) - """) + """, engine) result_df = df['column_name'].apply(parse_contract_cell) return result_df.to_dict(orient='records')