From 2d0b5d97702702a5d1b6c27c38493245a272ded7 Mon Sep 17 00:00:00 2001 From: Guillermo Fernandez Date: Thu, 13 Feb 2025 17:32:55 +0100 Subject: [PATCH] Fixed style concerns and removed code duplication --- .../trackinsight/trackinsight.service.ts | 36 ++++++------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/apps/api/src/services/data-provider/data-enhancer/trackinsight/trackinsight.service.ts b/apps/api/src/services/data-provider/data-enhancer/trackinsight/trackinsight.service.ts index f9d102d5f..a32e6e024 100644 --- a/apps/api/src/services/data-provider/data-enhancer/trackinsight/trackinsight.service.ts +++ b/apps/api/src/services/data-provider/data-enhancer/trackinsight/trackinsight.service.ts @@ -44,11 +44,18 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface { return response; } - const trackinsightSymbol = await this.searchTrackinsightSymbol({ + let trackinsightSymbol = await this.searchTrackinsightSymbol({ requestTimeout, symbol }); + if (!trackinsightSymbol) { + trackinsightSymbol = await this.searchTrackinsightSymbol({ + requestTimeout, + symbol: symbol.split('.')?.[0] + }); + } + if (!trackinsightSymbol) { return response; } @@ -165,35 +172,14 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface { } private async searchTrackinsightSymbol({ - requestTimeout = this.configurationService.get('REQUEST_TIMEOUT'), + requestTimeout, symbol }: { - symbol: string; requestTimeout: number; + symbol: string; }) { - const newSymbol = await fetch( - `https://www.trackinsight.com/search-api/search_v2/${symbol}/_/ticker/default/0/3`, - { - signal: AbortSignal.timeout(requestTimeout) - } - ) - .then((res) => res.json()) - .then((jsonRes) => { - if (jsonRes['results']['count'] === 1) { - // Return the only ticker that matches the one in the search - return jsonRes['results']['docs'][0]['ticker']; - } - return undefined; - }) - .catch(() => { - return undefined; - }); - if (newSymbol) { - return newSymbol; - } - return await fetch( - `https://www.trackinsight.com/search-api/search_v2/${symbol.split('.')?.[0]}/_/ticker/default/0/3`, + `https://www.trackinsight.com/search-api/search_v2/${symbol}/_/ticker/default/0/3`, { signal: AbortSignal.timeout(requestTimeout) }