Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Move portfolio calculator (#3204)
Thomas Kaul63a61fb49237
diff --git a/apps/api/src/app/portfolio/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.tssimilarity index 95%rename from apps/api/src/app/portfolio/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.tsrename to apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.tsindex 4a90409c9f..e08de8e222 100644--- a/apps/api/src/app/portfolio/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts@@ -1,11 +1,11 @@import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { parseDate } from '@ghostfolio/common/helper';import { Big } from 'big.js';-import { CurrentRateServiceMock } from './current-rate.service.mock';import { PortfolioCalculator } from './portfolio-calculator';jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {diff --git a/apps/api/src/app/portfolio/portfolio-calculator-baln-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.tssimilarity index 98%rename from apps/api/src/app/portfolio/portfolio-calculator-baln-buy-and-sell.spec.tsrename to apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.tsindex 6176acbb50..411c5e4db4 100644--- a/apps/api/src/app/portfolio/portfolio-calculator-baln-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts@@ -1,11 +1,11 @@import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { parseDate } from '@ghostfolio/common/helper';import { Big } from 'big.js';-import { CurrentRateServiceMock } from './current-rate.service.mock';import { PortfolioCalculator } from './portfolio-calculator';jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {diff --git a/apps/api/src/app/portfolio/portfolio-calculator-baln-buy.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.tssimilarity index 97%rename from apps/api/src/app/portfolio/portfolio-calculator-baln-buy.spec.tsrename to apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.tsindex 61dfb59158..32f5826476 100644--- a/apps/api/src/app/portfolio/portfolio-calculator-baln-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts@@ -1,11 +1,11 @@import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { parseDate } from '@ghostfolio/common/helper';import { Big } from 'big.js';-import { CurrentRateServiceMock } from './current-rate.service.mock';import { PortfolioCalculator } from './portfolio-calculator';jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {diff --git a/apps/api/src/app/portfolio/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.tssimilarity index 98%rename from apps/api/src/app/portfolio/portfolio-calculator-btcusd-buy-and-sell-partially.spec.tsrename to apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.tsindex d17a12ba80..f5687f8104 100644--- a/apps/api/src/app/portfolio/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts@@ -1,12 +1,12 @@import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Big } from 'big.js';-import { CurrentRateServiceMock } from './current-rate.service.mock';import { PortfolioCalculator } from './portfolio-calculator';jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {diff --git a/apps/api/src/app/portfolio/portfolio-calculator-googl-buy.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.tssimilarity index 98%rename from apps/api/src/app/portfolio/portfolio-calculator-googl-buy.spec.tsrename to apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.tsindex 5e870b4476..7437337334 100644--- a/apps/api/src/app/portfolio/portfolio-calculator-googl-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts@@ -1,12 +1,12 @@import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Big } from 'big.js';-import { CurrentRateServiceMock } from './current-rate.service.mock';import { PortfolioCalculator } from './portfolio-calculator';jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {diff --git a/apps/api/src/app/portfolio/portfolio-calculator-msft-buy-with-dividend.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-msft-buy-with-dividend.spec.tssimilarity index 97%rename from apps/api/src/app/portfolio/portfolio-calculator-msft-buy-with-dividend.spec.tsrename to apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-msft-buy-with-dividend.spec.tsindex 9ec51094e7..afd5e9ff24 100644--- a/apps/api/src/app/portfolio/portfolio-calculator-msft-buy-with-dividend.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-msft-buy-with-dividend.spec.ts@@ -1,12 +1,12 @@import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Big } from 'big.js';-import { CurrentRateServiceMock } from './current-rate.service.mock';import { PortfolioCalculator } from './portfolio-calculator';jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {diff --git a/apps/api/src/app/portfolio/portfolio-calculator-no-orders.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.tssimilarity index 96%rename from apps/api/src/app/portfolio/portfolio-calculator-no-orders.spec.tsrename to apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.tsindex 9947e2f45a..39a563b858 100644--- a/apps/api/src/app/portfolio/portfolio-calculator-no-orders.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.ts@@ -1,11 +1,11 @@import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { parseDate } from '@ghostfolio/common/helper';import { Big } from 'big.js';import { subDays } from 'date-fns';-import { CurrentRateServiceMock } from './current-rate.service.mock';import { PortfolioCalculator } from './portfolio-calculator';jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {diff --git a/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.tssimilarity index 98%rename from apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell-partially.spec.tsrename to apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.tsindex 8eeb216ba6..d7e7c6eab4 100644--- a/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts@@ -1,11 +1,11 @@import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { parseDate } from '@ghostfolio/common/helper';import { Big } from 'big.js';-import { CurrentRateServiceMock } from './current-rate.service.mock';import { PortfolioCalculator } from './portfolio-calculator';jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {diff --git a/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.tssimilarity index 98%rename from apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.tsrename to apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.tsindex ec00fffe73..68eecea220 100644--- a/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts@@ -1,11 +1,11 @@import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { parseDate } from '@ghostfolio/common/helper';import { Big } from 'big.js';-import { CurrentRateServiceMock } from './current-rate.service.mock';import { PortfolioCalculator } from './portfolio-calculator';jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {diff --git a/apps/api/src/app/portfolio/portfolio-calculator.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.spec.tssimilarity index 96%rename from apps/api/src/app/portfolio/portfolio-calculator.spec.tsrename to apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.spec.tsindex a385774ffd..de011d813e 100644--- a/apps/api/src/app/portfolio/portfolio-calculator.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.spec.ts@@ -1,8 +1,8 @@+import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { Big } from 'big.js';-import { CurrentRateService } from './current-rate.service';import { PortfolioCalculator } from './portfolio-calculator';describe('PortfolioCalculator', () => {diff --git a/apps/api/src/app/portfolio/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.tssimilarity index 98%rename from apps/api/src/app/portfolio/portfolio-calculator.tsrename to apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.tsindex d95acc836d..6ea93a6707 100644--- a/apps/api/src/app/portfolio/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts@@ -1,4 +1,10 @@import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';+import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';+import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/current-positions.interface';+import { PortfolioOrderItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-calculator.interface';+import { PortfolioOrder } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-order.interface';+import { TransactionPointSymbol } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point-symbol.interface';+import { TransactionPoint } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point.interface';import { getFactor } from '@ghostfolio/api/helper/portfolio.helper';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';@@ -30,13 +36,6 @@ import {} from 'date-fns';import { cloneDeep, first, isNumber, last, sortBy, uniq } from 'lodash';-import { CurrentRateService } from './current-rate.service';-import { CurrentPositions } from './interfaces/current-positions.interface';-import { PortfolioOrderItem } from './interfaces/portfolio-calculator.interface';-import { PortfolioOrder } from './interfaces/portfolio-order.interface';-import { TransactionPointSymbol } from './interfaces/transaction-point-symbol.interface';-import { TransactionPoint } from './interfaces/transaction-point.interface';-export class PortfolioCalculator {private static readonly ENABLE_LOGGING = false;diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.tsindex fe0e5a6015..7fe82504fd 100644--- a/apps/api/src/app/portfolio/portfolio.service.ts+++ b/apps/api/src/app/portfolio/portfolio.service.ts@@ -86,11 +86,11 @@ import {} from 'date-fns';import { isEmpty, last, uniq, uniqBy } from 'lodash';+import { PortfolioCalculator } from './calculator/twr/portfolio-calculator';import {HistoricalDataContainer,PortfolioPositionDetail} from './interfaces/portfolio-position-detail.interface';-import { PortfolioCalculator } from './portfolio-calculator';import { RulesService } from './rules.service';const asiaPacificMarkets = require('../../assets/countries/asia-pacific-markets.json');