From d1d5b16d16fa9e42142bea775ae31d388ad93b4f Mon Sep 17 00:00:00 2001 From: Daniel Devaud Date: Wed, 2 Apr 2025 18:52:56 +0200 Subject: [PATCH] Fix Tests --- ...aln-buy-and-sell-in-two-activities.spec.ts | 7 +--- ...folio-calculator-baln-buy-and-sell.spec.ts | 7 +--- .../portfolio-calculator-baln-buy.spec.ts | 3 +- ...ator-btcusd-buy-and-sell-partially.spec.ts | 3 +- .../roai/portfolio-calculator-fee.spec.ts | 3 +- .../portfolio-calculator-googl-buy.spec.ts | 37 ++++--------------- .../roai/portfolio-calculator-item.spec.ts | 3 +- .../portfolio-calculator-liability.spec.ts | 3 +- ...-calculator-msft-buy-with-dividend.spec.ts | 3 +- .../portfolio-calculator-no-orders.spec.ts | 3 +- ...ulator-novn-buy-and-sell-partially.spec.ts | 7 +--- 11 files changed, 21 insertions(+), 58 deletions(-) diff --git a/apps/api/src/app/portfolio/calculator/roai/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 index 64f0239f5..c5325ee7f 100644 --- a/apps/api/src/app/portfolio/calculator/roai/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 @@ -79,8 +79,7 @@ describe('PortfolioCalculator', () => { currentRateService, exchangeRateDataService, portfolioSnapshotService, - redisCacheService, - null + redisCacheService ); }); @@ -177,9 +176,7 @@ describe('PortfolioCalculator', () => { netPerformancePercentageWithCurrencyEffectMap: { max: new Big('-0.0552834149755073478') }, - netPerformanceWithCurrencyEffectMap: { - max: new Big('-15.8') - }, + netPerformanceWithCurrencyEffectMap: { max: new Big('-15.8') }, marketPrice: 148.9, marketPriceInBaseCurrency: 148.9, quantity: new Big('0'), diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts index 787ed78ee..8ca8d8c2f 100644 --- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts +++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts @@ -79,8 +79,7 @@ describe('PortfolioCalculator', () => { currentRateService, exchangeRateDataService, portfolioSnapshotService, - redisCacheService, - null + redisCacheService ); }); @@ -164,9 +163,7 @@ describe('PortfolioCalculator', () => { netPerformancePercentageWithCurrencyEffectMap: { max: new Big('-0.0552834149755073478') }, - netPerformanceWithCurrencyEffectMap: { - max: new Big('-15.8') - }, + netPerformanceWithCurrencyEffectMap: { max: new Big('-15.8') }, marketPrice: 148.9, marketPriceInBaseCurrency: 148.9, quantity: new Big('0'), diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts index ec6caed2b..63a4d77b4 100644 --- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts +++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts @@ -79,8 +79,7 @@ describe('PortfolioCalculator', () => { currentRateService, exchangeRateDataService, portfolioSnapshotService, - redisCacheService, - null + redisCacheService ); }); diff --git a/apps/api/src/app/portfolio/calculator/roai/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 index 0e0e56016..2853e3d87 100644 --- a/apps/api/src/app/portfolio/calculator/roai/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 @@ -92,8 +92,7 @@ describe('PortfolioCalculator', () => { currentRateService, exchangeRateDataService, portfolioSnapshotService, - redisCacheService, - null + redisCacheService ); }); diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.ts index 5e23ccd1c..b96e4f540 100644 --- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.ts +++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.ts @@ -79,8 +79,7 @@ describe('PortfolioCalculator', () => { currentRateService, exchangeRateDataService, portfolioSnapshotService, - redisCacheService, - null + redisCacheService ); }); diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts index 8ca8341d8..a80dd192e 100644 --- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts +++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts @@ -92,8 +92,7 @@ describe('PortfolioCalculator', () => { currentRateService, exchangeRateDataService, portfolioSnapshotService, - redisCacheService, - null + redisCacheService ); }); @@ -162,9 +161,7 @@ describe('PortfolioCalculator', () => { netPerformancePercentageWithCurrencyEffectMap: { max: new Big('0.24112962014285697628') }, - netPerformanceWithCurrencyEffectMap: { - max: new Big('19.851974') - }, + netPerformanceWithCurrencyEffectMap: { max: new Big('19.851974') }, marketPrice: 116.45, marketPriceInBaseCurrency: 103.10483, quantity: new Big('1'), @@ -200,30 +197,12 @@ describe('PortfolioCalculator', () => { expect(investmentsByMonth).toEqual([ { date: '2023-01-01', investment: 82.329056 }, - { - date: '2023-02-01', - investment: 0 - }, - { - date: '2023-03-01', - investment: 0 - }, - { - date: '2023-04-01', - investment: 0 - }, - { - date: '2023-05-01', - investment: 0 - }, - { - date: '2023-06-01', - investment: 0 - }, - { - date: '2023-07-01', - investment: 0 - } + { date: '2023-02-01', investment: 0 }, + { date: '2023-03-01', investment: 0 }, + { date: '2023-04-01', investment: 0 }, + { date: '2023-05-01', investment: 0 }, + { date: '2023-06-01', investment: 0 }, + { date: '2023-07-01', investment: 0 } ]); }); }); diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-item.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-item.spec.ts index 53d2f57e8..d226fe6f8 100644 --- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-item.spec.ts +++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-item.spec.ts @@ -79,8 +79,7 @@ describe('PortfolioCalculator', () => { currentRateService, exchangeRateDataService, portfolioSnapshotService, - redisCacheService, - null + redisCacheService ); }); diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.ts index 4a54df95e..569212b9a 100644 --- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.ts +++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.ts @@ -79,8 +79,7 @@ describe('PortfolioCalculator', () => { currentRateService, exchangeRateDataService, portfolioSnapshotService, - redisCacheService, - null + redisCacheService ); }); diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts index aad4e138d..90ee9c22b 100644 --- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts +++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts @@ -92,8 +92,7 @@ describe('PortfolioCalculator', () => { currentRateService, exchangeRateDataService, portfolioSnapshotService, - redisCacheService, - null + redisCacheService ); }); diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.ts index dc0f3771f..77e3f6157 100644 --- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.ts +++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.ts @@ -74,8 +74,7 @@ describe('PortfolioCalculator', () => { currentRateService, exchangeRateDataService, portfolioSnapshotService, - redisCacheService, - null + redisCacheService ); }); diff --git a/apps/api/src/app/portfolio/calculator/roai/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 index bb83a98ad..895118ac4 100644 --- a/apps/api/src/app/portfolio/calculator/roai/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 @@ -93,8 +93,7 @@ describe('PortfolioCalculator', () => { currentRateService, exchangeRateDataService, portfolioSnapshotService, - redisCacheService, - null + redisCacheService ); }); @@ -158,9 +157,7 @@ describe('PortfolioCalculator', () => { netPerformancePercentageWithCurrencyEffectMap: { max: new Big('0.12348284960422163588') }, - netPerformanceWithCurrencyEffectMap: { - max: new Big('17.68') - }, + netPerformanceWithCurrencyEffectMap: { max: new Big('17.68') }, marketPrice: 87.8, marketPriceInBaseCurrency: 87.8, quantity: new Big('1'),