Merge pull request #20 from spacious-team/imvestbook-gh-380

Не определять тип ЦБ по ее id

Author: vananiev

src/main/java/org/spacious_team/broker/pojo/Security.java

@@ -42,6 +42,10 @@ public class Security {
             example = "NL0009805522, USDRUB_TOM или Si-12.21", required = true)
     private final String id;
 
+    @NotNull
+    @Schema(description = "Тип ценной бумаги", example = "STOCK", required = true)
+    private final SecurityType type;
+
     //@Nullable
     @Schema(description = "ISIN акций и облигаций (опционально)", example = "NL0009805522", nullable = true)
     private final String isin;

src/main/java/org/spacious_team/broker/pojo/SecurityQuote.java

@@ -78,16 +78,13 @@ public class SecurityQuote {
      */
     @JsonIgnore
     @Schema(hidden = true)
-    public BigDecimal getCleanPriceInCurrency() {
-        SecurityType type = SecurityType.getSecurityType(security);
-        if (type == DERIVATIVE) {
-            return price;
+    public BigDecimal getCleanPriceInCurrency(boolean isDerivative) {
+        if (isDerivative) {
+            return price; // for future and option always use price, also in case of price == null
+        } else if (price == null && accruedInterest == null) {
+            return quote; // for stocks, currency pairs, asset
         } else {
-            if (price == null && accruedInterest == null) {
-                return quote; // for stocks, currency pairs, asset
-            } else {
-                return price; // for bonds
-            }
+            return price; // for bonds
         }
     }
 
@@ -96,8 +93,8 @@ public BigDecimal getCleanPriceInCurrency() {
      */
     @JsonIgnore
     @Schema(hidden = true)
-    public BigDecimal getDirtyPriceInCurrency() {
-        BigDecimal cleanPrice = getCleanPriceInCurrency();
+    public BigDecimal getDirtyPriceInCurrency(boolean isDerivative) {
+        BigDecimal cleanPrice = getCleanPriceInCurrency(isDerivative);
         return (cleanPrice == null || accruedInterest == null) ? cleanPrice : cleanPrice.add(accruedInterest);
     }
 }

src/main/java/org/spacious_team/broker/pojo/SecurityType.java

@@ -26,32 +26,14 @@ public enum SecurityType {
 
     STOCK("акция"),
     BOND("облигация"),
-    STOCK_OR_BOND("акция/облигация"), // нельзя сказать точно акция или облигация
+    STOCK_OR_BOND("акция/облигация"), // not exactly known: STOCK or BOND
     DERIVATIVE("срочный контракт"),
-    CURRENCY_PAIR("валюта"),
+    CURRENCY_PAIR("валютная пара"),
     ASSET("произвольный актив");
 
-    public static final String ASSET_PREFIX = "ASSET:";
     @Getter
     private final String description;
 
-    public static SecurityType getSecurityType(Security security) {
-        return getSecurityType(security.getId());
-    }
-
-    public static SecurityType getSecurityType(String security) {
-        int length = security.length();
-        if (length == 12 && security.indexOf('-') == -1) {
-            return STOCK_OR_BOND;
-        } else if (length == 6 || (length > 7 && security.charAt(6) == '_')) { // USDRUB_TOM or USDRUB_TOD or USDRUB
-            return CURRENCY_PAIR;
-        } else if (security.startsWith(ASSET_PREFIX)) {
-            return ASSET;
-        }
-        // фьючерс всегда с дефисом, например Si-12.21, опцион может быть MXI-6.21M170621CA3000 или MM3000BF1
-        return DERIVATIVE;
-    }
-
     /**
      * Returns currency pairs, for example USDRUB, EURRUB
      */
@@ -63,4 +45,12 @@ public static String getCurrencyPair(String contract) {
     public boolean isStockOrBond() {
         return this == STOCK || this == BOND || this == STOCK_OR_BOND;
     }
+
+    public boolean isStock() {
+        return this == STOCK || this == STOCK_OR_BOND;
+    }
+
+    public boolean isBond() {
+        return this == BOND || this == STOCK_OR_BOND;
+    }
 }

src/main/java/org/spacious_team/broker/report_parser/api/AbstractBrokerReportFactory.java

@@ -29,8 +29,8 @@ public abstract class AbstractBrokerReportFactory implements BrokerReportFactory
     /**
      * @param expectedFileNamePattern used for fast report check without input stream reading
      */
-    protected boolean canCreate(Pattern expectedFileNamePattern, String excelFileName, InputStream is) {
-        return expectedFileNamePattern.matcher(excelFileName).matches();
+    protected boolean canCreate(Pattern expectedFileNamePattern, String fileName, InputStream is) {
+        return expectedFileNamePattern.matcher(fileName).matches();
     }
 
     /**
@@ -40,7 +40,7 @@ protected boolean canCreate(Pattern expectedFileNamePattern, String excelFileNam
      * @return broker report if can parse or null
      * @throws IllegalArgumentException if InputStream is not supports mark
      */
-    protected BrokerReport create(String excelFileName,
+    protected BrokerReport create(String fileName,
                                   InputStream is,
                                   BiFunction<String, InputStream, BrokerReport> brokerReportProvider) {
         if (!is.markSupported()) {
@@ -50,7 +50,7 @@ protected BrokerReport create(String excelFileName,
         is.mark(Integer.MAX_VALUE);
         Exception exception = null;
         try {
-            return brokerReportProvider.apply(excelFileName, is);
+            return brokerReportProvider.apply(fileName, is);
         } catch (Exception e) {
             exception = e;
             return null;

src/main/java/org/spacious_team/broker/report_parser/api/BrokerReportFactory.java

@@ -28,15 +28,15 @@ public interface BrokerReportFactory {
      * @return false when can't parse, true when parsing maybe possible
      * @throws IllegalArgumentException if InputStream is not supports mark
      */
-    boolean canCreate(String excelFileName, InputStream is);
+    boolean canCreate(String fileName, InputStream is);
 
     /**
      * Checks input stream and returns broker report if can, otherwise reset input stream mark to original position
      * and returns null
      * @return broker report if can parse or null
      * @throws IllegalArgumentException if InputStream is not supports mark
      */
-    BrokerReport create(String excelFileName, InputStream is);
+    BrokerReport create(String fileName, InputStream is);
 
     String getBrokerName();
 }