update Transaction, TransactionCashFlow spacious-team/investbook#363

Author: vananiev

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

@@ -37,6 +37,10 @@
 @EqualsAndHashCode(cacheStrategy = LAZY)
 @Schema(name = "Сделка")
 public class Transaction {
+    //@Nullable // autoincrement
+    @Schema(description = "Внутренний идентификатор сделки", example = "123", required = true)
+    private final Integer pk;
+
     @NotNull
     @Schema(description = "Номер сделки в системе учета брокера", example = "123SP", required = true)
     private final String id;

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

@@ -39,14 +39,14 @@
 @EqualsAndHashCode(cacheStrategy = LAZY)
 @Schema(name = "Движение ДС по сделке")
 public class TransactionCashFlow {
-    @NotNull
-    @JsonProperty("transaction-id")
-    @Schema(description = "Номер сделки в системе учета брокера", example = "123SP", required = true)
-    private final String transactionId;
+    //@Nullable // autoincrement
+    @Schema(description = "Внутренний идентификатор записи", example = "1", required = true)
+    private final Integer pk;
 
     @NotNull
-    @Schema(description = "Номер счета в системе учета брокера", example = "10200I", required = true)
-    private final String portfolio;
+    @JsonProperty("transaction-pk")
+    @Schema(description = "Внутренний идентификатор сделки", example = "123", required = true)
+    private final Integer transactionPk;
 
     @NotNull
     @JsonProperty("event-type")

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

@@ -70,8 +70,6 @@ public List<TransactionCashFlow> getTransactionCashFlows() {
     protected Optional<TransactionCashFlow> getValueCashFlow(CashFlowType type) {
         if (value != null && value.abs().compareTo(minValue) >= 0) {
         return Optional.of(TransactionCashFlow.builder()
-                .transactionId(transactionId)
-                .portfolio(portfolio)
                 .eventType(type)
                 .value(value)
                 .currency(valueCurrency)
@@ -83,8 +81,6 @@ protected Optional<TransactionCashFlow> getValueCashFlow(CashFlowType type) {
     protected Optional<TransactionCashFlow> getCommissionCashFlow() {
         if (commission != null && commission.abs().compareTo(minValue) >= 0) {
             return Optional.of(TransactionCashFlow.builder()
-                    .transactionId(transactionId)
-                    .portfolio(portfolio)
                     .eventType(CashFlowType.COMMISSION)
                     .value(commission)
                     .currency(commissionCurrency)

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

@@ -51,8 +51,6 @@ public List<TransactionCashFlow> getTransactionCashFlows() {
     protected Optional<TransactionCashFlow> getValueInPointsCashFlow() {
         if (valueInPoints != null) {
             return Optional.of(TransactionCashFlow.builder()
-                    .transactionId(transactionId)
-                    .portfolio(portfolio)
                     .eventType(CashFlowType.DERIVATIVE_QUOTE)
                     .value(valueInPoints)
                     .currency(QUOTE_CURRENCY)
@@ -65,8 +63,6 @@ protected Optional<TransactionCashFlow> getValueInPointsCashFlow() {
     protected Optional<TransactionCashFlow> getValueCashFlow(CashFlowType type) {
         if (value != null) {
             return Optional.of(TransactionCashFlow.builder()
-                    .transactionId(transactionId)
-                    .portfolio(portfolio)
                     .eventType(type)
                     .value(value)
                     .currency(valueCurrency)

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

@@ -51,8 +51,6 @@ private Optional<TransactionCashFlow> getAccruedInterestCashFlow() {
         // for securities accrued interest = 0
         if (accruedInterest != null && accruedInterest.abs().compareTo(minValue) >= 0) {
             return Optional.of(TransactionCashFlow.builder()
-                    .transactionId(transactionId)
-                    .portfolio(portfolio)
                     .eventType(CashFlowType.ACCRUED_INTEREST)
                     .value(accruedInterest)
                     .currency(valueCurrency)