From 2d1eb01aa4ff12a36af5dbd2cd28a77698d869d9 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Mon, 29 Jan 2024 21:33:15 +0100 Subject: [PATCH] Fix tests --- .../portfolio-calculator-baln-buy-and-sell.spec.ts | 2 +- .../src/app/portfolio/portfolio-calculator-baln-buy.spec.ts | 2 +- ...rtfolio-calculator-btcusd-buy-and-sell-partially.spec.ts | 6 +++--- .../app/portfolio/portfolio-calculator-googl-buy.spec.ts | 4 ++-- .../app/portfolio/portfolio-calculator-no-orders.spec.ts | 2 +- ...portfolio-calculator-novn-buy-and-sell-partially.spec.ts | 2 +- .../portfolio-calculator-novn-buy-and-sell.spec.ts | 2 +- .../exchange-rate-data/exchange-rate-data.service.mock.ts | 4 ++++ 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/apps/api/src/app/portfolio/portfolio-calculator-baln-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/portfolio-calculator-baln-buy-and-sell.spec.ts index a841311ba..f71d2ab21 100644 --- a/apps/api/src/app/portfolio/portfolio-calculator-baln-buy-and-sell.spec.ts +++ b/apps/api/src/app/portfolio/portfolio-calculator-baln-buy-and-sell.spec.ts @@ -75,7 +75,7 @@ describe('PortfolioCalculator', () => { const investments = portfolioCalculator.getInvestments(); const investmentsByMonth = - portfolioCalculator.getInvestmentsByGroup('month'); + await portfolioCalculator.getInvestmentsByGroup('month'); spy.mockRestore(); diff --git a/apps/api/src/app/portfolio/portfolio-calculator-baln-buy.spec.ts b/apps/api/src/app/portfolio/portfolio-calculator-baln-buy.spec.ts index 8d416ddc8..193d2a152 100644 --- a/apps/api/src/app/portfolio/portfolio-calculator-baln-buy.spec.ts +++ b/apps/api/src/app/portfolio/portfolio-calculator-baln-buy.spec.ts @@ -64,7 +64,7 @@ describe('PortfolioCalculator', () => { const investments = portfolioCalculator.getInvestments(); const investmentsByMonth = - portfolioCalculator.getInvestmentsByGroup('month'); + await portfolioCalculator.getInvestmentsByGroup('month'); spy.mockRestore(); diff --git a/apps/api/src/app/portfolio/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts index cb96751f1..c8c47188d 100644 --- a/apps/api/src/app/portfolio/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts +++ b/apps/api/src/app/portfolio/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts @@ -88,7 +88,7 @@ describe('PortfolioCalculator', () => { const investments = portfolioCalculator.getInvestments(); const investmentsByMonth = - portfolioCalculator.getInvestmentsByGroup('month'); + await portfolioCalculator.getInvestmentsByGroup('month'); spy.mockRestore(); @@ -155,7 +155,7 @@ describe('PortfolioCalculator', () => { ]); expect(investmentsByMonth).toEqual([ - { date: '2015-01-01', investment: new Big('640.86') }, + { date: '2015-01-01', investment: new Big('637.085334599999935914') }, { date: '2015-02-01', investment: new Big('0') }, { date: '2015-03-01', investment: new Big('0') }, { date: '2015-04-01', investment: new Big('0') }, @@ -190,7 +190,7 @@ describe('PortfolioCalculator', () => { { date: '2017-09-01', investment: new Big('0') }, { date: '2017-10-01', investment: new Big('0') }, { date: '2017-11-01', investment: new Big('0') }, - { date: '2017-12-01', investment: new Big('-14156.4') } + { date: '2017-12-01', investment: new Big('-13854.86868') } ]); }); }); diff --git a/apps/api/src/app/portfolio/portfolio-calculator-googl-buy.spec.ts b/apps/api/src/app/portfolio/portfolio-calculator-googl-buy.spec.ts index fcd3e8bd5..c57a06742 100644 --- a/apps/api/src/app/portfolio/portfolio-calculator-googl-buy.spec.ts +++ b/apps/api/src/app/portfolio/portfolio-calculator-googl-buy.spec.ts @@ -77,7 +77,7 @@ describe('PortfolioCalculator', () => { const investments = portfolioCalculator.getInvestments(); const investmentsByMonth = - portfolioCalculator.getInvestmentsByGroup('month'); + await portfolioCalculator.getInvestmentsByGroup('month'); spy.mockRestore(); @@ -137,7 +137,7 @@ describe('PortfolioCalculator', () => { ]); expect(investmentsByMonth).toEqual([ - { date: '2023-01-01', investment: new Big('89.12') } + { date: '2023-01-01', investment: new Big('82.329056') } ]); }); }); diff --git a/apps/api/src/app/portfolio/portfolio-calculator-no-orders.spec.ts b/apps/api/src/app/portfolio/portfolio-calculator-no-orders.spec.ts index aeffaae26..35d7b5327 100644 --- a/apps/api/src/app/portfolio/portfolio-calculator-no-orders.spec.ts +++ b/apps/api/src/app/portfolio/portfolio-calculator-no-orders.spec.ts @@ -52,7 +52,7 @@ describe('PortfolioCalculator', () => { const investments = portfolioCalculator.getInvestments(); const investmentsByMonth = - portfolioCalculator.getInvestmentsByGroup('month'); + await portfolioCalculator.getInvestmentsByGroup('month'); spy.mockRestore(); diff --git a/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell-partially.spec.ts index 7bf0bc1e1..a37f76989 100644 --- a/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell-partially.spec.ts +++ b/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell-partially.spec.ts @@ -75,7 +75,7 @@ describe('PortfolioCalculator', () => { const investments = portfolioCalculator.getInvestments(); const investmentsByMonth = - portfolioCalculator.getInvestmentsByGroup('month'); + await portfolioCalculator.getInvestmentsByGroup('month'); spy.mockRestore(); diff --git a/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.ts index 3e30374c4..a68133134 100644 --- a/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.ts +++ b/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.ts @@ -79,7 +79,7 @@ describe('PortfolioCalculator', () => { const investments = portfolioCalculator.getInvestments(); const investmentsByMonth = - portfolioCalculator.getInvestmentsByGroup('month'); + await portfolioCalculator.getInvestmentsByGroup('month'); spy.mockRestore(); diff --git a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.mock.ts b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.mock.ts index e32af51d3..1fbe3e17a 100644 --- a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.mock.ts +++ b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.mock.ts @@ -11,6 +11,10 @@ export const ExchangeRateDataServiceMock = { '2015-01-01': 1, '2017-12-31': 1, '2018-01-01': 1, + '2021-11-22': 1, + '2021-11-30': 1, + '2022-03-07': 1, + '2022-04-08': 1, '2023-01-03': 1, '2023-07-10': 1 },