Browse Source

Feature/refactor tag handling for exclude from analysis (#5306)

* Refactoring
pull/5312/head
Thomas Kaul 1 week ago
committed by GitHub
parent
commit
4844a5b1ad
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 5
      apps/api/src/app/user/user.service.ts
  2. 4
      apps/api/src/services/tag/tag.service.ts

5
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;

4
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
}));
}

Loading…
Cancel
Save