|
@ -7,13 +7,14 @@ import { |
|
|
nullifyValuesInObject |
|
|
nullifyValuesInObject |
|
|
} from '@ghostfolio/api/helper/object.helper'; |
|
|
} from '@ghostfolio/api/helper/object.helper'; |
|
|
import { getInterval } from '@ghostfolio/api/helper/portfolio.helper'; |
|
|
import { getInterval } from '@ghostfolio/api/helper/portfolio.helper'; |
|
|
import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor'; |
|
|
import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.interceptor'; |
|
|
import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor'; |
|
|
import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor'; |
|
|
import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor'; |
|
|
import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor'; |
|
|
import { ApiService } from '@ghostfolio/api/services/api/api.service'; |
|
|
import { ApiService } from '@ghostfolio/api/services/api/api.service'; |
|
|
import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; |
|
|
import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; |
|
|
import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service'; |
|
|
import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service'; |
|
|
import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service'; |
|
|
import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service'; |
|
|
|
|
|
import { UserHelperService } from '@ghostfolio/api/services/user-helper/user-helper.service'; |
|
|
import { |
|
|
import { |
|
|
DEFAULT_CURRENCY, |
|
|
DEFAULT_CURRENCY, |
|
|
HEADER_KEY_IMPERSONATION |
|
|
HEADER_KEY_IMPERSONATION |
|
@ -65,6 +66,7 @@ export class PortfolioController { |
|
|
private readonly orderService: OrderService, |
|
|
private readonly orderService: OrderService, |
|
|
private readonly portfolioService: PortfolioService, |
|
|
private readonly portfolioService: PortfolioService, |
|
|
@Inject(REQUEST) private readonly request: RequestWithUser, |
|
|
@Inject(REQUEST) private readonly request: RequestWithUser, |
|
|
|
|
|
private readonly userHelperService: UserHelperService, |
|
|
private readonly userService: UserService |
|
|
private readonly userService: UserService |
|
|
) {} |
|
|
) {} |
|
|
|
|
|
|
|
@ -85,7 +87,7 @@ export class PortfolioController { |
|
|
let hasDetails = true; |
|
|
let hasDetails = true; |
|
|
let hasError = false; |
|
|
let hasError = false; |
|
|
const hasReadRestrictedAccessPermission = |
|
|
const hasReadRestrictedAccessPermission = |
|
|
this.userService.hasReadRestrictedAccessPermission({ |
|
|
this.userHelperService.hasReadRestrictedAccessPermission({ |
|
|
impersonationId, |
|
|
impersonationId, |
|
|
user: this.request.user |
|
|
user: this.request.user |
|
|
}); |
|
|
}); |
|
@ -118,7 +120,7 @@ export class PortfolioController { |
|
|
|
|
|
|
|
|
if ( |
|
|
if ( |
|
|
hasReadRestrictedAccessPermission || |
|
|
hasReadRestrictedAccessPermission || |
|
|
this.userService.isRestrictedView(this.request.user) |
|
|
this.userHelperService.isRestrictedView(this.request.user) |
|
|
) { |
|
|
) { |
|
|
const totalInvestment = Object.values(holdings) |
|
|
const totalInvestment = Object.values(holdings) |
|
|
.map(({ investment }) => { |
|
|
.map(({ investment }) => { |
|
@ -159,7 +161,7 @@ export class PortfolioController { |
|
|
if ( |
|
|
if ( |
|
|
hasDetails === false || |
|
|
hasDetails === false || |
|
|
hasReadRestrictedAccessPermission || |
|
|
hasReadRestrictedAccessPermission || |
|
|
this.userService.isRestrictedView(this.request.user) |
|
|
this.userHelperService.isRestrictedView(this.request.user) |
|
|
) { |
|
|
) { |
|
|
portfolioSummary = nullifyValuesInObject(summary, [ |
|
|
portfolioSummary = nullifyValuesInObject(summary, [ |
|
|
'cash', |
|
|
'cash', |
|
@ -227,7 +229,7 @@ export class PortfolioController { |
|
|
@Query('tags') filterByTags?: string |
|
|
@Query('tags') filterByTags?: string |
|
|
): Promise<PortfolioDividends> { |
|
|
): Promise<PortfolioDividends> { |
|
|
const hasReadRestrictedAccessPermission = |
|
|
const hasReadRestrictedAccessPermission = |
|
|
this.userService.hasReadRestrictedAccessPermission({ |
|
|
this.userHelperService.hasReadRestrictedAccessPermission({ |
|
|
impersonationId, |
|
|
impersonationId, |
|
|
user: this.request.user |
|
|
user: this.request.user |
|
|
}); |
|
|
}); |
|
@ -260,7 +262,7 @@ export class PortfolioController { |
|
|
|
|
|
|
|
|
if ( |
|
|
if ( |
|
|
hasReadRestrictedAccessPermission || |
|
|
hasReadRestrictedAccessPermission || |
|
|
this.userService.isRestrictedView(this.request.user) |
|
|
this.userHelperService.isRestrictedView(this.request.user) |
|
|
) { |
|
|
) { |
|
|
const maxDividend = dividends.reduce( |
|
|
const maxDividend = dividends.reduce( |
|
|
(investment, item) => Math.max(investment, item.investment), |
|
|
(investment, item) => Math.max(investment, item.investment), |
|
@ -327,7 +329,7 @@ export class PortfolioController { |
|
|
@Query('tags') filterByTags?: string |
|
|
@Query('tags') filterByTags?: string |
|
|
): Promise<PortfolioInvestments> { |
|
|
): Promise<PortfolioInvestments> { |
|
|
const hasReadRestrictedAccessPermission = |
|
|
const hasReadRestrictedAccessPermission = |
|
|
this.userService.hasReadRestrictedAccessPermission({ |
|
|
this.userHelperService.hasReadRestrictedAccessPermission({ |
|
|
impersonationId, |
|
|
impersonationId, |
|
|
user: this.request.user |
|
|
user: this.request.user |
|
|
}); |
|
|
}); |
|
@ -348,7 +350,7 @@ export class PortfolioController { |
|
|
|
|
|
|
|
|
if ( |
|
|
if ( |
|
|
hasReadRestrictedAccessPermission || |
|
|
hasReadRestrictedAccessPermission || |
|
|
this.userService.isRestrictedView(this.request.user) |
|
|
this.userHelperService.isRestrictedView(this.request.user) |
|
|
) { |
|
|
) { |
|
|
const maxInvestment = investments.reduce( |
|
|
const maxInvestment = investments.reduce( |
|
|
(investment, item) => Math.max(investment, item.investment), |
|
|
(investment, item) => Math.max(investment, item.investment), |
|
@ -398,7 +400,7 @@ export class PortfolioController { |
|
|
const withExcludedAccounts = withExcludedAccountsParam === 'true'; |
|
|
const withExcludedAccounts = withExcludedAccountsParam === 'true'; |
|
|
|
|
|
|
|
|
const hasReadRestrictedAccessPermission = |
|
|
const hasReadRestrictedAccessPermission = |
|
|
this.userService.hasReadRestrictedAccessPermission({ |
|
|
this.userHelperService.hasReadRestrictedAccessPermission({ |
|
|
impersonationId, |
|
|
impersonationId, |
|
|
user: this.request.user |
|
|
user: this.request.user |
|
|
}); |
|
|
}); |
|
@ -420,7 +422,7 @@ export class PortfolioController { |
|
|
if ( |
|
|
if ( |
|
|
hasReadRestrictedAccessPermission || |
|
|
hasReadRestrictedAccessPermission || |
|
|
this.request.user.Settings.settings.viewMode === 'ZEN' || |
|
|
this.request.user.Settings.settings.viewMode === 'ZEN' || |
|
|
this.userService.isRestrictedView(this.request.user) |
|
|
this.userHelperService.isRestrictedView(this.request.user) |
|
|
) { |
|
|
) { |
|
|
performanceInformation.chart = performanceInformation.chart.map( |
|
|
performanceInformation.chart = performanceInformation.chart.map( |
|
|
({ |
|
|
({ |
|
|