From 827270704af33417b3c87592cf8feeef02a88c44 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Fri, 13 Oct 2023 19:51:02 +0200
Subject: [PATCH] Bugfix/fix import for activities of type fee and interest
 (#2474)

* Fix import for activities of type fee and interest

* Update changelog
---
 CHANGELOG.md                                          |  4 ++++
 .../src/app/services/import-activities.service.ts     |  4 ++++
 test/import/ok.csv                                    | 11 ++++++-----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a13ad1b68..e8f1c342a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved the language localization for German (`de`)
 - Upgraded `prisma` from version `5.3.1` to `5.4.2`
 
+### Fixed
+
+- Fixed `FEE` and `INTEREST` types in the activities import of `csv` files
+
 ## 2.10.0 - 2023-10-09
 
 ### Added
diff --git a/apps/client/src/app/services/import-activities.service.ts b/apps/client/src/app/services/import-activities.service.ts
index 0a58e3cdd..760871922 100644
--- a/apps/client/src/app/services/import-activities.service.ts
+++ b/apps/client/src/app/services/import-activities.service.ts
@@ -337,6 +337,10 @@ export class ImportActivitiesService {
             return Type.BUY;
           case 'dividend':
             return Type.DIVIDEND;
+          case 'fee':
+            return Type.FEE;
+          case 'interest':
+            return Type.INTEREST;
           case 'item':
             return Type.ITEM;
           case 'liability':
diff --git a/test/import/ok.csv b/test/import/ok.csv
index 9f1f1c768..8be69ee90 100644
--- a/test/import/ok.csv
+++ b/test/import/ok.csv
@@ -1,5 +1,6 @@
-Date,Code,Currency,Price,Quantity,Action,Fee,Note
-16-09-2021,MSFT,USD,298.580,5,buy,19.00,My first order 🤓
-17/11/2021,MSFT,USD,0.62,5,dividend,0.00
-01.01.2022,Penthouse Apartment,USD,500000.0,1,item,0.00
-20500606,MSFT,USD,0.00,0,buy,0.00
+Date,Code,DataSource,Currency,Price,Quantity,Action,Fee,Note
+01-09-2021,Account Opening Fee,MANUAL,USD,0,0,fee,49,
+16-09-2021,MSFT,YAHOO,USD,298.580,5,buy,19.00,My first order 🤓
+17/11/2021,MSFT,YAHOO,USD,0.62,5,dividend,0.00
+01.01.2022,Penthouse Apartment,MANUAL,USD,500000.0,1,item,0.00
+20500606,MSFT,YAHOO,USD,0.00,0,buy,0.00