Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/exclude fees from holdings (#3160)

Thomas Kaul7e28e4299542
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index c5f8feb4ad..5b36f91fa1 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -356,16 +356,22 @@ export class PortfolioService {
(user.Settings?.settings as UserSettings)?.emergencyFund ?? 0
);
+ let types = getAllActivityTypes().filter((activityType) => {
+ return activityType !== 'FEE';
+ });
+
+ if (withLiabilities === false) {
+ types = types.filter((activityType) => {
+ return activityType !== 'LIABILITY';
+ });
+ }
+
const { activities, portfolioOrders, transactionPoints } =
await this.getTransactionPoints({
filters,
+ types,
userId,
- withExcludedAccounts,
- types: withLiabilities
- ? undefined
- : getAllActivityTypes().filter((activityType) => {
- return activityType !== 'LIABILITY';
- })
+ withExcludedAccounts
});
const portfolioCalculator = new PortfolioCalculator({
diff --git a/libs/common/src/lib/helper.ts b/libs/common/src/lib/helper.ts
index c52ec9ca5c..e701373366 100644
--- a/libs/common/src/lib/helper.ts
+++ b/libs/common/src/lib/helper.ts
@@ -139,7 +139,7 @@ export function extractNumberFromString({
}
export function getAllActivityTypes(): ActivityType[] {
- return ['BUY', 'DIVIDEND', 'FEE', 'ITEM', 'LIABILITY', 'SELL'];
+ return Object.values(ActivityType);
}
export function getAssetProfileIdentifier({ dataSource, symbol }: UniqueAsset) {