diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_expected.csv index 32cbe671c..5a36925f3 100644 --- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_expected.csv +++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_expected.csv @@ -1,3 +1,3 @@ "FIRMID","SESSION_ID","SESSION_DATE","ACCOUNT","TKR","VALUE","DATE","OBL_VALUE","REQ_VALUE","LOT_CURRENCY","CURRENCY_NETTO","TR_EXECDATE" -"TRADING_CODE","2","20.01.1970T02:49:58","ACCOUNT","TKR","-22.22","09.09.2024",,,,, -"TRADING_CODE","2","20.01.1970T02:49:58","ACCOUNT_FROM_ACCOUNT","TKR",,"09.09.2024","22.22","44.44",,, +"TRADING_CODE","2","20.01.1970T02:49:58","ACCOUNT","TKR","-22.22","17.10.2024",,,,, +"TRADING_CODE","2","20.01.1970T02:49:58","ACCOUNT_FROM_ACCOUNT","TKR",,"17.10.2024","44.44","22.22",,, diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_extended_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_extended_expected.csv index a7bd6f9eb..a4570288f 100644 --- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_extended_expected.csv +++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_extended_expected.csv @@ -1,16 +1,16 @@ "FIRMID","SESSION_ID","SESSION_DATE","ACCOUNT","TKR","VALUE","DATE","OBL_VALUE","REQ_VALUE","LOT_CURRENCY","CURRENCY_NETTO","TR_EXECDATE" -"95","2","20.01.1970T02:49:58","30411810300000002049","0095CAT00001",,"09.09.2024",,,"UZS","10000","09.09.2024" -"8","2","20.01.1970T02:49:58","3,04118607E+019","0008MAT00001",,"09.09.2024",,,"UZS","-10000","09.09.2024" -"8","2","20.01.1970T02:49:58","3,041181E+019","0008CAT00001","-9743.90","09.09.2024",,,"RUB",, -"8","2","20.01.1970T02:49:58","3,041181E+019","0008CAT00001",,"09.09.2024","0.00","7000000000.00","RUB",, -"8","2","20.01.1970T02:49:58","3,04118102E+019","0008MAT00001",,"09.09.2024",,,"RUB","69.75","09.09.2024" -"472","2","20.01.1970T02:49:58","3,04118605E+019","0472CAT00001",,"09.09.2024",,,"UZS","10000000","09.09.2024" -"302","2","20.01.1970T02:49:58","3,04118107E+019","0302MAT00001",,"09.09.2024","10000000000.00","0.00","RUB",, -"472","2","20.01.1970T02:49:58","3,04111569E+019","0472CAT00001",,"09.09.2024",,,"CNY","-10","09.09.2024" -"472","2","20.01.1970T02:49:58","3,0411810101E+019","0472CAT00001","9743.90","09.09.2024",,,"RUB",, -"472","2","20.01.1970T02:49:58","3,0411810101E+019","0472CAT00001",,"09.09.2024",,,"RUB","-69627.92","09.09.2024" -"45","2","20.01.1970T02:49:58","3,04118103E+019","0045CAT00001",,"09.09.2024","0.00","3000000000.00","RUB",, -"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"09.09.2024",,,"RUB","69627.92","09.09.2024" -"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"09.09.2024",,,"UZS","-10000000","09.09.2024" -"95","2","20.01.1970T02:49:58","30411810300000002094","0095CAT00001",,"09.09.2024",,,"RUB","-69.75","09.09.2024" -"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"09.09.2024",,,"CNY","10","09.09.2024" +"95","2","20.01.1970T02:49:58","30411810300000002049","0095CAT00001",,"17.10.2024",,,"UZS","10000","17.10.2024" +"8","2","20.01.1970T02:49:58","3,04118607E+019","0008MAT00001",,"17.10.2024",,,"UZS","-10000","17.10.2024" +"8","2","20.01.1970T02:49:58","3,041181E+019","0008CAT00001","-9743.90","17.10.2024",,,"RUB",, +"8","2","20.01.1970T02:49:58","3,041181E+019","0008CAT00001",,"17.10.2024","7000000000.00","0.00","RUB",, +"8","2","20.01.1970T02:49:58","3,04118102E+019","0008MAT00001",,"17.10.2024",,,"RUB","69.75","17.10.2024" +"472","2","20.01.1970T02:49:58","3,04118605E+019","0472CAT00001",,"17.10.2024",,,"UZS","10000000","17.10.2024" +"302","2","20.01.1970T02:49:58","3,04118107E+019","0302MAT00001",,"17.10.2024","0.00","10000000000.00","RUB",, +"472","2","20.01.1970T02:49:58","3,04111569E+019","0472CAT00001",,"17.10.2024",,,"CNY","-10","17.10.2024" +"472","2","20.01.1970T02:49:58","3,0411810101E+019","0472CAT00001","9743.90","17.10.2024",,,"RUB",, +"472","2","20.01.1970T02:49:58","3,0411810101E+019","0472CAT00001",,"17.10.2024",,,"RUB","-69627.92","17.10.2024" +"45","2","20.01.1970T02:49:58","3,04118103E+019","0045CAT00001",,"17.10.2024","3000000000.00","0.00","RUB",, +"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"17.10.2024",,,"RUB","69627.92","17.10.2024" +"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"17.10.2024",,,"UZS","-10000000","17.10.2024" +"95","2","20.01.1970T02:49:58","30411810300000002094","0095CAT00001",,"17.10.2024",,,"RUB","-69.75","17.10.2024" +"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"17.10.2024",,,"CNY","10","17.10.2024" diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_LCC_NETTO_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_LCC_NETTO_expected.csv index 3da140dc1..ab5f280c8 100644 --- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_LCC_NETTO_expected.csv +++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_LCC_NETTO_expected.csv @@ -1,25 +1,25 @@ "FIRM_ID","TKR","CURRENCYID","DATE","NETTO_SUM","DATA_TYPE","DEBIT","CREDIT" -"TMT_2_TRADING_CODE","TKR_TMT_2","SEC_SYMBOL_TMT_2","2024-10-11","0","FX_OBLIG","0.00","0.00" -"TMT_2_TRADING_CODE","TKR_TMT_2","SEC_SYMBOL_TMT_2","2024-10-11","434213","PR_NETTOSUM","0.00","434213.00" -"TMT_2_TRADING_CODE","TKR_TMT_2","SEC_SYMBOL_TMT_2","2024-10-11","0","FX_DEBT","0.00","0.00" -"OMT_2_TRADING_CODE","TKR_OMT_2","SEC_SYMBOL_OMT_2","2024-10-11","0","FX_OBLIG","0.00","0.00" -"OMT_2_TRADING_CODE","TKR_OMT_2","SEC_SYMBOL_OMT_2","2024-10-11","-547893","PR_NETTOSUM","547893.00","0.00" -"OMT_2_TRADING_CODE","TKR_OMT_2","SEC_SYMBOL_OMT_2","2024-10-11","0","FX_DEBT","0.00","0.00" -"TMT_1_TRADING_CODE_nextDay","TKR_TMT_1","SEC_SYMBOL_TMT_1","2024-10-12","5783949","FX_OBLIG","0.00","5783949.00" -"TMT_1_TRADING_CODE","TKR_TMT_1","SEC_SYMBOL_TMT_1","2024-10-11","5783949","FX_OBLIG","0.00","5783949.00" -"TMT_1_TRADING_CODE","TKR_TMT_1","SEC_SYMBOL_TMT_1","2024-10-11","0","PR_NETTOSUM","0.00","0.00" -"TMT_1_TRADING_CODE","TKR_TMT_1","SEC_SYMBOL_TMT_1","2024-10-11","0","FX_DEBT","0.00","0.00" -"OMT_2_TRADING_CODE_nextDay","TKR_OMT_2","SEC_SYMBOL_OMT_2","2024-10-12","0","FX_OBLIG","0.00","0.00" -"TMT_2_TRADING_CODE_nextDay","TKR_TMT_2","SEC_SYMBOL_TMT_2","2024-10-12","0","FX_OBLIG","0.00","0.00" -"OMT_1_TRADING_CODE","TKR_OMT_1","SEC_SYMBOL_OMT_1","2024-10-11","-321321","FX_OBLIG","321321.00","0.00" -"OMT_1_TRADING_CODE","TKR_OMT_1","SEC_SYMBOL_OMT_1","2024-10-11","0","PR_NETTOSUM","0.00","0.00" -"OMT_1_TRADING_CODE","TKR_OMT_1","SEC_SYMBOL_OMT_1","2024-10-11","0","FX_DEBT","0.00","0.00" -"OMT_1_TRADING_CODE_nextDay","TKR_OMT_1","SEC_SYMBOL_OMT_1","2024-10-12","-321321","FX_OBLIG","321321.00","0.00" -"AMT_1_TRADING_CODE_nextDay","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-12","0","FX_OBLIG","0.00","0.00" -"AMT_2_TRADING_CODE","TKR_AMT_2","SEC_SYMBOL_AMT_2","2024-10-11","0","FX_OBLIG","0.00","0.00" -"AMT_2_TRADING_CODE","TKR_AMT_2","SEC_SYMBOL_AMT_2","2024-10-11","0","PR_NETTOSUM","0.00","0.00" -"AMT_2_TRADING_CODE","TKR_AMT_2","SEC_SYMBOL_AMT_2","2024-10-11","10","FX_DEBT","-10.00","0.00" -"AMT_1_TRADING_CODE","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-11","0","FX_OBLIG","0.00","0.00" -"AMT_1_TRADING_CODE","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-11","0","PR_NETTOSUM","0.00","0.00" -"AMT_1_TRADING_CODE","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-11","0","FX_DEBT","0.00","0.00" -"AMT_2_TRADING_CODE_nextDay","TKR_AMT_2","SEC_SYMBOL_AMT_2","2024-10-12","0","FX_OBLIG","0.00","0.00" +"AMT_1_TRADING_CODE","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-17","0.00","FX_OBLIG","0.00","0.00" +"AMT_1_TRADING_CODE","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-17","0.00","PR_NETTOSUM","0.00","0.00" +"AMT_1_TRADING_CODE","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-17","0.00","FX_DEBT","0.00","0.00" +"AMT_2_TRADING_CODE_nextDay","TKR_AMT_2","SEC_SYMBOL_AMT_2","2024-10-18","0.00","FX_OBLIG","0.00","0.00" +"AMT_1_TRADING_CODE_nextDay","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-18","0.00","FX_OBLIG","0.00","0.00" +"TMT_1_TRADING_CODE","TKR_TMT_1","SEC_SYMBOL_TMT_1","2024-10-17","5783949.00","FX_OBLIG","0.00","5783949.00" +"TMT_1_TRADING_CODE","TKR_TMT_1","SEC_SYMBOL_TMT_1","2024-10-17","0.00","PR_NETTOSUM","0.00","0.00" +"TMT_1_TRADING_CODE","TKR_TMT_1","SEC_SYMBOL_TMT_1","2024-10-17","0.00","FX_DEBT","0.00","0.00" +"TMT_2_TRADING_CODE_nextDay","TKR_TMT_2","SEC_SYMBOL_TMT_2","2024-10-18","0.00","FX_OBLIG","0.00","0.00" +"AMT_2_TRADING_CODE","TKR_AMT_2","SEC_SYMBOL_AMT_2","2024-10-17","0.00","FX_OBLIG","0.00","0.00" +"AMT_2_TRADING_CODE","TKR_AMT_2","SEC_SYMBOL_AMT_2","2024-10-17","0.00","PR_NETTOSUM","0.00","0.00" +"AMT_2_TRADING_CODE","TKR_AMT_2","SEC_SYMBOL_AMT_2","2024-10-17","10.00","FX_DEBT","-10.00","0.00" +"TMT_2_TRADING_CODE","TKR_TMT_2","SEC_SYMBOL_TMT_2","2024-10-17","0.00","FX_OBLIG","0.00","0.00" +"TMT_2_TRADING_CODE","TKR_TMT_2","SEC_SYMBOL_TMT_2","2024-10-17","434213.00","PR_NETTOSUM","0.00","434213.00" +"TMT_2_TRADING_CODE","TKR_TMT_2","SEC_SYMBOL_TMT_2","2024-10-17","0.00","FX_DEBT","0.00","0.00" +"OMT_2_TRADING_CODE","TKR_OMT_2","SEC_SYMBOL_OMT_2","2024-10-17","0.00","FX_OBLIG","0.00","0.00" +"OMT_2_TRADING_CODE","TKR_OMT_2","SEC_SYMBOL_OMT_2","2024-10-17","-547893.00","PR_NETTOSUM","547893.00","0.00" +"OMT_2_TRADING_CODE","TKR_OMT_2","SEC_SYMBOL_OMT_2","2024-10-17","0.00","FX_DEBT","0.00","0.00" +"OMT_2_TRADING_CODE_nextDay","TKR_OMT_2","SEC_SYMBOL_OMT_2","2024-10-18","0.00","FX_OBLIG","0.00","0.00" +"OMT_1_TRADING_CODE","TKR_OMT_1","SEC_SYMBOL_OMT_1","2024-10-17","-321321.00","FX_OBLIG","321321.00","0.00" +"OMT_1_TRADING_CODE","TKR_OMT_1","SEC_SYMBOL_OMT_1","2024-10-17","0.00","PR_NETTOSUM","0.00","0.00" +"OMT_1_TRADING_CODE","TKR_OMT_1","SEC_SYMBOL_OMT_1","2024-10-17","0.00","FX_DEBT","0.00","0.00" +"OMT_1_TRADING_CODE_nextDay","TKR_OMT_1","SEC_SYMBOL_OMT_1","2024-10-18","-321321.00","FX_OBLIG","321321.00","0.00" +"TMT_1_TRADING_CODE_nextDay","TKR_TMT_1","SEC_SYMBOL_TMT_1","2024-10-18","5783949.00","FX_OBLIG","0.00","5783949.00"