treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix expected values for KS_REP_CASH_NETTO extended test

Browse source
This commit is contained in:
akulikov 2024-06-27 15:32:09 +03:00
parent cc95a67759
commit c19d881e1d
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
View file

@ -101,7 +101,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class ReportServiceTest_KS {
private Pattern bigDecimalPattern = Pattern.compile("^[-+\\d.,]+$");
private BigDecimal bigDecimalZero = new BigDecimal(BigInteger.ZERO, 4);
private BigDecimal bigDecimalZero = new BigDecimal(BigInteger.ZERO, 18);
protected DateTimeFormatter dateFormatter_yyyyMMdd = DateTimeFormatter.ofPattern("yyyyMMdd");
private static File outFolder;
private static int reportRequestCnt = 0;

30
clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_REP_CASH_NETTO_extended_expected.csv
View file

@ -1,16 +1,16 @@
"FIRMID","SESSION_ID","SESSION_DATE","ACCOUNT","TKR","VALUE","DATE","OBL_VALUE","REQ_VALUE","LOT_CURRENCY","CURRENCY_NETTO","TR_EXECDATE"
"8","47580029","24.06.2024T12:06:41","30411860700000006064","0008MAT00001",,"24.06.2024",,,"UZS","10000.00000000","24.06.2024"
"8","47580029","24.06.2024T12:06:41","30411810200000006064","0008MAT00001",,"24.06.2024",,,"RUB","-69.75000000","24.06.2024"
"8","47580029","24.06.2024T12:06:41","30411810000000002064","0008CAT00001","9743.90","24.06.2024",,,"RUB",,
"8","47580029","24.06.2024T12:06:41","30411810000000002064","0008CAT00001",,"24.06.2024","0.00","7000000000.00","RUB",,
"472","47580029","24.06.2024T12:06:41","30411810101000002413","0472CAT00001","-9743.90","24.06.2024",,,"RUB",,
"472","47580029","24.06.2024T12:06:41","30411810101000002413","0472CAT00001",,"24.06.2024",,,"RUB","59884.02000000","24.06.2024"
"472","47580029","24.06.2024T12:06:41","30411156900000006413","0472CAT00001",,"24.06.2024",,,"CNY","10.00000000","24.06.2024"
"234","47580029","24.06.2024T12:06:41","30414810600000007000","0234CAT00001",,"24.06.2024",,,"RUB","-69627.92000000","24.06.2024"
"45","47580029","24.06.2024T12:06:41","30411810300000002049","0045CAT00001",,"24.06.2024","0.00","3000000000.00","RUB",,
"472","47580029","24.06.2024T12:06:41","30411860500000006413","0472CAT00001",,"24.06.2024",,,"UZS","-10000000.00000000","24.06.2024"
"234","47580029","24.06.2024T12:06:41","30414810600000007000","0234CAT00001",,"24.06.2024",,,"CNY","-10.00000000","24.06.2024"
"302","47580029","24.06.2024T12:06:41","30411810700000006056","0302MAT00001",,"24.06.2024","10000000000.00","0.00","RUB",,
"234","47580029","24.06.2024T12:06:41","30414810600000007000","0234CAT00001",,"24.06.2024",,,"UZS","10000000.00000000","24.06.2024"
"95","47580029","24.06.2024T12:06:41","30411860000000006094","0095CAT00001",,"24.06.2024",,,"UZS","-10000.00000000","24.06.2024"
"95","47580029","24.06.2024T12:06:41","30411810300000002094","0095CAT00001",,"24.06.2024",,,"RUB","69.75000000","24.06.2024"
"95","2","20.01.1970T02:49:58","30411810300000002049","0095CAT00001",,"27.06.2024",,,"UZS","-10000","27.06.2024"
"8","2","20.01.1970T02:49:58","3,04118607E+019","0008MAT00001",,"27.06.2024",,,"UZS","10000","27.06.2024"
"8","2","20.01.1970T02:49:58","3,041181E+019","0008CAT00001","9743.90","27.06.2024",,,"RUB",,
"8","2","20.01.1970T02:49:58","3,041181E+019","0008CAT00001",,"27.06.2024","0.00","7000000000.00","RUB",,
"8","2","20.01.1970T02:49:58","3,04118102E+019","0008MAT00001",,"27.06.2024",,,"RUB","-69.75","27.06.2024"
"472","2","20.01.1970T02:49:58","3,04118605E+019","0472CAT00001",,"27.06.2024",,,"UZS","-10000000","27.06.2024"
"302","2","20.01.1970T02:49:58","3,04118107E+019","0302MAT00001",,"27.06.2024","10000000000.00","0.00","RUB",,
"472","2","20.01.1970T02:49:58","3,04111569E+019","0472CAT00001",,"27.06.2024",,,"CNY","10","27.06.2024"
"472","2","20.01.1970T02:49:58","3,0411810101E+019","0472CAT00001","-9743.90","27.06.2024",,,"RUB",,
"472","2","20.01.1970T02:49:58","3,0411810101E+019","0472CAT00001",,"27.06.2024",,,"RUB","69627.92","27.06.2024"
"45","2","20.01.1970T02:49:58","3,04118103E+019","0045CAT00001",,"27.06.2024","0.00","3000000000.00","RUB",,
"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"27.06.2024",,,"RUB","-69627.92","27.06.2024"
"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"27.06.2024",,,"UZS","10000000","27.06.2024"
"95","2","20.01.1970T02:49:58","30411810300000002094","0095CAT00001",,"27.06.2024",,,"RUB","69.75","27.06.2024"
"234","2","20.01.1970T02:49:58","3,99118100000003E+019","0234CAT00001",,"27.06.2024",,,"CNY","-10","27.06.2024"

1 FIRMID SESSION_ID SESSION_DATE ACCOUNT TKR VALUE DATE OBL_VALUE REQ_VALUE LOT_CURRENCY CURRENCY_NETTO TR_EXECDATE
2 8 95 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30411860700000006064 30411810300000002049 0008MAT00001 0095CAT00001 24.06.2024 27.06.2024 UZS 10000.00000000 -10000 24.06.2024 27.06.2024
3 8 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30411810200000006064 3,04118607E+019 0008MAT00001 24.06.2024 27.06.2024 RUB UZS -69.75000000 10000 24.06.2024 27.06.2024
4 8 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30411810000000002064 3,041181E+019 0008CAT00001 9743.90 24.06.2024 27.06.2024 RUB
5 8 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30411810000000002064 3,041181E+019 0008CAT00001 24.06.2024 27.06.2024 0.00 7000000000.00 RUB
6 472 8 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30411810101000002413 3,04118102E+019 0472CAT00001 0008MAT00001 -9743.90 24.06.2024 27.06.2024 RUB -69.75 27.06.2024
7 472 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30411810101000002413 3,04118605E+019 0472CAT00001 24.06.2024 27.06.2024 RUB UZS 59884.02000000 -10000000 24.06.2024 27.06.2024
8 472 302 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30411156900000006413 3,04118107E+019 0472CAT00001 0302MAT00001 24.06.2024 27.06.2024 10000000000.00 0.00 CNY RUB 10.00000000 24.06.2024
9 234 472 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30414810600000007000 3,04111569E+019 0234CAT00001 0472CAT00001 24.06.2024 27.06.2024 RUB CNY -69627.92000000 10 24.06.2024 27.06.2024
10 45 472 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30411810300000002049 3,0411810101E+019 0045CAT00001 0472CAT00001 -9743.90 24.06.2024 27.06.2024 0.00 3000000000.00 RUB
11 472 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30411860500000006413 3,0411810101E+019 0472CAT00001 24.06.2024 27.06.2024 UZS RUB -10000000.00000000 69627.92 24.06.2024 27.06.2024
12 234 45 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30414810600000007000 3,04118103E+019 0234CAT00001 0045CAT00001 24.06.2024 27.06.2024 0.00 3000000000.00 CNY RUB -10.00000000 24.06.2024
13 302 234 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30411810700000006056 3,99118100000003E+019 0302MAT00001 0234CAT00001 24.06.2024 27.06.2024 10000000000.00 0.00 RUB -69627.92 27.06.2024
14 234 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30414810600000007000 3,99118100000003E+019 0234CAT00001 24.06.2024 27.06.2024 UZS 10000000.00000000 10000000 24.06.2024 27.06.2024
15 95 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30411860000000006094 30411810300000002094 0095CAT00001 24.06.2024 27.06.2024 UZS RUB -10000.00000000 69.75 24.06.2024 27.06.2024
16 95 234 47580029 2 24.06.2024T12:06:41 20.01.1970T02:49:58 30411810300000002094 3,99118100000003E+019 0095CAT00001 0234CAT00001 24.06.2024 27.06.2024 RUB CNY 69.75000000 -10 24.06.2024 27.06.2024