API tests fixed

2 weeks ago · 39d3ad4f49
13 changed files with 39 additions and 31 deletions
--- a/apps/api/src/app/export/export.service.ts
+++ b/apps/api/src/app/export/export.service.ts
@ -120,6 +120,7 @@ export class ExportService {
        ({
          accountId,
          comment,
+          currency,
          date,
          fee,
          id,
@ -137,7 +138,7 @@ export class ExportService {
            quantity,
            type,
            unitPrice,
-            currency: SymbolProfile.currency,
+            currency: currency ?? SymbolProfile.currency,
            dataSource: SymbolProfile.dataSource,
            date: date.toISOString(),
            symbol: ['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(type)
--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator-test-utils.ts
+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator-test-utils.ts
@ -6,10 +6,13 @@ export const activityDummyData = {
  comment: undefined,
  createdAt: new Date(),
  currency: undefined,
+  fee: undefined,
  feeInBaseCurrency: undefined,
  id: undefined,
  isDraft: false,
  symbolProfileId: undefined,
+  unitPrice: undefined,
+  unitPriceInBaseCurrency: undefined,
  updatedAt: new Date(),
  userId: undefined,
  value: undefined,
--- 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
@ -91,7 +91,7 @@ describe('PortfolioCalculator', () => {
        {
          ...activityDummyData,
          date: new Date('2021-11-22'),
-          fee: 1.55,
+          feeInBaseCurrency: 1.55,
          quantity: 2,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -101,12 +101,12 @@ describe('PortfolioCalculator', () => {
            symbol: 'BALN.SW'
          },
          type: 'BUY',
-          unitPrice: 142.9
+          unitPriceInBaseCurrency: 142.9
        },
        {
          ...activityDummyData,
          date: new Date('2021-11-30'),
-          fee: 1.65,
+          feeInBaseCurrency: 1.65,
          quantity: 1,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -116,12 +116,12 @@ describe('PortfolioCalculator', () => {
            symbol: 'BALN.SW'
          },
          type: 'SELL',
-          unitPrice: 136.6
+          unitPriceInBaseCurrency: 136.6
        },
        {
          ...activityDummyData,
          date: new Date('2021-11-30'),
-          fee: 0,
+          feeInBaseCurrency: 0,
          quantity: 1,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -131,7 +131,7 @@ describe('PortfolioCalculator', () => {
            symbol: 'BALN.SW'
          },
          type: 'SELL',
-          unitPrice: 136.6
+          unitPriceInBaseCurrency: 136.6
        }
      ];

--- 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
@ -91,7 +91,7 @@ describe('PortfolioCalculator', () => {
        {
          ...activityDummyData,
          date: new Date('2021-11-22'),
-          fee: 1.55,
+          feeInBaseCurrency: 1.55,
          quantity: 2,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -101,12 +101,12 @@ describe('PortfolioCalculator', () => {
            symbol: 'BALN.SW'
          },
          type: 'BUY',
-          unitPrice: 142.9
+          unitPriceInBaseCurrency: 142.9
        },
        {
          ...activityDummyData,
          date: new Date('2021-11-30'),
-          fee: 1.65,
+          feeInBaseCurrency: 1.65,
          quantity: 2,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -116,7 +116,7 @@ describe('PortfolioCalculator', () => {
            symbol: 'BALN.SW'
          },
          type: 'SELL',
-          unitPrice: 136.6
+          unitPriceInBaseCurrency: 136.6
        }
      ];

--- 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
@ -91,7 +91,7 @@ describe('PortfolioCalculator', () => {
        {
          ...activityDummyData,
          date: new Date('2021-11-30'),
-          fee: 1.55,
+          feeInBaseCurrency: 1.55,
          quantity: 2,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -101,7 +101,7 @@ describe('PortfolioCalculator', () => {
            symbol: 'BALN.SW'
          },
          type: 'BUY',
-          unitPrice: 136.6
+          unitPriceInBaseCurrency: 136.6
        }
      ];

--- 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
@ -105,7 +105,7 @@ describe('PortfolioCalculator', () => {
        {
          ...activityDummyData,
          date: new Date('2015-01-01'),
-          fee: 0,
+          feeInBaseCurrency: 0,
          quantity: 2,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -115,12 +115,12 @@ describe('PortfolioCalculator', () => {
            symbol: 'BTCUSD'
          },
          type: 'BUY',
-          unitPrice: 320.43
+          unitPriceInBaseCurrency: 320.43
        },
        {
          ...activityDummyData,
          date: new Date('2017-12-31'),
-          fee: 0,
+          feeInBaseCurrency: 0,
          quantity: 1,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -130,7 +130,7 @@ describe('PortfolioCalculator', () => {
            symbol: 'BTCUSD'
          },
          type: 'SELL',
-          unitPrice: 14156.4
+          unitPriceInBaseCurrency: 14156.4
        }
      ];

--- 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
@ -91,7 +91,7 @@ describe('PortfolioCalculator', () => {
        {
          ...activityDummyData,
          date: new Date('2021-09-01'),
-          fee: 49,
+          feeInBaseCurrency: 49,
          quantity: 0,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -101,7 +101,7 @@ describe('PortfolioCalculator', () => {
            symbol: '2c463fb3-af07-486e-adb0-8301b3d72141'
          },
          type: 'FEE',
-          unitPrice: 0
+          unitPriceInBaseCurrency: 0
        }
      ];

--- 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
@ -104,7 +104,7 @@ describe('PortfolioCalculator', () => {
        {
          ...activityDummyData,
          date: new Date('2023-01-03'),
-          fee: 1,
+          feeInBaseCurrency: 1,
          quantity: 1,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -114,7 +114,7 @@ describe('PortfolioCalculator', () => {
            symbol: 'GOOGL'
          },
          type: 'BUY',
-          unitPrice: 89.12
+          unitPriceInBaseCurrency: 89.12
        }
      ];

--- 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
@ -91,7 +91,7 @@ describe('PortfolioCalculator', () => {
        {
          ...activityDummyData,
          date: new Date('2022-01-01'),
-          fee: 0,
+          feeInBaseCurrency: 0,
          quantity: 1,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -101,7 +101,7 @@ describe('PortfolioCalculator', () => {
            symbol: 'dac95060-d4f2-4653-a253-2c45e6fb5cde'
          },
          type: 'ITEM',
-          unitPrice: 500000
+          unitPriceInBaseCurrency: 500000
        }
      ];

--- 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
@ -91,7 +91,7 @@ describe('PortfolioCalculator', () => {
        {
          ...activityDummyData,
          date: new Date('2023-01-01'), // Date in future
-          fee: 0,
+          feeInBaseCurrency: 0,
          quantity: 1,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -101,7 +101,7 @@ describe('PortfolioCalculator', () => {
            symbol: '55196015-1365-4560-aa60-8751ae6d18f8'
          },
          type: 'LIABILITY',
-          unitPrice: 3000
+          unitPriceInBaseCurrency: 3000
        }
      ];

--- 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
@ -104,7 +104,7 @@ describe('PortfolioCalculator', () => {
        {
          ...activityDummyData,
          date: new Date('2021-09-16'),
-          fee: 19,
+          feeInBaseCurrency: 19,
          quantity: 1,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -114,12 +114,12 @@ describe('PortfolioCalculator', () => {
            symbol: 'MSFT'
          },
          type: 'BUY',
-          unitPrice: 298.58
+          unitPriceInBaseCurrency: 298.58
        },
        {
          ...activityDummyData,
          date: new Date('2021-11-16'),
-          fee: 0,
+          feeInBaseCurrency: 0,
          quantity: 1,
          SymbolProfile: {
            ...symbolProfileDummyData,
@ -129,7 +129,7 @@ describe('PortfolioCalculator', () => {
            symbol: 'MSFT'
          },
          type: 'DIVIDEND',
-          unitPrice: 0.62
+          unitPriceInBaseCurrency: 0.62
        }
      ];

--- 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
@ -105,13 +105,15 @@ describe('PortfolioCalculator', () => {
        ...activityDummyData,
        ...activity,
        date: parseDate(activity.date),
+        feeInBaseCurrency: activity.fee,
        SymbolProfile: {
          ...symbolProfileDummyData,
          currency: activity.currency,
          dataSource: activity.dataSource,
          name: 'Novartis AG',
          symbol: activity.symbol
-        }
+        },
+        unitPriceInBaseCurrency: activity.unitPrice
      }));

      const portfolioCalculator = portfolioCalculatorFactory.createCalculator({
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts
@ -105,13 +105,15 @@ describe('PortfolioCalculator', () => {
        ...activityDummyData,
        ...activity,
        date: parseDate(activity.date),
+        feeInBaseCurrency: activity.fee,
        SymbolProfile: {
          ...symbolProfileDummyData,
          currency: activity.currency,
          dataSource: activity.dataSource,
          name: 'Novartis AG',
          symbol: activity.symbol
-        }
+        },
+        unitPriceInBaseCurrency: activity.unitPrice
      }));

      const portfolioCalculator = portfolioCalculatorFactory.createCalculator({