sudacode/ghostfolio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Feature/exclude fees from holdings (#3160)

Browse Source
This commit is contained in:
Thomas Kaul 2024-03-16 18:59:23 +01:00 committed by GitHub
parent e21563d903
commit 7e28e42995
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/api/src/app/portfolio/portfolio.service.ts
View File

@ -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({

2
libs/common/src/lib/helper.ts
View File

@ -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) {