From 4844a5b1addfa6b113374392d7d36f5856e64e14 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sat, 2 Aug 2025 17:13:31 +0200 Subject: [PATCH] Feature/refactor tag handling for exclude from analysis (#5306) * Refactoring --- apps/api/src/app/user/user.service.ts | 5 ++++- apps/api/src/services/tag/tag.service.ts | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts index a043761fa..405c4c0b0 100644 --- a/apps/api/src/app/user/user.service.ts +++ b/apps/api/src/app/user/user.service.ts @@ -28,6 +28,7 @@ import { DEFAULT_LANGUAGE_CODE, PROPERTY_IS_READ_ONLY_MODE, PROPERTY_SYSTEM_MESSAGE, + TAG_ID_EXCLUDE_FROM_ANALYSIS, locale } from '@ghostfolio/common/config'; import { @@ -121,7 +122,9 @@ export class UserService { const access = userData[0]; const activitiesCount = userData[1]; const firstActivity = userData[2]; - let tags = userData[3]; + let tags = userData[3].filter((tag) => { + return tag.id !== TAG_ID_EXCLUDE_FROM_ANALYSIS; + }); let systemMessage: SystemMessage; diff --git a/apps/api/src/services/tag/tag.service.ts b/apps/api/src/services/tag/tag.service.ts index c38abe592..eb2d7bfef 100644 --- a/apps/api/src/services/tag/tag.service.ts +++ b/apps/api/src/services/tag/tag.service.ts @@ -1,5 +1,4 @@ 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'; @@ -80,8 +79,7 @@ export class TagService { id, name, userId, - isUsed: - _count.activities > 0 && ![TAG_ID_EXCLUDE_FROM_ANALYSIS].includes(id) + isUsed: _count.activities > 0 })); }