Browse Source

Fix value of accounts filtered by asset class

pull/8113/head
Thomas Kaul 5 days ago
parent
commit
7b3e90d648
  1. 22
      apps/api/src/app/activities/activities.service.ts
  2. 10
      apps/api/src/app/portfolio/portfolio.service.ts

22
apps/api/src/app/activities/activities.service.ts

@ -83,7 +83,6 @@ export class ActivitiesService {
public areCashActivitiesExcludedByFilters(filters: Filter[] = []) {
const {
ASSET_CLASS: filtersByAssetClass = [],
DATA_SOURCE: [filterByDataSource] = [],
SYMBOL: [filterBySymbol] = [],
TAG: filtersByTag = []
@ -92,10 +91,7 @@ export class ActivitiesService {
});
const isFilteredByAssetClassOtherThanLiquidity =
filtersByAssetClass.length > 0 &&
!filtersByAssetClass.some(({ id }) => {
return id === AssetClass.LIQUIDITY;
});
this.isFilteredByAssetClassOtherThanLiquidity(filters);
const isFilteredByAssetProfile = !!(filterByDataSource || filterBySymbol);
const isFilteredByTag = filtersByTag.length > 0;
@ -875,6 +871,22 @@ export class ActivitiesService {
});
}
public isFilteredByAssetClassOtherThanLiquidity(filters: Filter[] = []) {
const { ASSET_CLASS: filtersByAssetClass = [] } = groupBy(
filters,
({ type }) => {
return type;
}
);
return (
filtersByAssetClass.length > 0 &&
!filtersByAssetClass.some(({ id }) => {
return id === AssetClass.LIQUIDITY;
})
);
}
public async order(
orderWhereUniqueInput: Prisma.OrderWhereUniqueInput
): Promise<Order | null> {

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

@ -2434,18 +2434,12 @@ export class PortfolioService {
const accounts: PortfolioDetails['accounts'] = {};
const platforms: PortfolioDetails['platforms'] = {};
const {
ASSET_CLASS: filtersByAssetClass = [],
SYMBOL: [filterBySymbol] = []
} = groupBy(filters, ({ type }) => {
const { SYMBOL: [filterBySymbol] = [] } = groupBy(filters, ({ type }) => {
return type;
});
const isFilteredByAssetClassOtherThanLiquidity =
filtersByAssetClass.length > 0 &&
!filtersByAssetClass.some(({ id }) => {
return id === AssetClass.LIQUIDITY;
});
this.activitiesService.isFilteredByAssetClassOtherThanLiquidity(filters);
let currentAccounts: (AccountWithBalance & {
Order?: Order[];

Loading…
Cancel
Save