From 7b92f4fc965b451bdace01776c04ec4d3e8275f0 Mon Sep 17 00:00:00 2001 From: Reto Kaul Date: Fri, 16 Aug 2024 17:25:16 +0200 Subject: [PATCH] Fix tests --- apps/api/src/app/portfolio/calculator/portfolio-calculator.ts | 2 +- ...lio-calculator-baln-buy-and-sell-in-two-activities.spec.ts | 4 +--- .../twr/portfolio-calculator-baln-buy-and-sell.spec.ts | 4 +--- .../calculator/twr/portfolio-calculator-baln-buy.spec.ts | 4 +--- ...portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts | 4 +--- .../portfolio/calculator/twr/portfolio-calculator-fee.spec.ts | 4 +--- .../calculator/twr/portfolio-calculator-googl-buy.spec.ts | 4 +--- .../calculator/twr/portfolio-calculator-item.spec.ts | 4 +--- .../twr/portfolio-calculator-msft-buy-with-dividend.spec.ts | 4 +--- .../calculator/twr/portfolio-calculator-no-orders.spec.ts | 3 +-- .../portfolio-calculator-novn-buy-and-sell-partially.spec.ts | 4 +--- .../twr/portfolio-calculator-novn-buy-and-sell.spec.ts | 4 +--- 12 files changed, 12 insertions(+), 33 deletions(-) diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts index fabdbc1ae..be4c704c2 100644 --- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts +++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts @@ -163,7 +163,7 @@ export abstract class PortfolioCalculator { positions: TimelinePosition[] ): PortfolioSnapshot; - public async computeSnapshot( + private async computeSnapshot( start: Date, end?: Date ): Promise { 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/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts index 95276b097..c087857b0 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/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts @@ -131,9 +131,7 @@ describe('PortfolioCalculator', () => { start: parseDate('2021-11-22') }); - const portfolioSnapshot = await portfolioCalculator.computeSnapshot( - parseDate('2021-11-22') - ); + const portfolioSnapshot = await portfolioCalculator.getSnapshot(); const investments = portfolioCalculator.getInvestments(); 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/twr/portfolio-calculator-baln-buy-and-sell.spec.ts index 84e9cdaaa..512b0869d 100644 --- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts +++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts @@ -116,9 +116,7 @@ describe('PortfolioCalculator', () => { start: parseDate('2021-11-22') }); - const portfolioSnapshot = await portfolioCalculator.computeSnapshot( - parseDate('2021-11-22') - ); + const portfolioSnapshot = await portfolioCalculator.getSnapshot(); const investments = portfolioCalculator.getInvestments(); diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts index 0a9713f84..a4be7c3b9 100644 --- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts +++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts @@ -101,9 +101,7 @@ describe('PortfolioCalculator', () => { start: parseDate('2021-11-30') }); - const portfolioSnapshot = await portfolioCalculator.computeSnapshot( - parseDate('2021-11-30') - ); + const portfolioSnapshot = await portfolioCalculator.getSnapshot(); const investments = portfolioCalculator.getInvestments(); 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/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts index fab379f87..ce3c45555 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/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts @@ -129,9 +129,7 @@ describe('PortfolioCalculator', () => { start: parseDate('2015-01-01') }); - const portfolioSnapshot = await portfolioCalculator.computeSnapshot( - parseDate('2015-01-01') - ); + const portfolioSnapshot = await portfolioCalculator.getSnapshot(); const investments = portfolioCalculator.getInvestments(); diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts index 64e02e44c..f87a3f108 100644 --- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts +++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts @@ -97,9 +97,7 @@ describe('PortfolioCalculator', () => { userId: userDummyData.id }); - const portfolioSnapshot = await portfolioCalculator.computeSnapshot( - parseDate('2021-11-30') - ); + const portfolioSnapshot = await portfolioCalculator.getSnapshot(); spy.mockRestore(); diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts index 8c930f1bf..21b88d56f 100644 --- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts +++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts @@ -114,9 +114,7 @@ describe('PortfolioCalculator', () => { start: parseDate('2023-01-03') }); - const portfolioSnapshot = await portfolioCalculator.computeSnapshot( - parseDate('2023-01-03') - ); + const portfolioSnapshot = await portfolioCalculator.getSnapshot(); const investments = portfolioCalculator.getInvestments(); diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts index 6ef71f7ae..eb1045bec 100644 --- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts +++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts @@ -97,9 +97,7 @@ describe('PortfolioCalculator', () => { userId: userDummyData.id }); - const portfolioSnapshot = await portfolioCalculator.computeSnapshot( - parseDate('2022-01-01') - ); + const portfolioSnapshot = await portfolioCalculator.getSnapshot(); spy.mockRestore(); 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/twr/portfolio-calculator-msft-buy-with-dividend.spec.ts index 094c6cc2e..eabea87a3 100644 --- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-msft-buy-with-dividend.spec.ts +++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-msft-buy-with-dividend.spec.ts @@ -125,9 +125,7 @@ describe('PortfolioCalculator', () => { userId: userDummyData.id }); - const portfolioSnapshot = await portfolioCalculator.computeSnapshot( - parseDate('2023-07-10') - ); + const portfolioSnapshot = await portfolioCalculator.getSnapshot(); spy.mockRestore(); diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.ts index 585eb2b3e..d9a347c7d 100644 --- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.ts +++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.ts @@ -79,8 +79,7 @@ describe('PortfolioCalculator', () => { const chartData = await portfolioCalculator.getChartData({ start }); - const portfolioSnapshot = - await portfolioCalculator.computeSnapshot(start); + const portfolioSnapshot = await portfolioCalculator.getSnapshot(); const investments = portfolioCalculator.getInvestments(); 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/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts index b2224d873..9fa3644a1 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/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts @@ -116,9 +116,7 @@ describe('PortfolioCalculator', () => { start: parseDate('2022-03-07') }); - const portfolioSnapshot = await portfolioCalculator.computeSnapshot( - parseDate('2022-03-07') - ); + const portfolioSnapshot = await portfolioCalculator.getSnapshot(); const investments = portfolioCalculator.getInvestments(); 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/twr/portfolio-calculator-novn-buy-and-sell.spec.ts index 3056a283b..e4373c0ec 100644 --- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts +++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts @@ -116,9 +116,7 @@ describe('PortfolioCalculator', () => { start: parseDate('2022-03-07') }); - const portfolioSnapshot = await portfolioCalculator.computeSnapshot( - parseDate('2022-03-07') - ); + const portfolioSnapshot = await portfolioCalculator.getSnapshot(); const investments = portfolioCalculator.getInvestments();