Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

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

Thomas Kaul970342e4f6ee
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 8aea5ef0db..6e9f8c045a 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -1052,7 +1052,6 @@ export class PortfolioService {
const historicalData = await this.dataProviderService.getHistorical(
[{ dataSource, symbol }],
- 'day',
parseISO(dateOfFirstActivity, { in: utc }),
new Date()
);
diff --git a/apps/api/src/services/data-provider/data-provider.service.ts b/apps/api/src/services/data-provider/data-provider.service.ts
index 5ddd5182d0..cf281f5f52 100644
--- a/apps/api/src/services/data-provider/data-provider.service.ts
+++ b/apps/api/src/services/data-provider/data-provider.service.ts
@@ -371,7 +371,6 @@ export class DataProviderService implements OnModuleInit {
public async getHistorical(
aItems: AssetProfileIdentifier[],
- aGranularity: Granularity = 'month',
from: Date,
to: Date
): Promise<{
@@ -389,11 +388,6 @@ export class DataProviderService implements OnModuleInit {
return response;
}
- const granularityQuery =
- aGranularity === 'month'
- ? Prisma.sql`AND (date_part('day', date) = 1 OR date >= TIMESTAMP 'yesterday')`
- : Prisma.empty;
-
const rangeQuery =
from && to
? Prisma.sql`AND date >= ${format(from, DATE_FORMAT, {
@@ -415,7 +409,6 @@ export class DataProviderService implements OnModuleInit {
SELECT "dataSource", "date", "marketPrice", "symbol"
FROM "MarketData"
WHERE ("dataSource", "symbol") IN (${Prisma.join(assetProfileIdentifiers)})
- ${granularityQuery}
${rangeQuery}
ORDER BY date;`;
diff --git a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts
index 824149e74f..59795cad6a 100644
--- a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts
+++ b/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(
this.currencyPairs,
- 'day',
startOfUtcDateOfYesterday,
startOfUtcDateOfYesterday
);