From 07808bf824e75b76da9f18e7019dbf14e72475ab Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sat, 9 Aug 2025 09:35:41 +0200 Subject: [PATCH] Move tag ids from config.ts to tag-ids.mjs --- apps/api/src/app/order/order.service.ts | 4 ++-- apps/api/src/app/portfolio/portfolio.service.ts | 11 +++++------ apps/api/src/app/user/user.service.ts | 2 +- apps/api/src/services/demo/demo.service.ts | 4 ++-- libs/common/src/lib/config.ts | 5 ----- libs/common/src/lib/tag-ids.mjs | 6 ++++++ .../activities-table/activities-table.component.ts | 6 ++---- prisma/seed.mts | 9 +++++++-- 8 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 libs/common/src/lib/tag-ids.mjs diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts index fd50f5e74..12004605b 100644 --- a/apps/api/src/app/order/order.service.ts +++ b/apps/api/src/app/order/order.service.ts @@ -9,8 +9,7 @@ import { DATA_GATHERING_QUEUE_PRIORITY_HIGH, GATHER_ASSET_PROFILE_PROCESS_JOB_NAME, GATHER_ASSET_PROFILE_PROCESS_JOB_OPTIONS, - ghostfolioPrefix, - TAG_ID_EXCLUDE_FROM_ANALYSIS + ghostfolioPrefix } from '@ghostfolio/common/config'; import { getAssetProfileIdentifier } from '@ghostfolio/common/helper'; import { @@ -18,6 +17,7 @@ import { EnhancedSymbolProfile, Filter } from '@ghostfolio/common/interfaces'; +import { TAG_ID_EXCLUDE_FROM_ANALYSIS } from '@ghostfolio/common/tag-ids.mjs'; import { OrderWithAccount } from '@ghostfolio/common/types'; import { Injectable } from '@nestjs/common'; diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index 784661e20..914e3d557 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -30,12 +30,7 @@ import { getAnnualizedPerformancePercent, getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper'; -import { - DEFAULT_CURRENCY, - TAG_ID_EMERGENCY_FUND, - TAG_ID_EXCLUDE_FROM_ANALYSIS, - UNKNOWN_KEY -} from '@ghostfolio/common/config'; +import { DEFAULT_CURRENCY, UNKNOWN_KEY } from '@ghostfolio/common/config'; import { DATE_FORMAT, getSum, parseDate } from '@ghostfolio/common/helper'; import { AccountsResponse, @@ -53,6 +48,10 @@ import { UserSettings } from '@ghostfolio/common/interfaces'; import { TimelinePosition } from '@ghostfolio/common/models'; +import { + TAG_ID_EMERGENCY_FUND, + TAG_ID_EXCLUDE_FROM_ANALYSIS +} from '@ghostfolio/common/tag-ids.mjs'; import { AccountWithValue, DateRange, diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts index 405c4c0b0..babc2c8d2 100644 --- a/apps/api/src/app/user/user.service.ts +++ b/apps/api/src/app/user/user.service.ts @@ -28,7 +28,6 @@ import { DEFAULT_LANGUAGE_CODE, PROPERTY_IS_READ_ONLY_MODE, PROPERTY_SYSTEM_MESSAGE, - TAG_ID_EXCLUDE_FROM_ANALYSIS, locale } from '@ghostfolio/common/config'; import { @@ -41,6 +40,7 @@ import { hasRole, permissions } from '@ghostfolio/common/permissions'; +import { TAG_ID_EXCLUDE_FROM_ANALYSIS } from '@ghostfolio/common/tag-ids.mjs'; import { UserWithSettings } from '@ghostfolio/common/types'; import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type'; diff --git a/apps/api/src/services/demo/demo.service.ts b/apps/api/src/services/demo/demo.service.ts index 8f3658736..27c747654 100644 --- a/apps/api/src/services/demo/demo.service.ts +++ b/apps/api/src/services/demo/demo.service.ts @@ -2,9 +2,9 @@ import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service'; import { PropertyService } from '@ghostfolio/api/services/property/property.service'; import { PROPERTY_DEMO_ACCOUNT_ID, - PROPERTY_DEMO_USER_ID, - TAG_ID_DEMO + PROPERTY_DEMO_USER_ID } from '@ghostfolio/common/config'; +import { TAG_ID_DEMO } from '@ghostfolio/common/tag-ids.mjs'; import { Injectable } from '@nestjs/common'; import { v4 as uuidv4 } from 'uuid'; diff --git a/libs/common/src/lib/config.ts b/libs/common/src/lib/config.ts index 02a12cfd1..35934085f 100644 --- a/libs/common/src/lib/config.ts +++ b/libs/common/src/lib/config.ts @@ -199,9 +199,4 @@ export const SUPPORTED_LANGUAGE_CODES = [ 'zh' ]; -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/common/src/lib/tag-ids.mjs b/libs/common/src/lib/tag-ids.mjs new file mode 100644 index 000000000..7939ac0ca --- /dev/null +++ b/libs/common/src/lib/tag-ids.mjs @@ -0,0 +1,6 @@ +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'; 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 c13251771..7b10eba52 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -2,12 +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, - TAG_ID_EXCLUDE_FROM_ANALYSIS -} from '@ghostfolio/common/config'; +import { DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config'; import { getDateFormatString, getLocale } from '@ghostfolio/common/helper'; import { AssetProfileIdentifier } from '@ghostfolio/common/interfaces'; +import { TAG_ID_EXCLUDE_FROM_ANALYSIS } from '@ghostfolio/common/tag-ids.mjs'; import { OrderWithAccount } from '@ghostfolio/common/types'; import { SelectionModel } from '@angular/cdk/collections'; diff --git a/prisma/seed.mts b/prisma/seed.mts index 18389aab1..a9b4a0c95 100644 --- a/prisma/seed.mts +++ b/prisma/seed.mts @@ -1,16 +1,21 @@ import { PrismaClient } from '@prisma/client'; +import { + TAG_ID_EMERGENCY_FUND, + TAG_ID_EXCLUDE_FROM_ANALYSIS +} from '../libs/common/src/lib/tag-ids.mjs'; + const prisma = new PrismaClient(); async function main() { await prisma.tag.createMany({ data: [ { - id: '4452656d-9fa4-4bd0-ba38-70492e31d180', + id: TAG_ID_EMERGENCY_FUND, name: 'EMERGENCY_FUND' }, { - id: 'f2e868af-8333-459f-b161-cbc6544c24bd', + id: TAG_ID_EXCLUDE_FROM_ANALYSIS, name: 'EXCLUDE_FROM_ANALYSIS' } ],