diff --git a/apps/api/src/services/data-provider.service.ts b/apps/api/src/services/data-provider.service.ts index 8fb9d7ea3..8490eb624 100644 --- a/apps/api/src/services/data-provider.service.ts +++ b/apps/api/src/services/data-provider.service.ts @@ -3,6 +3,7 @@ import { isGhostfolioScraperApiSymbol, isRakutenRapidApiSymbol } from '@ghostfolio/helper/helper'; +import { Granularity } from '@ghostfolio/helper/types'; import { Injectable } from '@nestjs/common'; import { MarketData } from '@prisma/client'; import { format } from 'date-fns'; @@ -13,7 +14,6 @@ import { GhostfolioScraperApiService } from './data-provider/ghostfolio-scraper- import { RakutenRapidApiService } from './data-provider/rakuten-rapid-api/rakuten-rapid-api.service'; import { YahooFinanceService } from './data-provider/yahoo-finance/yahoo-finance.service'; import { DataProviderInterface } from './interfaces/data-provider.interface'; -import { Granularity } from './interfaces/granularity.type'; import { IDataProviderHistoricalResponse, IDataProviderResponse diff --git a/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts b/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts index c08c0528e..ad7e05f99 100644 --- a/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts +++ b/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts @@ -1,9 +1,9 @@ +import { Granularity } from '@ghostfolio/helper/types'; import { Injectable } from '@nestjs/common'; import { isAfter, isBefore, parse } from 'date-fns'; import { ConfigurationService } from '../../configuration.service'; import { DataProviderInterface } from '../../interfaces/data-provider.interface'; -import { Granularity } from '../../interfaces/granularity.type'; import { IDataProviderHistoricalResponse, IDataProviderResponse diff --git a/apps/api/src/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service.ts b/apps/api/src/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service.ts index 92bc19f5e..d92898d8e 100644 --- a/apps/api/src/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service.ts +++ b/apps/api/src/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service.ts @@ -1,4 +1,5 @@ import { getYesterday } from '@ghostfolio/helper/helper'; +import { Granularity } from '@ghostfolio/helper/types'; import { Injectable } from '@nestjs/common'; import { DataSource } from '@prisma/client'; import * as bent from 'bent'; @@ -6,7 +7,6 @@ import * as cheerio from 'cheerio'; import { format } from 'date-fns'; import { DataProviderInterface } from '../../interfaces/data-provider.interface'; -import { Granularity } from '../../interfaces/granularity.type'; import { IDataProviderHistoricalResponse, IDataProviderResponse, diff --git a/apps/api/src/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service.ts b/apps/api/src/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service.ts index b8c0dd3ff..2a3d67465 100644 --- a/apps/api/src/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service.ts +++ b/apps/api/src/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service.ts @@ -1,4 +1,5 @@ import { getToday, getYesterday } from '@ghostfolio/helper/helper'; +import { Granularity } from '@ghostfolio/helper/types'; import { Injectable } from '@nestjs/common'; import { DataSource } from '@prisma/client'; import * as bent from 'bent'; @@ -6,7 +7,6 @@ import { format, subMonths, subWeeks, subYears } from 'date-fns'; import { ConfigurationService } from '../../configuration.service'; import { DataProviderInterface } from '../../interfaces/data-provider.interface'; -import { Granularity } from '../../interfaces/granularity.type'; import { IDataProviderHistoricalResponse, IDataProviderResponse, diff --git a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts index 531a10b07..1b91d903c 100644 --- a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts +++ b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts @@ -1,12 +1,12 @@ import { UNKNOWN_KEY } from '@ghostfolio/helper/config'; import { isCrypto, isCurrency, parseCurrency } from '@ghostfolio/helper/helper'; +import { Granularity } from '@ghostfolio/helper/types'; import { Injectable } from '@nestjs/common'; import { DataSource } from '@prisma/client'; import { format } from 'date-fns'; import * as yahooFinance from 'yahoo-finance'; import { DataProviderInterface } from '../../interfaces/data-provider.interface'; -import { Granularity } from '../../interfaces/granularity.type'; import { IDataProviderHistoricalResponse, IDataProviderResponse, diff --git a/apps/api/src/services/interfaces/data-provider.interface.ts b/apps/api/src/services/interfaces/data-provider.interface.ts index e424b66ff..d1e1b2931 100644 --- a/apps/api/src/services/interfaces/data-provider.interface.ts +++ b/apps/api/src/services/interfaces/data-provider.interface.ts @@ -1,4 +1,5 @@ -import { Granularity } from './granularity.type'; +import { Granularity } from '@ghostfolio/helper/types'; + import { IDataProviderHistoricalResponse, IDataProviderResponse diff --git a/apps/api/src/services/interfaces/granularity.type.ts b/libs/helper/src/lib/types/granularity.type.ts similarity index 100% rename from apps/api/src/services/interfaces/granularity.type.ts rename to libs/helper/src/lib/types/granularity.type.ts diff --git a/libs/helper/src/lib/types/index.ts b/libs/helper/src/lib/types/index.ts index 194b53606..ca148276e 100644 --- a/libs/helper/src/lib/types/index.ts +++ b/libs/helper/src/lib/types/index.ts @@ -1,5 +1,6 @@ import { AccessWithGranteeUser } from './access-with-grantee-user.type'; import { DateRange } from './date-range.type'; +import { Granularity } from './granularity.type'; import { OrderWithAccount } from './order-with-account.type'; -export { AccessWithGranteeUser, DateRange, OrderWithAccount }; +export { AccessWithGranteeUser, DateRange, Granularity, OrderWithAccount };