Merge pull request #26 from spacious-team/develop

Релиз 2022.1

Author: vananiev

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

@@ -37,7 +37,7 @@
 @Schema(name = "Эмитент")
 public class Issuer {
     //@Nullable
-    @Schema(description = "Внутренний идентификатор эмитента")
+    @Schema(description = "Внутренний идентификатор эмитента", nullable = true)
     private final Integer id;
 
     //@Nullable

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

@@ -19,9 +19,7 @@
 package org.spacious_team.broker.pojo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -30,8 +28,6 @@
 
 import java.math.BigDecimal;
 import java.time.Instant;
-import java.util.Collection;
-import java.util.stream.Collectors;
 
 import static lombok.EqualsAndHashCode.CacheStrategy.LAZY;
 
@@ -42,56 +38,24 @@
 @Builder(toBuilder = true)
 @EqualsAndHashCode(cacheStrategy = LAZY)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@Schema(name = "Остаток денежных средств")
 public class PortfolioCash {
-    private static final ObjectMapper objectMapper = new ObjectMapper();
-
     //@Nullable // autoincrement
+    @Schema(description = "Внутренний идентификатор", example = "123", nullable = true)
     private final Integer id;
+
+    @Schema(description = "Номер счета в системе учета брокера", example = "10200I", required = true)
     private final String portfolio;
+
+    @Schema(description = "Значение актуально на дату", example = "2021-01-23T12:00:00+03:00", required = true)
     private final Instant timestamp;
-    private final String section;
-    private final BigDecimal value;
-    private final String currency;
 
-    /**
-     * Serializes in format:
-     * <pre>
-     * [
-     *     {
-     *         "section": "forts",
-     *         "value": "1000",
-     *         "currency": "RUB"
-     *     }
-     * ]
-     * </pre>
-     * {@code Portfolio} and {@code timestamp} fields are not serialized.
-     * Used to serialize portfolio cash for {@link PortfolioProperty.PortfolioPropertyBuilder#value(String)}.
-     */
-    @Deprecated
-    public static String serialize(Collection<PortfolioCash> cash) {
-        try {
-            cash = cash.stream()
-                    .map(PortfolioCash::toBuilder)
-                    .map(builder -> builder.portfolio(null))
-                    .map(builder -> builder.timestamp(null))
-                    .map(PortfolioCashBuilder::build)
-                    .collect(Collectors.toList());
-            return objectMapper.writeValueAsString(cash);
-        } catch (JsonProcessingException e) {
-            throw new IllegalArgumentException("Can't serialize portfolio cash", e);
-        }
-    }
+    @Schema(description = "Рынок", example = "Фондовый", nullable = true)
+    private final String market;
+
+    @Schema(description = "Остаток денежных средств", example = "102.30", required = true)
+    private final BigDecimal value;
 
-    /**
-     * Used to deserialize portfolio cash from {@link PortfolioProperty#getValue()}.
-     */
-    @Deprecated
-    public static Collection<PortfolioCash> deserialize(String value) {
-        try {
-            return objectMapper.readValue(value, new TypeReference<>() {
-            });
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Can't deserialize portfolio cash", e);
-        }
-    }
+    @Schema(description = "Валюта", example = "RUB", required = true)
+    private final String currency;
 }

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

@@ -20,6 +20,5 @@
 
 public enum PortfolioPropertyType {
     TOTAL_ASSETS_RUB,
-    TOTAL_ASSETS_USD, // if TOTAL_ASSETS_RUB and TOTAL_ASSETS_USD exists for same date, total assets is sum of them
-    CASH
+    TOTAL_ASSETS_USD // if TOTAL_ASSETS_RUB and TOTAL_ASSETS_USD exists for same date, total assets is sum of them
 }

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

@@ -37,7 +37,7 @@
 @Schema(name = "Инструмент", description = "Акция, облигация, валютная пара, фьючерс или опцион")
 public class Security {
     //@Nullable // autoincrement
-    @Schema(description = "Внутренний идентификатор инструмента", example = "123", required = true)
+    @Schema(description = "Внутренний идентификатор инструмента", example = "123", nullable = true)
     private final Integer id;
 
     @NotNull

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

@@ -39,7 +39,7 @@
 @Schema(name = "Сделка")
 public class Transaction {
     //@Nullable // autoincrement
-    @Schema(description = "Внутренний идентификатор сделки", example = "123", required = true)
+    @Schema(description = "Внутренний идентификатор сделки", example = "123", nullable = true)
     private final Integer id;
 
     @NotNull

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

@@ -40,7 +40,7 @@
 @Schema(name = "Движение ДС по сделке")
 public class TransactionCashFlow {
     //@Nullable // autoincrement
-    @Schema(description = "Внутренний идентификатор записи", example = "1", required = true)
+    @Schema(description = "Внутренний идентификатор записи", example = "1", nullable = true)
     private final Integer id;
 
     @NotNull