Browse Source

Code review fixes

pull/4350/head
csehatt741 2 months ago
committed by Thomas Kaul
parent
commit
5c56658cc0
  1. 3
      apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
  2. 2
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
  3. 6
      apps/api/src/app/portfolio/portfolio.service.ts
  4. 2
      libs/common/src/lib/interfaces/responses/public-portfolio-response.interface.ts

3
apps/api/src/app/portfolio/calculator/portfolio-calculator.ts

@ -175,7 +175,10 @@ export abstract class PortfolioCalculator {
if (!transactionPoints.length) { if (!transactionPoints.length) {
return { return {
<<<<<<< HEAD
activitiesCount: 0, activitiesCount: 0,
=======
>>>>>>> 6e5db62f (Code review fixes)
currentValueInBaseCurrency: new Big(0), currentValueInBaseCurrency: new Big(0),
createdAt: new Date(), createdAt: new Date(),
errors: [], errors: [],

2
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts

@ -94,7 +94,6 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
} }
return { return {
createdAt: new Date(),
currentValueInBaseCurrency, currentValueInBaseCurrency,
hasErrors, hasErrors,
positions, positions,
@ -106,6 +105,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
return ['BUY', 'SELL'].includes(type); return ['BUY', 'SELL'].includes(type);
}).length, }).length,
errors: [], errors: [],
createdAt: new Date(),
historicalData: [], historicalData: [],
totalLiabilitiesWithCurrencyEffect: new Big(0), totalLiabilitiesWithCurrencyEffect: new Big(0),
totalValuablesWithCurrencyEffect: new Big(0) totalValuablesWithCurrencyEffect: new Big(0)

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

@ -1100,7 +1100,7 @@ export class PortfolioService {
firstOrderDate: undefined, firstOrderDate: undefined,
hasErrors: false, hasErrors: false,
performance: { performance: {
createdAt: undefined, createdAt: new Date(),
currentNetWorth: 0, currentNetWorth: 0,
currentValueInBaseCurrency: 0, currentValueInBaseCurrency: 0,
netPerformance: 0, netPerformance: 0,
@ -1155,10 +1155,10 @@ export class PortfolioService {
hasErrors, hasErrors,
firstOrderDate: parseDate(historicalData[0]?.date), firstOrderDate: parseDate(historicalData[0]?.date),
performance: { performance: {
createdAt,
netPerformance, netPerformance,
netPerformanceWithCurrencyEffect, netPerformanceWithCurrencyEffect,
totalInvestment, totalInvestment,
createdAt: createdAt,
currentNetWorth: netWorth, currentNetWorth: netWorth,
currentValueInBaseCurrency: valueWithCurrencyEffect, currentValueInBaseCurrency: valueWithCurrencyEffect,
netPerformancePercentage: netPerformanceInPercentage, netPerformancePercentage: netPerformanceInPercentage,
@ -1916,6 +1916,7 @@ export class PortfolioService {
})?.toNumber(); })?.toNumber();
return { return {
createdAt,
annualizedPerformancePercent, annualizedPerformancePercent,
annualizedPerformancePercentWithCurrencyEffect, annualizedPerformancePercentWithCurrencyEffect,
cash, cash,
@ -1929,7 +1930,6 @@ export class PortfolioService {
totalSell, totalSell,
committedFunds: committedFunds.toNumber(), committedFunds: committedFunds.toNumber(),
currentValueInBaseCurrency: currentValueInBaseCurrency.toNumber(), currentValueInBaseCurrency: currentValueInBaseCurrency.toNumber(),
createdAt: createdAt,
dividendInBaseCurrency: dividendInBaseCurrency.toNumber(), dividendInBaseCurrency: dividendInBaseCurrency.toNumber(),
emergencyFund: { emergencyFund: {
assets: emergencyFundPositionsValueInBaseCurrency, assets: emergencyFundPositionsValueInBaseCurrency,

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

@ -3,7 +3,6 @@ import { Market } from '../../types';
export interface PublicPortfolioResponse extends PublicPortfolioResponseV1 { export interface PublicPortfolioResponse extends PublicPortfolioResponseV1 {
alias?: string; alias?: string;
createdAt: Date;
hasDetails: boolean; hasDetails: boolean;
holdings: { holdings: {
[symbol: string]: Pick< [symbol: string]: Pick<
@ -33,6 +32,7 @@ export interface PublicPortfolioResponse extends PublicPortfolioResponseV1 {
} }
interface PublicPortfolioResponseV1 { interface PublicPortfolioResponseV1 {
createdAt: Date;
performance: { performance: {
'1d': { '1d': {
relativeChange: number; relativeChange: number;

Loading…
Cancel
Save