Browse Source

Refactoring

pull/4350/head
Thomas Kaul 2 months ago
parent
commit
05cc1c767b
  1. 4
      apps/api/src/app/endpoints/public/public.controller.ts
  2. 2
      apps/api/src/app/portfolio/portfolio.controller.ts
  3. 10
      apps/api/src/app/portfolio/portfolio.service.ts
  4. 1
      apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts
  5. 1
      libs/common/src/lib/interfaces/portfolio-details.interface.ts
  6. 1
      libs/common/src/lib/interfaces/portfolio-performance.interface.ts

4
apps/api/src/app/endpoints/public/public.controller.ts

@ -57,7 +57,7 @@ export class PublicController {
} }
const [ const [
{ holdings, markets }, { createdAt, holdings, markets },
{ performance: performance1d }, { performance: performance1d },
{ performance: performanceMax }, { performance: performanceMax },
{ performance: performanceYtd } { performance: performanceYtd }
@ -81,10 +81,10 @@ export class PublicController {
}); });
const publicPortfolioResponse: PublicPortfolioResponse = { const publicPortfolioResponse: PublicPortfolioResponse = {
createdAt,
hasDetails, hasDetails,
markets, markets,
alias: access.alias, alias: access.alias,
createdAt: performance1d.createdAt,
holdings: {}, holdings: {},
performance: { performance: {
'1d': { '1d': {

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

@ -105,6 +105,7 @@ export class PortfolioController {
const { const {
accounts, accounts,
createdAt,
hasErrors, hasErrors,
holdings, holdings,
markets, markets,
@ -233,6 +234,7 @@ export class PortfolioController {
return { return {
accounts, accounts,
createdAt,
hasError, hasError,
holdings, holdings,
platforms, platforms,

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

@ -376,7 +376,7 @@ export class PortfolioService {
currency: userCurrency currency: userCurrency
}); });
const { currentValueInBaseCurrency, hasErrors, positions } = const { createdAt, currentValueInBaseCurrency, hasErrors, positions } =
await portfolioCalculator.getSnapshot(); await portfolioCalculator.getSnapshot();
const cashDetails = await this.accountService.getCashDetails({ const cashDetails = await this.accountService.getCashDetails({
@ -617,6 +617,7 @@ export class PortfolioService {
return { return {
accounts, accounts,
createdAt,
hasErrors, hasErrors,
holdings, holdings,
markets, markets,
@ -1100,7 +1101,6 @@ export class PortfolioService {
firstOrderDate: undefined, firstOrderDate: undefined,
hasErrors: false, hasErrors: false,
performance: { performance: {
createdAt: new Date(),
currentNetWorth: 0, currentNetWorth: 0,
currentValueInBaseCurrency: 0, currentValueInBaseCurrency: 0,
netPerformance: 0, netPerformance: 0,
@ -1121,7 +1121,7 @@ export class PortfolioService {
currency: userCurrency currency: userCurrency
}); });
const { createdAt, errors, hasErrors, historicalData } = const { errors, hasErrors, historicalData } =
await portfolioCalculator.getSnapshot(); await portfolioCalculator.getSnapshot();
const { endDate, startDate } = getIntervalFromDateRange(dateRange); const { endDate, startDate } = getIntervalFromDateRange(dateRange);
@ -1155,7 +1155,6 @@ export class PortfolioService {
hasErrors, hasErrors,
firstOrderDate: parseDate(historicalData[0]?.date), firstOrderDate: parseDate(historicalData[0]?.date),
performance: { performance: {
createdAt,
netPerformance, netPerformance,
netPerformanceWithCurrencyEffect, netPerformanceWithCurrencyEffect,
totalInvestment, totalInvestment,
@ -1811,7 +1810,7 @@ export class PortfolioService {
} }
} }
const { createdAt, currentValueInBaseCurrency, totalInvestment } = const { currentValueInBaseCurrency, totalInvestment } =
await portfolioCalculator.getSnapshot(); await portfolioCalculator.getSnapshot();
const { performance } = await this.getPerformance({ const { performance } = await this.getPerformance({
@ -1916,7 +1915,6 @@ export class PortfolioService {
})?.toNumber(); })?.toNumber();
return { return {
createdAt,
annualizedPerformancePercent, annualizedPerformancePercent,
annualizedPerformancePercentWithCurrencyEffect, annualizedPerformancePercentWithCurrencyEffect,
cash, cash,

1
apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts

@ -260,6 +260,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
this.platforms = {}; this.platforms = {};
this.portfolioDetails = { this.portfolioDetails = {
accounts: {}, accounts: {},
createdAt: undefined,
holdings: {}, holdings: {},
platforms: {}, platforms: {},
summary: undefined summary: undefined

1
libs/common/src/lib/interfaces/portfolio-details.interface.ts

@ -14,6 +14,7 @@ export interface PortfolioDetails {
valueInPercentage?: number; valueInPercentage?: number;
}; };
}; };
createdAt: Date;
holdings: { [symbol: string]: PortfolioPosition }; holdings: { [symbol: string]: PortfolioPosition };
markets?: { markets?: {
[key in Market]: { [key in Market]: {

1
libs/common/src/lib/interfaces/portfolio-performance.interface.ts

@ -1,6 +1,5 @@
export interface PortfolioPerformance { export interface PortfolioPerformance {
annualizedPerformancePercent?: number; annualizedPerformancePercent?: number;
createdAt: Date;
currentNetWorth?: number; currentNetWorth?: number;
currentValueInBaseCurrency: number; currentValueInBaseCurrency: number;
netPerformance: number; netPerformance: number;

Loading…
Cancel
Save