From 05cc1c767b957088b191786b6d0b3ce313870e4a Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Fri, 28 Feb 2025 20:43:51 +0100 Subject: [PATCH] Refactoring --- apps/api/src/app/endpoints/public/public.controller.ts | 4 ++-- apps/api/src/app/portfolio/portfolio.controller.ts | 2 ++ apps/api/src/app/portfolio/portfolio.service.ts | 10 ++++------ .../allocations/allocations-page.component.ts | 1 + .../src/lib/interfaces/portfolio-details.interface.ts | 1 + .../lib/interfaces/portfolio-performance.interface.ts | 1 - 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/api/src/app/endpoints/public/public.controller.ts b/apps/api/src/app/endpoints/public/public.controller.ts index a434f5027..bdcd86afb 100644 --- a/apps/api/src/app/endpoints/public/public.controller.ts +++ b/apps/api/src/app/endpoints/public/public.controller.ts @@ -57,7 +57,7 @@ export class PublicController { } const [ - { holdings, markets }, + { createdAt, holdings, markets }, { performance: performance1d }, { performance: performanceMax }, { performance: performanceYtd } @@ -81,10 +81,10 @@ export class PublicController { }); const publicPortfolioResponse: PublicPortfolioResponse = { + createdAt, hasDetails, markets, alias: access.alias, - createdAt: performance1d.createdAt, holdings: {}, performance: { '1d': { diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts index 797d0449a..c3e46d50d 100644 --- a/apps/api/src/app/portfolio/portfolio.controller.ts +++ b/apps/api/src/app/portfolio/portfolio.controller.ts @@ -105,6 +105,7 @@ export class PortfolioController { const { accounts, + createdAt, hasErrors, holdings, markets, @@ -233,6 +234,7 @@ export class PortfolioController { return { accounts, + createdAt, hasError, holdings, platforms, diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index 2a24c7f8e..d4dc42d91 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -376,7 +376,7 @@ export class PortfolioService { currency: userCurrency }); - const { currentValueInBaseCurrency, hasErrors, positions } = + const { createdAt, currentValueInBaseCurrency, hasErrors, positions } = await portfolioCalculator.getSnapshot(); const cashDetails = await this.accountService.getCashDetails({ @@ -617,6 +617,7 @@ export class PortfolioService { return { accounts, + createdAt, hasErrors, holdings, markets, @@ -1100,7 +1101,6 @@ export class PortfolioService { firstOrderDate: undefined, hasErrors: false, performance: { - createdAt: new Date(), currentNetWorth: 0, currentValueInBaseCurrency: 0, netPerformance: 0, @@ -1121,7 +1121,7 @@ export class PortfolioService { currency: userCurrency }); - const { createdAt, errors, hasErrors, historicalData } = + const { errors, hasErrors, historicalData } = await portfolioCalculator.getSnapshot(); const { endDate, startDate } = getIntervalFromDateRange(dateRange); @@ -1155,7 +1155,6 @@ export class PortfolioService { hasErrors, firstOrderDate: parseDate(historicalData[0]?.date), performance: { - createdAt, netPerformance, netPerformanceWithCurrencyEffect, totalInvestment, @@ -1811,7 +1810,7 @@ export class PortfolioService { } } - const { createdAt, currentValueInBaseCurrency, totalInvestment } = + const { currentValueInBaseCurrency, totalInvestment } = await portfolioCalculator.getSnapshot(); const { performance } = await this.getPerformance({ @@ -1916,7 +1915,6 @@ export class PortfolioService { })?.toNumber(); return { - createdAt, annualizedPerformancePercent, annualizedPerformancePercentWithCurrencyEffect, cash, diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts index 41961edd3..54ea88548 100644 --- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts +++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts @@ -260,6 +260,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit { this.platforms = {}; this.portfolioDetails = { accounts: {}, + createdAt: undefined, holdings: {}, platforms: {}, summary: undefined diff --git a/libs/common/src/lib/interfaces/portfolio-details.interface.ts b/libs/common/src/lib/interfaces/portfolio-details.interface.ts index e455f73ca..746736f6b 100644 --- a/libs/common/src/lib/interfaces/portfolio-details.interface.ts +++ b/libs/common/src/lib/interfaces/portfolio-details.interface.ts @@ -14,6 +14,7 @@ export interface PortfolioDetails { valueInPercentage?: number; }; }; + createdAt: Date; holdings: { [symbol: string]: PortfolioPosition }; markets?: { [key in Market]: { diff --git a/libs/common/src/lib/interfaces/portfolio-performance.interface.ts b/libs/common/src/lib/interfaces/portfolio-performance.interface.ts index 1cd71264a..c0c3802d8 100644 --- a/libs/common/src/lib/interfaces/portfolio-performance.interface.ts +++ b/libs/common/src/lib/interfaces/portfolio-performance.interface.ts @@ -1,6 +1,5 @@ export interface PortfolioPerformance { annualizedPerformancePercent?: number; - createdAt: Date; currentNetWorth?: number; currentValueInBaseCurrency: number; netPerformance: number;