diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index d04181398..24d760888 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -951,6 +951,7 @@ export class PortfolioService { return { activitiesCount, + dateOfFirstActivity, marketPrice, marketPriceMax, marketPriceMin, @@ -958,7 +959,6 @@ export class PortfolioService { tags, averagePrice: averagePrice.toNumber(), dataProviderInfo: portfolioCalculator.getDataProviderInfos()?.[0], - dateOfFirstActivity: parseISO(dateOfFirstActivity), dividendInBaseCurrency: dividendInBaseCurrency.toNumber(), dividendYieldPercent: dividendYieldPercent.toNumber(), dividendYieldPercentWithCurrencyEffect: diff --git a/libs/common/src/lib/interfaces/responses/portfolio-holding-response.interface.ts b/libs/common/src/lib/interfaces/responses/portfolio-holding-response.interface.ts index e50037d3e..76bc7dc02 100644 --- a/libs/common/src/lib/interfaces/responses/portfolio-holding-response.interface.ts +++ b/libs/common/src/lib/interfaces/responses/portfolio-holding-response.interface.ts @@ -11,7 +11,7 @@ export interface PortfolioHoldingResponse { activitiesCount: number; averagePrice: number; dataProviderInfo: DataProviderInfo; - dateOfFirstActivity: Date; + dateOfFirstActivity: string; dividendInBaseCurrency: number; dividendYieldPercent: number; dividendYieldPercentWithCurrencyEffect: number; diff --git a/libs/ui/src/lib/services/data.service.ts b/libs/ui/src/lib/services/data.service.ts index 9257c88eb..4f3546579 100644 --- a/libs/ui/src/lib/services/data.service.ts +++ b/libs/ui/src/lib/services/data.service.ts @@ -445,19 +445,21 @@ export class DataService { }: { dataSource: DataSource; symbol: string; - }) { + }): Observable< + Omit & { + dateOfFirstActivity: Date; + } + > { return this.http .get( `/api/v1/portfolio/holding/${dataSource}/${symbol}` ) .pipe( map((response) => { - if (response.dateOfFirstActivity) { - response.dateOfFirstActivity = parseISO( - response.dateOfFirstActivity as unknown as string - ); - } - return response; + return { + ...response, + dateOfFirstActivity: parseISO(response.dateOfFirstActivity) + }; }) ); }