From 2928a429e08cc32925f78a2a967e7b54e89967fd Mon Sep 17 00:00:00 2001
From: Zahrun <10415894+Zahrun@users.noreply.github.com>
Date: Sat, 17 Dec 2022 22:56:06 +0100
Subject: [PATCH] fix: include fee in revolut trade id creation

---
 src/parsers/trades/revolut/index.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/parsers/trades/revolut/index.ts b/src/parsers/trades/revolut/index.ts
index b6fb217..ee9e4af 100644
--- a/src/parsers/trades/revolut/index.ts
+++ b/src/parsers/trades/revolut/index.ts
@@ -26,9 +26,10 @@ export default async function processData(importDetails: IImport): Promise<ITrad
             console.log(`Not an exchange ${trade.Type}`);
             continue;
         }
-        const tradeToAdd: IPartialTrade = {};
-        tradeToAdd.date = createDateAsUTC(new Date(trade['Completed Date'])).getTime();
-        tradeToAdd.exchange = EXCHANGES.Revolut;
+        const tradeToAdd: IPartialTrade = {
+            date : createDateAsUTC(new Date(trade['Completed Date'])).getTime(),
+            exchange : EXCHANGES.Revolut,
+        };
         const bought = trade.Description.substr(trade.Description.lastIndexOf(' ') + 1);
         if (bought === trade.Currency) {
             tradeToAdd.boughtCurrency = trade.Currency;
@@ -46,10 +47,10 @@ export default async function processData(importDetails: IImport): Promise<ITrad
             console.log(`Error base currency \"${trade['Base currency']}\"`);
             continue;
         }
-        tradeToAdd.ID = createID(tradeToAdd);
-        tradeToAdd.exchangeID = tradeToAdd.ID;
         tradeToAdd.transactionFeeCurrency = trade['Base currency'];
         tradeToAdd.transactionFee = Math.round((parseFloat(trade['Fiat amount (inc. fees)'])-parseFloat(trade['Fiat amount']))*100)/100;
+        tradeToAdd.ID = createID(tradeToAdd);
+        tradeToAdd.exchangeID = tradeToAdd.ID;
         internalFormat.push(tradeToAdd as ITrade);
     }
     return internalFormat;