Browse Source

fix(lib): revert interface changes

pull/7050/head
KenTandrian 3 months ago
parent
commit
8225a4532e
  1. 2
      apps/api/src/app/portfolio/portfolio.service.ts
  2. 2
      libs/common/src/lib/interfaces/responses/portfolio-holding-response.interface.ts
  3. 16
      libs/ui/src/lib/services/data.service.ts

2
apps/api/src/app/portfolio/portfolio.service.ts

@ -951,6 +951,7 @@ export class PortfolioService {
return { return {
activitiesCount, activitiesCount,
dateOfFirstActivity,
marketPrice, marketPrice,
marketPriceMax, marketPriceMax,
marketPriceMin, marketPriceMin,
@ -958,7 +959,6 @@ export class PortfolioService {
tags, tags,
averagePrice: averagePrice.toNumber(), averagePrice: averagePrice.toNumber(),
dataProviderInfo: portfolioCalculator.getDataProviderInfos()?.[0], dataProviderInfo: portfolioCalculator.getDataProviderInfos()?.[0],
dateOfFirstActivity: parseISO(dateOfFirstActivity),
dividendInBaseCurrency: dividendInBaseCurrency.toNumber(), dividendInBaseCurrency: dividendInBaseCurrency.toNumber(),
dividendYieldPercent: dividendYieldPercent.toNumber(), dividendYieldPercent: dividendYieldPercent.toNumber(),
dividendYieldPercentWithCurrencyEffect: dividendYieldPercentWithCurrencyEffect:

2
libs/common/src/lib/interfaces/responses/portfolio-holding-response.interface.ts

@ -11,7 +11,7 @@ export interface PortfolioHoldingResponse {
activitiesCount: number; activitiesCount: number;
averagePrice: number; averagePrice: number;
dataProviderInfo: DataProviderInfo; dataProviderInfo: DataProviderInfo;
dateOfFirstActivity: Date; dateOfFirstActivity: string;
dividendInBaseCurrency: number; dividendInBaseCurrency: number;
dividendYieldPercent: number; dividendYieldPercent: number;
dividendYieldPercentWithCurrencyEffect: number; dividendYieldPercentWithCurrencyEffect: number;

16
libs/ui/src/lib/services/data.service.ts

@ -445,19 +445,21 @@ export class DataService {
}: { }: {
dataSource: DataSource; dataSource: DataSource;
symbol: string; symbol: string;
}) { }): Observable<
Omit<PortfolioHoldingResponse, 'dateOfFirstActivity'> & {
dateOfFirstActivity: Date;
}
> {
return this.http return this.http
.get<PortfolioHoldingResponse>( .get<PortfolioHoldingResponse>(
`/api/v1/portfolio/holding/${dataSource}/${symbol}` `/api/v1/portfolio/holding/${dataSource}/${symbol}`
) )
.pipe( .pipe(
map((response) => { map((response) => {
if (response.dateOfFirstActivity) { return {
response.dateOfFirstActivity = parseISO( ...response,
response.dateOfFirstActivity as unknown as string dateOfFirstActivity: parseISO(response.dateOfFirstActivity)
); };
}
return response;
}) })
); );
} }

Loading…
Cancel
Save