Browse Source

Clean up

pull/3272/head
Thomas Kaul 1 year ago
parent
commit
50b56f5234
  1. 4
      apps/api/src/app/portfolio/portfolio.controller.ts
  2. 2
      apps/api/src/app/portfolio/portfolio.service.ts
  3. 2
      apps/client/src/app/components/home-summary/home-summary.component.ts
  4. 6
      apps/client/src/app/services/data.service.ts

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

@ -78,10 +78,8 @@ export class PortfolioController {
@Query('assetClasses') filterByAssetClasses?: string, @Query('assetClasses') filterByAssetClasses?: string,
@Query('range') dateRange: DateRange = 'max', @Query('range') dateRange: DateRange = 'max',
@Query('tags') filterByTags?: string, @Query('tags') filterByTags?: string,
@Query('withLiabilities') withLiabilitiesParam = 'false',
@Query('withMarkets') withMarketsParam = 'false' @Query('withMarkets') withMarketsParam = 'false'
): Promise<PortfolioDetails & { hasError: boolean }> { ): Promise<PortfolioDetails & { hasError: boolean }> {
const withLiabilities = withLiabilitiesParam === 'true';
const withMarkets = withMarketsParam === 'true'; const withMarkets = withMarketsParam === 'true';
let hasDetails = true; let hasDetails = true;
@ -107,8 +105,6 @@ export class PortfolioController {
dateRange, dateRange,
filters, filters,
impersonationId, impersonationId,
// TODO
// withLiabilities,
withMarkets, withMarkets,
userId: this.request.user.id, userId: this.request.user.id,
withSummary: true withSummary: true

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

@ -323,7 +323,6 @@ export class PortfolioService {
impersonationId, impersonationId,
userId, userId,
withExcludedAccounts = false, withExcludedAccounts = false,
withLiabilities = false,
withMarkets = false, withMarkets = false,
withSummary = false withSummary = false
}: { }: {
@ -332,7 +331,6 @@ export class PortfolioService {
impersonationId: string; impersonationId: string;
userId: string; userId: string;
withExcludedAccounts?: boolean; withExcludedAccounts?: boolean;
withLiabilities?: boolean;
withMarkets?: boolean; withMarkets?: boolean;
withSummary?: boolean; withSummary?: boolean;
}): Promise<PortfolioDetails & { hasErrors: boolean }> { }): Promise<PortfolioDetails & { hasErrors: boolean }> {

2
apps/client/src/app/components/home-summary/home-summary.component.ts

@ -102,7 +102,7 @@ export class HomeSummaryComponent implements OnDestroy, OnInit {
this.isLoading = true; this.isLoading = true;
this.dataService this.dataService
.fetchPortfolioDetails({ withLiabilities: true }) .fetchPortfolioDetails()
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntil(this.unsubscribeSubject))
.subscribe(({ summary }) => { .subscribe(({ summary }) => {
this.summary = summary; this.summary = summary;

6
apps/client/src/app/services/data.service.ts

@ -411,19 +411,13 @@ export class DataService {
public fetchPortfolioDetails({ public fetchPortfolioDetails({
filters, filters,
withLiabilities = false,
withMarkets = false withMarkets = false
}: { }: {
filters?: Filter[]; filters?: Filter[];
withLiabilities?: boolean;
withMarkets?: boolean; withMarkets?: boolean;
} = {}): Observable<PortfolioDetails> { } = {}): Observable<PortfolioDetails> {
let params = this.buildFiltersAsQueryParams({ filters }); let params = this.buildFiltersAsQueryParams({ filters });
if (withLiabilities) {
params = params.append('withLiabilities', withLiabilities);
}
if (withMarkets) { if (withMarkets) {
params = params.append('withMarkets', withMarkets); params = params.append('withMarkets', withMarkets);
} }

Loading…
Cancel
Save