Merge pull request #22 from spacious-team/improvement-gh-296

Изменить тип Security.id со String на Integer

Author: vananiev

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

@@ -36,11 +36,9 @@
 @EqualsAndHashCode(cacheStrategy = LAZY)
 @Schema(name = "Инструмент", description = "Акция, облигация, валютная пара, фьючерс или опцион")
 public class Security {
-    // update to nullable after change to Integer
-    @NotNull
-    @Schema(description = "Внутренний идентификатор инструмента (для акций и облигаций - ISIN, валютный пары и срочных контрактов - название)",
-            example = "NL0009805522, USDRUB_TOM или Si-12.21", required = true)
-    private final String id;
+    //@Nullable // autoincrement
+    @Schema(description = "Внутренний идентификатор инструмента", example = "123", required = true)
+    private final Integer id;
 
     @NotNull
     @Schema(description = "Тип ценной бумаги", example = "STOCK", required = true)
@@ -51,7 +49,7 @@ public class Security {
     private final String isin;
 
     //@Nullable
-    @Schema(description = "Тикер (опционально)", example = "YNDX", nullable = true)
+    @Schema(description = "Тикер (опционально)", example = "YNDX, USDRUB_TOM или Si-12.21", nullable = true)
     private final String ticker;
 
     //@Nullable

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

@@ -37,8 +37,8 @@
 @Schema(name = "Свойства инструмента", description = "Информация об инструменте")
 public class SecurityDescription {
     @NotNull
-    @Schema(description = "Внутренний идентификатор инструмента", example = "NL0009805522, USDRUB_TOM или Si-12.21", required = true)
-    private final String security;
+    @Schema(description = "Внутренний идентификатор инструмента", example = "123", required = true)
+    private final int security;
 
     //@Nullable
     @Schema(description = "Сектор экономики (опционально)", example = "Финансы", nullable = true)

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

@@ -54,8 +54,8 @@ public class SecurityEventCashFlow {
     private final Instant timestamp;
 
     @NotNull
-    @Schema(description = "Инструмент", example = "NL0009805522", required = true)
-    private final String security;
+    @Schema(description = "Инструмент", example = "123", required = true)
+    private final int security;
 
     @NotNull
     @Schema(description = "Количество бумаг (контрактов)", example = "10", required = true)
@@ -81,7 +81,7 @@ public static boolean checkEquality(SecurityEventCashFlow cash1, SecurityEventCa
         return cash1.getPortfolio().equals(cash2.getPortfolio()) &&
                 cash1.getTimestamp().equals(cash2.getTimestamp()) &&
                 cash1.getEventType().equals(cash2.getEventType()) &&
-                cash1.getSecurity().equals(cash2.getSecurity());
+                cash1.getSecurity() == cash2.getSecurity();
     }
 
     /**

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

@@ -47,8 +47,8 @@ public class SecurityQuote {
     private final Integer id;
 
     @NotNull
-    @Schema(description = "Инструмент", example = "NL0009805522", required = true)
-    private final String security;
+    @Schema(description = "Инструмент", example = "123", required = true)
+    private final int security;
 
     @NotNull
     @Schema(description = "Время", example = "2021-01-01T19:00:00+03:00", required = true)

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

@@ -52,8 +52,8 @@ public class Transaction {
     private final String portfolio;
 
     @NotNull
-    @Schema(description = "Инструмент", example = "NL0009805522", required = true)
-    private final String security;
+    @Schema(description = "Инструмент", example = "123", required = true)
+    private final int security;
 
     @NotNull
     @Schema(description = "Время сделки", example = "2021-01-23T12:00:00+03:00", required = true)

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

@@ -46,7 +46,7 @@ public class TransactionCashFlow {
     @NotNull
     @JsonProperty("transaction-id")
     @Schema(description = "Внутренний идентификатор сделки", example = "123", required = true)
-    private final Integer transactionId;
+    private final int transactionId;
 
     @NotNull
     @JsonProperty("event-type")

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

@@ -35,15 +35,15 @@
 import static lombok.EqualsAndHashCode.CacheStrategy.LAZY;
 
 @Getter
-@SuperBuilder
+@SuperBuilder(toBuilder = true)
 @ToString
 @EqualsAndHashCode(cacheStrategy = LAZY)
 public abstract class AbstractTransaction {
     protected static final BigDecimal minValue = BigDecimal.valueOf(0.01);
     protected final Integer id;
     protected final String tradeId;
     protected final String portfolio;
-    protected final String security;
+    protected final int security;
     protected final Instant timestamp;
     protected final int count;
     protected final BigDecimal value; // стоиомсть в валюце цены
@@ -92,4 +92,6 @@ protected Optional<TransactionCashFlow> getCommissionCashFlow() {
         }
         return Optional.empty();
     }
+
+    public abstract AbstractTransactionBuilder<? extends AbstractTransaction, ? extends AbstractTransactionBuilder<?, ?>> toBuilder();
 }

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

@@ -33,7 +33,7 @@
 import static lombok.EqualsAndHashCode.CacheStrategy.LAZY;
 
 @Getter
-@SuperBuilder
+@SuperBuilder(toBuilder = true)
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true, cacheStrategy = LAZY)
 public class DerivativeTransaction extends AbstractTransaction {

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

@@ -24,7 +24,7 @@
 
 import static lombok.EqualsAndHashCode.CacheStrategy.LAZY;
 
-@SuperBuilder
+@SuperBuilder(toBuilder = true)
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true, cacheStrategy = LAZY)
 public class ForeignExchangeTransaction extends AbstractTransaction {

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

@@ -33,7 +33,7 @@
 import static lombok.EqualsAndHashCode.CacheStrategy.LAZY;
 
 @Getter
-@SuperBuilder
+@SuperBuilder(toBuilder = true)
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true, cacheStrategy = LAZY)
 public class SecurityTransaction extends AbstractTransaction {