From c3dcb0cfa21f32ad735bac06cc3e8f876eb1deb6 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sun, 3 Mar 2024 19:17:58 +0100
Subject: [PATCH] Refactoring

---
 .../src/app/portfolio/portfolio-calculator.ts  | 11 +++++------
 .../app/services/import-activities.service.ts  | 18 +++++++++---------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/apps/api/src/app/portfolio/portfolio-calculator.ts b/apps/api/src/app/portfolio/portfolio-calculator.ts
index b5fefbe35..27a5a278b 100644
--- a/apps/api/src/app/portfolio/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator.ts
@@ -13,7 +13,6 @@ import {
 import { GroupBy } from '@ghostfolio/common/types';
 
 import { Logger } from '@nestjs/common';
-import { Type as ActivityType } from '@prisma/client';
 import Big from 'big.js';
 import {
   addDays,
@@ -971,7 +970,7 @@ export class PortfolioCalculator {
       itemType: 'start',
       name: '',
       quantity: new Big(0),
-      type: ActivityType.BUY,
+      type: 'BUY',
       unitPrice: unitPriceAtStartDate
     });
 
@@ -985,7 +984,7 @@ export class PortfolioCalculator {
       itemType: 'end',
       name: '',
       quantity: new Big(0),
-      type: ActivityType.BUY,
+      type: 'BUY',
       unitPrice: unitPriceAtEndDate
     });
 
@@ -1012,7 +1011,7 @@ export class PortfolioCalculator {
             feeInBaseCurrency: new Big(0),
             name: '',
             quantity: new Big(0),
-            type: ActivityType.BUY,
+            type: 'BUY',
             unitPrice:
               marketSymbolMap[format(day, DATE_FORMAT)]?.[symbol] ??
               lastUnitPrice
@@ -1194,14 +1193,14 @@ export class PortfolioCalculator {
       );
 
       const grossPerformanceFromSell =
-        order.type === ActivityType.SELL
+        order.type === 'SELL'
           ? order.unitPriceInBaseCurrency
               .minus(lastAveragePrice)
               .mul(order.quantity)
           : new Big(0);
 
       const grossPerformanceFromSellWithCurrencyEffect =
-        order.type === ActivityType.SELL
+        order.type === 'SELL'
           ? order.unitPriceInBaseCurrencyWithCurrencyEffect
               .minus(lastAveragePriceWithCurrencyEffect)
               .mul(order.quantity)
diff --git a/apps/client/src/app/services/import-activities.service.ts b/apps/client/src/app/services/import-activities.service.ts
index 5375c32aa..c1b2209b3 100644
--- a/apps/client/src/app/services/import-activities.service.ts
+++ b/apps/client/src/app/services/import-activities.service.ts
@@ -5,7 +5,7 @@ import { parseDate as parseDateHelper } from '@ghostfolio/common/helper';
 
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Account, DataSource, Type } from '@prisma/client';
+import { Account, DataSource, Type as ActivityType } from '@prisma/client';
 import { isFinite } from 'lodash';
 import { parse as csvToJson } from 'papaparse';
 import { EMPTY } from 'rxjs';
@@ -328,26 +328,26 @@ export class ImportActivitiesService {
     content: any[];
     index: number;
     item: any;
-  }) {
+  }): ActivityType {
     item = this.lowercaseKeys(item);
 
     for (const key of ImportActivitiesService.TYPE_KEYS) {
       if (item[key]) {
         switch (item[key].toLowerCase()) {
           case 'buy':
-            return Type.BUY;
+            return 'BUY';
           case 'dividend':
-            return Type.DIVIDEND;
+            return 'DIVIDEND';
           case 'fee':
-            return Type.FEE;
+            return 'FEE';
           case 'interest':
-            return Type.INTEREST;
+            return 'INTEREST';
           case 'item':
-            return Type.ITEM;
+            return 'ITEM';
           case 'liability':
-            return Type.LIABILITY;
+            return 'LIABILITY';
           case 'sell':
-            return Type.SELL;
+            return 'SELL';
           default:
             break;
         }