remove SecurityType.getSecurity()

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

@@ -50,6 +50,10 @@ public class SecurityQuote {
     @Schema(description = "Инструмент", example = "NL0009805522", required = true)
     private final String security;
 
+    @NotNull
+    @Schema(description = "Тип", example = "STOCK", required = true)
+    private final SecurityType securityType;
+
     @NotNull
     @Schema(description = "Время", example = "2021-01-01T19:00:00+03:00", required = true)
     private final Instant timestamp;
@@ -79,15 +83,12 @@ public class SecurityQuote {
     @JsonIgnore
     @Schema(hidden = true)
     public BigDecimal getCleanPriceInCurrency() {
-        SecurityType type = SecurityType.getSecurityType(security);
-        if (type == DERIVATIVE) {
+        if (securityType == DERIVATIVE) {
             return price;
+        } 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
         }
     }
 

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;
+    }
 }