Browse Source

Resolve error when fetching dividends for date ranges without events

pull/7612/head
Thomas Kaul 2 weeks ago
parent
commit
a3fbfa9401
  1. 8
      apps/api/src/services/data-provider/data-provider.service.ts
  2. 20
      apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts

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

@ -340,7 +340,13 @@ export class DataProviderService implements OnModuleInit {
from: Date; from: Date;
granularity: Granularity; granularity: Granularity;
to: Date; to: Date;
} & AssetProfileIdentifier) { } & AssetProfileIdentifier): Promise<{
[date: string]: DataProviderHistoricalResponse;
}> {
if (!isValid(from) || !isValid(to)) {
return {};
}
return this.getDataProvider(DataSource[dataSource]).getDividends({ return this.getDataProvider(DataSource[dataSource]).getDividends({
from, from,
granularity, granularity,

20
apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts

@ -1,4 +1,3 @@
import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service'; import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service';
import { YahooFinanceDataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service'; import { YahooFinanceDataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service';
import { AssetProfileDelistedError } from '@ghostfolio/api/services/data-provider/errors/asset-profile-delisted.error'; import { AssetProfileDelistedError } from '@ghostfolio/api/services/data-provider/errors/asset-profile-delisted.error';
@ -22,7 +21,7 @@ import {
import { Injectable, Logger } from '@nestjs/common'; import { Injectable, Logger } from '@nestjs/common';
import { DataSource, SymbolProfile } from '@prisma/client'; import { DataSource, SymbolProfile } from '@prisma/client';
import { addDays, format, isSameDay, isValid } from 'date-fns'; import { addDays, format, isSameDay } from 'date-fns';
import { ReasonPhrases, StatusCodes } from 'http-status-codes'; import { ReasonPhrases, StatusCodes } from 'http-status-codes';
import { uniqBy } from 'lodash'; import { uniqBy } from 'lodash';
import YahooFinance from 'yahoo-finance2'; import YahooFinance from 'yahoo-finance2';
@ -56,7 +55,6 @@ export class YahooFinanceService implements DataProviderInterface {
}); });
public constructor( public constructor(
private readonly configurationService: ConfigurationService,
private readonly cryptocurrencyService: CryptocurrencyService, private readonly cryptocurrencyService: CryptocurrencyService,
private readonly yahooFinanceDataEnhancerService: YahooFinanceDataEnhancerService private readonly yahooFinanceDataEnhancerService: YahooFinanceDataEnhancerService
) {} ) {}
@ -83,18 +81,9 @@ export class YahooFinanceService implements DataProviderInterface {
public async getDividends({ public async getDividends({
from, from,
granularity = 'day', granularity = 'day',
requestTimeout = this.configurationService.get('REQUEST_TIMEOUT'),
symbol, symbol,
to to
}: GetDividendsParams) { }: GetDividendsParams) {
if (!isValid(from) || !isValid(to)) {
this.logger.error(
`Could not get dividends for ${symbol} (${this.getName()}): Invalid date range`
);
return {};
}
try { try {
const historicalResult = this.convertToDividendResult( const historicalResult = this.convertToDividendResult(
await this.yahooFinance.chart( await this.yahooFinance.chart(
@ -109,9 +98,6 @@ export class YahooFinanceService implements DataProviderInterface {
isSameDay(from, to) ? addDays(to, 1) : to, isSameDay(from, to) ? addDays(to, 1) : to,
DATE_FORMAT DATE_FORMAT
) )
},
{
fetchOptions: { signal: AbortSignal.timeout(requestTimeout) }
} }
) )
); );
@ -154,7 +140,6 @@ export class YahooFinanceService implements DataProviderInterface {
public async getHistorical({ public async getHistorical({
from, from,
requestTimeout = this.configurationService.get('REQUEST_TIMEOUT'),
symbol, symbol,
to to
}: GetHistoricalParams): Promise<{ }: GetHistoricalParams): Promise<{
@ -173,9 +158,6 @@ export class YahooFinanceService implements DataProviderInterface {
isSameDay(from, to) ? addDays(to, 1) : to, isSameDay(from, to) ? addDays(to, 1) : to,
DATE_FORMAT DATE_FORMAT
) )
},
{
fetchOptions: { signal: AbortSignal.timeout(requestTimeout) }
} }
) )
); );

Loading…
Cancel
Save