Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/rename TWR to ROAI (#4453)
Thomas Kaul6cd79fab310f
diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.tsindex 18738373e8..70f27fe7b6 100644--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts@@ -10,11 +10,11 @@ import { Injectable } from '@nestjs/common';import { MWRPortfolioCalculator } from './mwr/portfolio-calculator';import { PortfolioCalculator } from './portfolio-calculator';-import { TWRPortfolioCalculator } from './twr/portfolio-calculator';+import { RoaiPortfolioCalculator } from './roai/portfolio-calculator';export enum PerformanceCalculationType {MWR = 'MWR', // Money-Weighted Rate of Return- TWR = 'TWR' // Time-Weighted Rate of Return+ ROAI = 'ROAI' // Return on Average Investment}@Injectable()@@ -56,8 +56,8 @@ export class PortfolioCalculatorFactory {portfolioSnapshotService: this.portfolioSnapshotService,redisCacheService: this.redisCacheService});- case PerformanceCalculationType.TWR:- return new TWRPortfolioCalculator({+ case PerformanceCalculationType.ROAI:+ return new RoaiPortfolioCalculator({accountBalanceItems,activities,currency,diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.tssimilarity index 96%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.tsindex deb3cd72f7..e157e2d269 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts@@ -137,7 +137,7 @@ describe('PortfolioCalculator', () => {const portfolioCalculator = portfolioCalculatorFactory.createCalculator({activities,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: 'CHF',userId: userDummyData.id});diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.tssimilarity index 99%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.tsindex 7b4d53b2f9..a1650ea82a 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts@@ -122,7 +122,7 @@ describe('PortfolioCalculator', () => {const portfolioCalculator = portfolioCalculatorFactory.createCalculator({activities,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: 'CHF',userId: userDummyData.id});diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.tssimilarity index 99%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.tsindex 002cbd5e94..63a4d77b44 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts@@ -107,7 +107,7 @@ describe('PortfolioCalculator', () => {const portfolioCalculator = portfolioCalculatorFactory.createCalculator({activities,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: 'CHF',userId: userDummyData.id});diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.tssimilarity index 99%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.tsindex 640de39858..2853e3d87e 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts@@ -136,7 +136,7 @@ describe('PortfolioCalculator', () => {const portfolioCalculator = portfolioCalculatorFactory.createCalculator({activities,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: 'CHF',userId: userDummyData.id});diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.tssimilarity index 99%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.tsindex 6f030a73de..b96e4f5406 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.ts@@ -107,7 +107,7 @@ describe('PortfolioCalculator', () => {const portfolioCalculator = portfolioCalculatorFactory.createCalculator({activities,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: 'USD',userId: userDummyData.id});diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.tssimilarity index 99%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.tsindex 4e25c17f79..b3793a5b47 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts@@ -120,7 +120,7 @@ describe('PortfolioCalculator', () => {const portfolioCalculator = portfolioCalculatorFactory.createCalculator({activities,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: 'CHF',userId: userDummyData.id});diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-item.spec.tssimilarity index 99%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-item.spec.tsindex 7fc5c526d5..d226fe6f84 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-item.spec.ts@@ -107,7 +107,7 @@ describe('PortfolioCalculator', () => {const portfolioCalculator = portfolioCalculatorFactory.createCalculator({activities,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: 'USD',userId: userDummyData.id});diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-liability.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.tssimilarity index 98%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-liability.spec.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.tsindex 5fa90e94c1..569212b9a0 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-liability.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.ts@@ -107,7 +107,7 @@ describe('PortfolioCalculator', () => {const portfolioCalculator = portfolioCalculatorFactory.createCalculator({activities,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: 'USD',userId: userDummyData.id});diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-msft-buy-with-dividend.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.tssimilarity index 99%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-msft-buy-with-dividend.spec.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.tsindex 5439854241..4c54ba7aa6 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-msft-buy-with-dividend.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts@@ -135,7 +135,7 @@ describe('PortfolioCalculator', () => {const portfolioCalculator = portfolioCalculatorFactory.createCalculator({activities,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: 'USD',userId: userDummyData.id});diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.tssimilarity index 98%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.tsindex 84898490f4..77e3f61574 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.ts@@ -84,7 +84,7 @@ describe('PortfolioCalculator', () => {const portfolioCalculator = portfolioCalculatorFactory.createCalculator({activities: [],- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: 'CHF',userId: userDummyData.id});diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.tssimilarity index 99%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.tsindex 37f22e2f61..84bcc5bc11 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts@@ -116,7 +116,7 @@ describe('PortfolioCalculator', () => {const portfolioCalculator = portfolioCalculatorFactory.createCalculator({activities,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: 'CHF',userId: userDummyData.id});diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.tssimilarity index 96%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.tsindex caf196f546..937fd8b485 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts@@ -116,7 +116,7 @@ describe('PortfolioCalculator', () => {const portfolioCalculator = portfolioCalculatorFactory.createCalculator({activities,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: 'CHF',userId: userDummyData.id});diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.spec.tssimilarity index 100%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.spec.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.spec.tsdiff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.tssimilarity index 99%rename from apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.tsrename to apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.tsindex 059b854411..5b918fa038 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts@@ -15,7 +15,7 @@ import { Big } from 'big.js';import { addMilliseconds, differenceInDays, format, isBefore } from 'date-fns';import { cloneDeep, sortBy } from 'lodash';-export class TWRPortfolioCalculator extends PortfolioCalculator {+export class RoaiPortfolioCalculator extends PortfolioCalculator {private chartDates: string[];protected calculateOverallPerformance(diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.tsindex ce03c80249..e90ebd4ae5 100644--- a/apps/api/src/app/portfolio/portfolio.service.ts+++ b/apps/api/src/app/portfolio/portfolio.service.ts@@ -295,7 +295,7 @@ export class PortfolioService {activities,filters,userId,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: this.request.user.Settings.settings.baseCurrency});@@ -372,7 +372,7 @@ export class PortfolioService {activities,filters,userId,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: userCurrency});@@ -680,7 +680,7 @@ export class PortfolioService {const portfolioCalculator = this.calculatorFactory.createCalculator({activities,userId,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: userCurrency});@@ -950,7 +950,7 @@ export class PortfolioService {activities,filters,userId,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: this.request.user.Settings.settings.baseCurrency});@@ -1116,7 +1116,7 @@ export class PortfolioService {activities,filters,userId,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: userCurrency});diff --git a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.tsindex 93b34cbdf8..60c3cf6953 100644--- a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts+++ b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts@@ -68,7 +68,7 @@ export class PortfolioSnapshotProcessor {const portfolioCalculator = this.calculatorFactory.createCalculator({accountBalanceItems,activities,- calculationType: PerformanceCalculationType.TWR,+ calculationType: PerformanceCalculationType.ROAI,currency: job.data.userCurrency,filters: job.data.filters,userId: job.data.userIddiff --git a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.htmlindex 2a88802253..1a52bd6468 100644--- a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html+++ b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html@@ -117,8 +117,8 @@<ng-container i18n>Net Performance</ng-container><abbrclass="initialism ml-2 text-muted"- title="Time-Weighted Rate of Return"- >(TWR)</abbr+ title="Return on Average Investment"+ >(ROAI)</abbr></div><div class="flex-column flex-wrap justify-content-end">