From 53809fd396b685313deb805782abaf5cffb00f43 Mon Sep 17 00:00:00 2001 From: Matej Gerek Date: Sun, 6 Oct 2024 14:59:35 +0200 Subject: [PATCH] Revert "Remove tags from api/v1/info" This reverts commit b9f7f5fcb827991aafe15a1d154bd6f8abacb9bb. --- apps/api/src/app/info/info.module.ts | 2 ++ apps/api/src/app/info/info.service.ts | 9 +++++++-- libs/common/src/lib/interfaces/info-item.interface.ts | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/api/src/app/info/info.module.ts b/apps/api/src/app/info/info.module.ts index 7903ac397..9b7854160 100644 --- a/apps/api/src/app/info/info.module.ts +++ b/apps/api/src/app/info/info.module.ts @@ -9,6 +9,7 @@ import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-d import { PropertyModule } from '@ghostfolio/api/services/property/property.module'; import { DataGatheringModule } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.module'; import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module'; +import { TagModule } from '@ghostfolio/api/services/tag/tag.module'; import { Module } from '@nestjs/common'; import { JwtModule } from '@nestjs/jwt'; @@ -32,6 +33,7 @@ import { InfoService } from './info.service'; PropertyModule, RedisCacheModule, SymbolProfileModule, + TagModule, TransformDataSourceInResponseModule, UserModule ], diff --git a/apps/api/src/app/info/info.service.ts b/apps/api/src/app/info/info.service.ts index bd291c511..ee225e769 100644 --- a/apps/api/src/app/info/info.service.ts +++ b/apps/api/src/app/info/info.service.ts @@ -5,6 +5,7 @@ import { UserService } from '@ghostfolio/api/app/user/user.service'; import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service'; import { PropertyService } from '@ghostfolio/api/services/property/property.service'; +import { TagService } from '@ghostfolio/api/services/tag/tag.service'; import { DEFAULT_CURRENCY, PROPERTY_BETTER_UPTIME_MONITOR_ID, @@ -46,6 +47,7 @@ export class InfoService { private readonly platformService: PlatformService, private readonly propertyService: PropertyService, private readonly redisCacheService: RedisCacheService, + private readonly tagService: TagService, private readonly userService: UserService ) {} @@ -101,7 +103,8 @@ export class InfoService { isUserSignupEnabled, platforms, statistics, - subscriptions + subscriptions, + tags ] = await Promise.all([ this.benchmarkService.getBenchmarkAssetProfiles(), this.getDemoAuthToken(), @@ -110,7 +113,8 @@ export class InfoService { orderBy: { name: 'asc' } }), this.getStatistics(), - this.getSubscriptions() + this.getSubscriptions(), + this.tagService.getPublic() ]); if (isUserSignupEnabled) { @@ -126,6 +130,7 @@ export class InfoService { platforms, statistics, subscriptions, + tags, baseCurrency: DEFAULT_CURRENCY, currencies: this.exchangeRateDataService.getCurrencies() }; diff --git a/libs/common/src/lib/interfaces/info-item.interface.ts b/libs/common/src/lib/interfaces/info-item.interface.ts index 1b3926331..d279c74a4 100644 --- a/libs/common/src/lib/interfaces/info-item.interface.ts +++ b/libs/common/src/lib/interfaces/info-item.interface.ts @@ -1,6 +1,6 @@ import { SubscriptionOffer } from '@ghostfolio/common/types'; -import { Platform, SymbolProfile } from '@prisma/client'; +import { Platform, SymbolProfile, Tag } from '@prisma/client'; import { Statistics } from './statistics.interface'; import { Subscription } from './subscription.interface'; @@ -19,4 +19,5 @@ export interface InfoItem { statistics: Statistics; stripePublicKey?: string; subscriptions: { [offer in SubscriptionOffer]: Subscription }; + tags: Tag[]; }