Browse Source

Task/remove unused granularity from historical market data query (#8111)

Remove unused granularity from historical market data query
pull/8116/head
Thomas Kaul 3 hours ago
committed by GitHub
parent
commit
970342e4f6
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      apps/api/src/app/portfolio/portfolio.service.ts
  2. 7
      apps/api/src/services/data-provider/data-provider.service.ts
  3. 1
      apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts

1
apps/api/src/app/portfolio/portfolio.service.ts

@ -1052,7 +1052,6 @@ export class PortfolioService {
const historicalData = await this.dataProviderService.getHistorical( const historicalData = await this.dataProviderService.getHistorical(
[{ dataSource, symbol }], [{ dataSource, symbol }],
'day',
parseISO(dateOfFirstActivity, { in: utc }), parseISO(dateOfFirstActivity, { in: utc }),
new Date() new Date()
); );

7
apps/api/src/services/data-provider/data-provider.service.ts

@ -371,7 +371,6 @@ export class DataProviderService implements OnModuleInit {
public async getHistorical( public async getHistorical(
aItems: AssetProfileIdentifier[], aItems: AssetProfileIdentifier[],
aGranularity: Granularity = 'month',
from: Date, from: Date,
to: Date to: Date
): Promise<{ ): Promise<{
@ -389,11 +388,6 @@ export class DataProviderService implements OnModuleInit {
return response; return response;
} }
const granularityQuery =
aGranularity === 'month'
? Prisma.sql`AND (date_part('day', date) = 1 OR date >= TIMESTAMP 'yesterday')`
: Prisma.empty;
const rangeQuery = const rangeQuery =
from && to from && to
? Prisma.sql`AND date >= ${format(from, DATE_FORMAT, { ? Prisma.sql`AND date >= ${format(from, DATE_FORMAT, {
@ -415,7 +409,6 @@ export class DataProviderService implements OnModuleInit {
SELECT "dataSource", "date", "marketPrice", "symbol" SELECT "dataSource", "date", "marketPrice", "symbol"
FROM "MarketData" FROM "MarketData"
WHERE ("dataSource", "symbol") IN (${Prisma.join(assetProfileIdentifiers)}) WHERE ("dataSource", "symbol") IN (${Prisma.join(assetProfileIdentifiers)})
${granularityQuery}
${rangeQuery} ${rangeQuery}
ORDER BY date;`; ORDER BY date;`;

1
apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts

@ -175,7 +175,6 @@ export class ExchangeRateDataService {
const historicalData = await this.dataProviderService.getHistorical( const historicalData = await this.dataProviderService.getHistorical(
this.currencyPairs, this.currencyPairs,
'day',
startOfUtcDateOfYesterday, startOfUtcDateOfYesterday,
startOfUtcDateOfYesterday startOfUtcDateOfYesterday
); );

Loading…
Cancel
Save