From 406929c78cd710bbe2fabcb9c5c080c0eb8844bb Mon Sep 17 00:00:00 2001
From: Plotnikov Andrey <shemplo@outlook.com>
Date: Fri, 16 Sep 2022 19:13:18 +0300
Subject: [PATCH] Fix of expected coupons sum in bonds table + filter bonds
 that can be bought + emitters updated

---
 emitters.bin                                  | Bin 35612 -> 35820 bytes
 .../java/ru/shemplo/tbs/TBSBondManager.java   |   6 +++++-
 src/main/java/ru/shemplo/tbs/entity/Bond.java |   5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/emitters.bin b/emitters.bin
index 154031e49382f173377b8d0edeb117fdd5adc2e4..1a92d508ef9636757fd16ef72fc73d1d84985f64 100644
GIT binary patch
delta 1756
zcmZvcdr(w$6vy}Oz3f6FNC+q*Eofk%a$oznY1%$u*JWLH?>=BJj0*GsA8C43CPzcb
zA{z(gR5WB*Lr(7*^p_(dzQ**Qrs-~DS$|aan8~tfWHQVCsdKN@z)ZU{`}p18?|aVq
zp3nImdeQvzfO(|a%<y%x05#^dj37pw@QPWsa4e@dMflCUIg4X?*(s=|Zir?qfp_T5
z_)w^e*vUL*(2P&nCZ|(1HAA<z3T{}|pcwChxYf_FskjJ-t=IJZVV6kuXZ~uoL?x8k
ziBikR2h$>S#@*ThZ3vd;mS*($EtYJuI+rnLC`#>0JIttDNS@D&)0RN3sG2&A0J93#
zVMxy5u&bsROiZta69tzU&gFGMUtz++Dyal(ho1^Pv@gIyO;Md5JksQX9YtX)D|sZ<
zBxCRg$n;saDND%5sip<6tEiBa7q^--*kDtz7J5sP44+W!@NLN|Y8|xtA`qNgjrm#s
z{1~2?yC;iP6fVH4rgwEE@RSbGLfA>ZD=nlf&LAdM4inZwD6s8eL?JA|%eIr2NDw2f
zF!m3WEurmP96l{`(@H8%W|v>U$V#d<3g66s8|{lr(06Y#YqoY+_r_KZ8!O5x(48Na
zcWrsxw9AxfGG3YaswrDeuq^Aw8U@9rnkwOXu!MY4v6ylxiqwd%&G}bE8%}p?Bibo#
z%=jGDPL}IhGY!SU?Wjp%h+BV<^$QxQvT0hs_MUcdvG%I=y1p%U$~LQ71l3i=v>*o|
zP<10yNx2;k)l`oivV&Y*p<8vjpX{uzrX(&DWL4ALJC$gMv?JP}tz3ISJBI0;!GELL
zxRJ=5sS&=|L|ltDAenB~32)Ve7}n!q;dV`oj@cz>V1KmA$pn&=)TtnyoJd*NU^3};
z!Z1I~@BxW~ps<Bj0z8}(+&UM&ga8p|4RMH-W*zTv&;jj^CjF=Ak;r++43tn(GM>ER
z^w3QSk(9WaDXS3HosAmMoRS2J7M%i2+#ke)yw}Hqdr5zWlBy5bQGGG7EKQlIHiMbY
zW#wo@-o`d^U|Eo&dC5V(T&~`km<YC}9q}y&)w2ziM30w+8=l^5<X1pOZN^l*;axbd
z$3NqeXL8?jF1JkXJ6A7~Ti!m3;hQ)YdA7C!6RhXRvARskC@mtvIsa9iFRx6F1df`m
zytfGpYS4#=^wuw;^Z}RR7_`=yuxp|HxFXc?IMln1l{Z&DWjKTSeE1B-2w_elHyb$Y
zPN>cS_sPa};cpaRx7<KIip9s_D|sFwoBQ;{<kV-DUY(RW&(|U}V0g7X_Pg#U+sG3&
zex71jpI0PO@<}W!Y3ImzBTG?z#?HSUEL?{0+Oz@W_!uJez6~KguAM-zM{Nk$@$?>p
z@Kf4|0oGJ>b1r^J@>5n!JrQG}v{`0&uOfijyqcDA;j`ujtH8=D>tdYVPEcB!je;U@
zwxtrgnbXiguD9$(51cWPsH=);hD-QF=x;sCaQ27;5^c*FHW}mLrM51HS7H*G*?xth
zIc&o(4<#6m$9DN2E}$4rbO~h5BjXe;_?>W1M~voK7PfYT7}4dH;9|#aMo6R_5bQk2
z2+<G+Uw1|sF7D<*T<d3qpe&Fl*IuF+(UTHk#rm;~IGVW^qBZ$s&W6KgJRB0>%*H6g
z%XI?eZ>p!0PKmT`vYQ#v5q6Nl%^@@)ZpX_~9i+XDF7nLQFjDGslFzsCOu1^B|If@0
zp`l~x?(}o`J*pkIX$Otb9qW%4SbF?-otL{v-j16&Ue#2k4e4*3@7HkW(e!@pG`6E#
zBiN>KZ6w`mTZE^zL2clFI+OL-g)Ye62YJ$zn;=UVhLL^kn9qX$)CW<kJKbw&k75jh
U2&8-9qn6p3c=LQOcXf6B4I*k-a{vGU

delta 1614
zcmY*ZYitx%6yAAkx7FHO3I$6k3ls`1lsm88S+Lf9uv@pgEi<#P*&-CMq_!ZXELc#>
zw$eycQsEeR$g9vu5Q*q5ia?8qQ6qn5BR&%U5Di9*CJ-S8@P~I+AY~?#%-lKmeCK@U
z`|h8+=zZ_dC#z|e;~E?=pKfP)CCtHoTFpU8UDYMHMR(<)U?QZ-DN7m@>q0orbmgF6
zRE~3a2D_KeBY{4*l(IB~-B%4aa+a}zFNz>y3$TJ3;o+d|cM`8?$c4A({!KHwC_>S=
zr}4!{6^4??rYa~aoNVn&pV{fePZqMYH5gU=GG0`aW^y9BGi7PZ2HhIpK`M!dd?;nn
z;KpOs@b-kutRVYDSX~m$;Sj3VUGQ~@hY7kk$e-vpTkymrNK9<Bap4F_q>=_|@gEa!
zQ;ZlF@o!ITrmY;}9re&!7GpWh<%08NOKla#0rQ5ADK*xf^o$A*9GKFV$007R66_Dm
zB(SRd0K-KUY@1p_F`VE8yZv3#_+kX-?Vshy2{C1PCL4Hm+Cqkph2ZuyHxrDwaP9Pq
zCa8cCV4e9sOS1BSXU3?#X0(0CIAshQr!r~dq;WR$rZHli%naBKY@9ZR$>Jz<l~;|M
zXEzRIUd{9x@L+kcrMTkQ_ubv=*I9Zjxt8peTb#1wt5JlI+r-mcDN7~X36|jvvudc^
zU_x_}sWoMb9Ih;Z_gV^=V}}*|b7h>ORB-b%;Ano)lx!)V8Xp^{GkxS4uunI38Yhe$
zHO3)h2nN%|_My(chjG6ggDW~U=$vyspA0S_q%5<Iw+OKVRU#pFvwQ-7Q&mmbkenpE
zrpzf<>?19WJVe0gyi7k?JV(G^BR_hLGmzOd3G(KaThq@CUA~Lw&Rs*Z0`d{v)`Z9u
zWe)zT(Fo}Rc;{bZH6iT82rZ{fiRh{fySO8)*btH6DSkcU5oH+W-R5*1jf5e^R2H5i
z%%+Kal0Lx&aVcRsK&dAV(81lZ7;+sWBp0W75nOV3m`2ToA9prWEFVA|UMsIBf^hiZ
zsw-$E`-BA4wnSjtg1X#bEG%>PA?_^DY1`y`N*k=5X-(%%J$e;istr;MibnCIx>VL%
z;Siy1C8??uK6Gz1E8)#a#<LF4JxMZ1!L*+@YmzTKbF5o_-PTqL*FB}AARmVdyaN==
z#RMlF^v$9eUqHg&F3P3M_Bg)-e)3--azySV9tnIzGa}OPy5JJZv~|eGr!0%iygNhN
z&4sW;WZjzu`aHDN<RGewI2azKSTXKKIKPRbS>*5v;8x5NB<YPI*rPPr?DzU~s8zFi
z(l6g$K2|W}%dd<P3{nKr4P=S_LH)<fqDU_Mopym@g_uvqyQ5nu7U|?|avV{WMgONJ
zvfOX%BAVPc-Lybq)(9mp5-U(W=~whLzMim=+T3mt?j}_hc_Rpv=4Fg8EC6n9dW1u2
z*sl?)O##dU*Ao3f(N~sKk<)4PriKfj?I+OnaRKjMTFS6U(Gh&I{5;DyHt?`%MIFn>
zbO)SU(anldjKlKEAIU8B#W1cl%JP!rz#Xj<h)j|ZC*Hd19L4wpJb2qQ#^Z9ro;IT0
z`ltlg+Im^8A;`lE&+lM46}f<ES6IR6l_Aj{V7Z7U;v?-}kvx2WgEgzqSmVS!{jjdI
z7}u>iNVB}h$HOmc%{>kT&dvr#_HekrQzE}Y<kTMR3K72qLOc{~*vlwE2_N6kNHGmO
q!vAjMSzBk8z)sxp(#?YVA8`0}C>l#@U;2V~6#Q?j%)1xf-TfaCeJ5oA

diff --git a/src/main/java/ru/shemplo/tbs/TBSBondManager.java b/src/main/java/ru/shemplo/tbs/TBSBondManager.java
index ffdcc93..013d946 100644
--- a/src/main/java/ru/shemplo/tbs/TBSBondManager.java
+++ b/src/main/java/ru/shemplo/tbs/TBSBondManager.java
@@ -165,7 +165,11 @@ public void initialize (IProfile profile, TBSLogWrapper log) {
             try {                
                 log.info ("Loading data about bonds from Tinkoff and MOEX...");
                 scanned = client.getInstrumentsService ().getAllBondsSync ().stream ()
-                    . filter (instrument -> profile.getCurrencies ().contains (Currency.from (instrument.getCurrency ()))).parallel ()
+                    . filter (instrument -> 
+                        instrument.getApiTradeAvailableFlag ()
+                        && instrument.getBuyAvailableFlag ()
+                        && profile.getCurrencies ().contains (Currency.from (instrument.getCurrency ()))
+                    ).parallel ()
                     . map (instr -> new Bond (profile, instr, false)).peek (bond -> emitters.addEmitter (bond.getEmitterId (), bond.getCode ()))
                     . filter (profile::testBond)//.limit (profile.getMaxResults ())
                     . collect (Collectors.toList ());
diff --git a/src/main/java/ru/shemplo/tbs/entity/Bond.java b/src/main/java/ru/shemplo/tbs/entity/Bond.java
index d2f3213..0aaa841 100644
--- a/src/main/java/ru/shemplo/tbs/entity/Bond.java
+++ b/src/main/java/ru/shemplo/tbs/entity/Bond.java
@@ -212,7 +212,10 @@ public void updateScore (IProfile profile) {
         final var days = now.until (end, ChronoUnit.DAYS);
         
         reliableCoupons = coupons.stream ().map (Coupon::isReliable).reduce (Boolean::logicalAnd).orElse (true);
-        couponsCredit = coupons.stream ().mapToDouble (c -> c.getCredit (profile, now, end)).sum ();
+        couponsCredit = coupons.stream ()
+            . filter (c -> !now.isAfter (TBSUtils.aOrB (c.getRecord (), c.getDate ()))) // consider only coupons that can be payed after now
+            . mapToDouble (c -> c.getCredit (profile, now, end))
+            . sum ();
         
         final var inflationFactor =  Math.pow (1 + profile.getInflation (), days / 365.0);        
         nominalValueWithInflation = nominalValue / inflationFactor;