rename Transaction.id to Transaction.tradeId

spacious-team/investbook#363

Author: vananiev

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

@@ -18,6 +18,7 @@
 
 package org.spacious_team.broker.pojo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
@@ -39,11 +40,12 @@
 public class Transaction {
     //@Nullable // autoincrement
     @Schema(description = "Внутренний идентификатор сделки", example = "123", required = true)
-    private final Integer pk;
+    private final Integer id;
 
     @NotNull
+    @JsonProperty("trade-id")
     @Schema(description = "Номер сделки в системе учета брокера", example = "123SP", required = true)
-    private final String id;
+    private final String tradeId;
 
     @NotNull
     @Schema(description = "Номер счета в системе учета брокера", example = "10200I", required = true)

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

@@ -41,12 +41,12 @@
 public class TransactionCashFlow {
     //@Nullable // autoincrement
     @Schema(description = "Внутренний идентификатор записи", example = "1", required = true)
-    private final Integer pk;
+    private final Integer id;
 
     @NotNull
-    @JsonProperty("transaction-pk")
+    @JsonProperty("transaction-id")
     @Schema(description = "Внутренний идентификатор сделки", example = "123", required = true)
-    private final Integer transactionPk;
+    private final Integer transactionId;
 
     @NotNull
     @JsonProperty("event-type")

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

@@ -40,7 +40,7 @@
 @EqualsAndHashCode(cacheStrategy = LAZY)
 public abstract class AbstractTransaction {
     protected static final BigDecimal minValue = BigDecimal.valueOf(0.01);
-    protected final String transactionId;
+    protected final String tradeId;
     protected final String portfolio;
     protected final String security;
     protected final Instant timestamp;
@@ -52,7 +52,7 @@ public abstract class AbstractTransaction {
 
     public Transaction getTransaction() {
         return Transaction.builder()
-                .id(transactionId)
+                .tradeId(tradeId)
                 .portfolio(portfolio)
                 .security(security)
                 .timestamp(timestamp)