Merge pull request #7 from spacious-team/develop

Релиз 2021.1.1

pom.xml

@@ -24,7 +24,7 @@
 
     <groupId>org.spacious-team</groupId>
     <artifactId>broker-report-parser-api</artifactId>
-    <version>2021.1</version>
+    <version>2021.1.1</version>
     <packaging>jar</packaging>
 
     <name>Broker Report Parser API</name>
@@ -107,5 +107,5 @@
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

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

@@ -0,0 +1,43 @@
+/*
+ * Broker Report Parser API
+ * Copyright (C) 2021  Vitalii Ananev <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.spacious_team.broker.pojo;
+
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Getter
+@ToString
+@Builder(toBuilder = true)
+@EqualsAndHashCode
+public class ForeignExchangeRate {
+    @NotNull
+    private final LocalDate date;
+
+    @NotNull
+    private final String currencyPair;
+
+    @NotNull
+    private final BigDecimal rate;
+}

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

@@ -1,6 +1,6 @@
 /*
  * Broker Report Parser API
- * Copyright (C) 2020  Vitalii Ananev <[email protected]>
+ * Copyright (C) 2021  Vitalii Ananev <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -19,10 +19,7 @@
 package org.spacious_team.broker.pojo;
 
 public enum PortfolioPropertyType {
-    TOTAL_ASSETS, // in RUB
-    CASH,
-    USDRUB_EXCHANGE_RATE,
-    EURRUB_EXCHANGE_RATE,
-    GBPRUB_EXCHANGE_RATE,
-    CHFRUB_EXCHANGE_RATE
+    TOTAL_ASSETS_RUB,
+    TOTAL_ASSETS_USD, // use one of TOTAL_ASSETS_RUB or TOTAL_ASSETS_USD
+    CASH
 }

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

@@ -1,6 +1,6 @@
 /*
  * Broker Report Parser API
- * Copyright (C) 2020  Vitalii Ananev <[email protected]>
+ * Copyright (C) 2021  Vitalii Ananev <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -19,6 +19,7 @@
 package org.spacious_team.broker.report_parser.api;
 
 import org.spacious_team.broker.pojo.EventCashFlow;
+import org.spacious_team.broker.pojo.ForeignExchangeRate;
 import org.spacious_team.broker.pojo.PortfolioProperty;
 import org.spacious_team.broker.pojo.Security;
 import org.spacious_team.broker.pojo.SecurityEventCashFlow;
@@ -48,4 +49,6 @@ public interface ReportTables {
     ReportTable<SecurityEventCashFlow> getDerivativeCashFlowTable();
 
     ReportTable<SecurityQuote> getSecurityQuoteTable();
+
+    ReportTable<ForeignExchangeRate> getForeignExchangeRateTable();
 }