diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts index 21fa0d076..4a159d247 100644 --- a/apps/api/src/app/order/order.service.ts +++ b/apps/api/src/app/order/order.service.ts @@ -9,7 +9,8 @@ import { DATA_GATHERING_QUEUE_PRIORITY_HIGH, GATHER_ASSET_PROFILE_PROCESS_JOB_NAME, GATHER_ASSET_PROFILE_PROCESS_JOB_OPTIONS, - ghostfolioPrefix + ghostfolioPrefix, + TAG_ID_EXCLUDE_FROM_ANALYSIS } from '@ghostfolio/common/config'; import { getAssetProfileIdentifier } from '@ghostfolio/common/helper'; import { @@ -33,7 +34,7 @@ import { import { Big } from 'big.js'; import { isUUID } from 'class-validator'; import { endOfToday, isAfter } from 'date-fns'; -import { groupBy, uniqBy } from 'lodash'; +import { groupBy, isArray, uniqBy } from 'lodash'; import { v4 as uuidv4 } from 'uuid'; import { Activities } from './interfaces/activities.interface'; @@ -483,6 +484,24 @@ export class OrderService { }; } + if (withExcludedAccounts === false) { + const excludeFromAnalysisTagCondition = { + tags: { + none: { + id: TAG_ID_EXCLUDE_FROM_ANALYSIS + } + } + }; + + if (isArray(where.AND)) { + where.AND.push(excludeFromAnalysisTagCondition); + } else if (where.AND) { + where.AND = [where.AND, excludeFromAnalysisTagCondition]; + } else { + where.AND = [excludeFromAnalysisTagCondition]; + } + } + if (sortColumn) { orderBy = [{ [sortColumn]: sortDirection }, { id: sortDirection }]; } diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index 02804a847..fbf93b543 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -33,6 +33,7 @@ import { import { DEFAULT_CURRENCY, TAG_ID_EMERGENCY_FUND, + TAG_ID_EXCLUDE_FROM_ANALYSIS, UNKNOWN_KEY } from '@ghostfolio/common/config'; import { DATE_FORMAT, getSum, parseDate } from '@ghostfolio/common/helper'; @@ -1806,7 +1807,12 @@ export class PortfolioService { const nonExcludedActivities: Activity[] = []; for (const activity of activities) { - if (activity.account?.isExcluded) { + if ( + activity.account?.isExcluded || + activity.tags?.some(({ id }) => { + return id === TAG_ID_EXCLUDE_FROM_ANALYSIS; + }) + ) { excludedActivities.push(activity); } else { nonExcludedActivities.push(activity); diff --git a/apps/api/src/services/tag/tag.service.ts b/apps/api/src/services/tag/tag.service.ts index eb2d7bfef..4dd2b83a7 100644 --- a/apps/api/src/services/tag/tag.service.ts +++ b/apps/api/src/services/tag/tag.service.ts @@ -1,4 +1,5 @@ import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service'; +import { TAG_ID_EXCLUDE_FROM_ANALYSIS } from '@ghostfolio/common/config'; import { Injectable } from '@nestjs/common'; import { Prisma, Tag } from '@prisma/client'; @@ -79,7 +80,7 @@ export class TagService { id, name, userId, - isUsed: _count.activities > 0 + isUsed: _count.activities > 0 && id !== TAG_ID_EXCLUDE_FROM_ANALYSIS })); } diff --git a/libs/common/src/lib/config.ts b/libs/common/src/lib/config.ts index 467716575..02a12cfd1 100644 --- a/libs/common/src/lib/config.ts +++ b/libs/common/src/lib/config.ts @@ -200,6 +200,8 @@ export const SUPPORTED_LANGUAGE_CODES = [ ]; export const TAG_ID_EMERGENCY_FUND = '4452656d-9fa4-4bd0-ba38-70492e31d180'; +export const TAG_ID_EXCLUDE_FROM_ANALYSIS = + 'f2e868af-8333-459f-b161-cbc6544c24bd'; export const TAG_ID_DEMO = 'efa08cb3-9b9d-4974-ac68-db13a19c4874'; export const UNKNOWN_KEY = 'UNKNOWN'; diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html index 59ec6315f..4ee7c689a 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.html +++ b/libs/ui/src/lib/activities-table/activities-table.component.html @@ -468,7 +468,7 @@ [ngClass]="{ 'cursor-pointer': hasPermissionToOpenDetails && - row.account?.isExcluded !== true && + isExcludedFromAnalysis(row) === false && row.isDraft === false && ['BUY', 'DIVIDEND', 'SELL'].includes(row.type) }" diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts index df1211787..c13251771 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -2,7 +2,10 @@ import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interf import { ConfirmationDialogType } from '@ghostfolio/client/core/notification/confirmation-dialog/confirmation-dialog.type'; import { NotificationService } from '@ghostfolio/client/core/notification/notification.service'; import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module'; -import { DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config'; +import { + DEFAULT_PAGE_SIZE, + TAG_ID_EXCLUDE_FROM_ANALYSIS +} from '@ghostfolio/common/config'; import { getDateFormatString, getLocale } from '@ghostfolio/common/helper'; import { AssetProfileIdentifier } from '@ghostfolio/common/interfaces'; import { OrderWithAccount } from '@ghostfolio/common/types'; @@ -171,12 +174,6 @@ export class GfActivitiesTableComponent }); } - public areAllRowsSelected() { - const numSelectedRows = this.selectedRows.selected.length; - const numTotalRows = this.dataSource.data.length; - return numSelectedRows === numTotalRows; - } - public ngOnChanges() { this.defaultDateFormat = getDateFormatString(this.locale); @@ -215,6 +212,21 @@ export class GfActivitiesTableComponent } } + public areAllRowsSelected() { + const numSelectedRows = this.selectedRows.selected.length; + const numTotalRows = this.dataSource.data.length; + return numSelectedRows === numTotalRows; + } + + public isExcludedFromAnalysis(activity: Activity) { + return ( + activity.account?.isExcluded || + activity.tags?.some(({ id }) => { + return id === TAG_ID_EXCLUDE_FROM_ANALYSIS; + }) + ); + } + public onChangePage(page: PageEvent) { this.pageChanged.emit(page); } @@ -226,7 +238,7 @@ export class GfActivitiesTableComponent } } else if ( this.hasPermissionToOpenDetails && - activity.account?.isExcluded !== true && + this.isExcludedFromAnalysis(activity) === false && activity.isDraft === false && ['BUY', 'DIVIDEND', 'SELL'].includes(activity.type) ) { diff --git a/libs/ui/src/lib/i18n.ts b/libs/ui/src/lib/i18n.ts index f02da40e1..2b68063e6 100644 --- a/libs/ui/src/lib/i18n.ts +++ b/libs/ui/src/lib/i18n.ts @@ -13,6 +13,7 @@ const locales = { DATA_IMPORT_AND_EXPORT_TOOLTIP_OSS: $localize`Switch to Ghostfolio Premium easily`, DATA_IMPORT_AND_EXPORT_TOOLTIP_PREMIUM: $localize`Switch to Ghostfolio Open Source or Ghostfolio Basic easily`, EMERGENCY_FUND: $localize`Emergency Fund`, + EXCLUDE_FROM_ANALYSIS: $localize`Exclude from Analysis`, Global: $localize`Global`, GRANT: $localize`Grant`, HIGHER_RISK: $localize`Higher Risk`, diff --git a/prisma/seed.ts b/prisma/seed.ts index f68f8375b..18389aab1 100644 --- a/prisma/seed.ts +++ b/prisma/seed.ts @@ -8,6 +8,10 @@ async function main() { { id: '4452656d-9fa4-4bd0-ba38-70492e31d180', name: 'EMERGENCY_FUND' + }, + { + id: 'f2e868af-8333-459f-b161-cbc6544c24bd', + name: 'EXCLUDE_FROM_ANALYSIS' } ], skipDuplicates: true