From 4f76ee67588ba5ba8b1d3ca15e90745170fd029d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Tom=C3=A1s=20Fern=C3=A1ndez=20Mart=C3=ADn?=
 <folez97@gmail.com>
Date: Sat, 15 Feb 2025 09:43:28 +0100
Subject: [PATCH] Feature/improve symbol lookup in Trackinsight data enhancer
 (#4296)

* Feature: enhance Trackinsight data fetching with symbol search fallback

* Feature: refactor Trackinsight symbol search for improved clarity and error handling

* Fixed style concerns and removed code duplication

* Minor improvements

* Update changelog

* Update changelog

* Clean up

---------

Co-authored-by: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
---
 CHANGELOG.md                                  |  1 +
 .../trackinsight/trackinsight.service.ts      | 83 +++++++++++--------
 2 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37bc84cf..db1563f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improved the symbol lookup in the _Trackinsight_ data enhancer for asset profile data
 - Improved the language localization for German (`de`)
 - Upgraded `@trivago/prettier-plugin-sort-imports` from version `5.2.1` to `5.2.2`
 
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 56b90082..2b8eaf2e 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,28 +44,31 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
       return response;
     }
 
+    let trackinsightSymbol = await this.searchTrackinsightSymbol({
+      requestTimeout,
+      symbol
+    });
+
+    if (!trackinsightSymbol) {
+      trackinsightSymbol = await this.searchTrackinsightSymbol({
+        requestTimeout,
+        symbol: symbol.split('.')?.[0]
+      });
+    }
+
+    if (!trackinsightSymbol) {
+      return response;
+    }
+
     const profile = await fetch(
-      `${TrackinsightDataEnhancerService.baseUrl}/funds/${symbol}.json`,
+      `${TrackinsightDataEnhancerService.baseUrl}/funds/${trackinsightSymbol}.json`,
       {
         signal: AbortSignal.timeout(requestTimeout)
       }
     )
       .then((res) => res.json())
       .catch(() => {
-        return fetch(
-          `${TrackinsightDataEnhancerService.baseUrl}/funds/${
-            symbol.split('.')?.[0]
-          }.json`,
-          {
-            signal: AbortSignal.timeout(
-              this.configurationService.get('REQUEST_TIMEOUT')
-            )
-          }
-        )
-          .then((res) => res.json())
-          .catch(() => {
-            return {};
-          });
+        return {};
       });
 
     const isin = profile?.isin?.split(';')?.[0];
@@ -75,29 +78,14 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
     }
 
     const holdings = await fetch(
-      `${TrackinsightDataEnhancerService.baseUrl}/holdings/${symbol}.json`,
+      `${TrackinsightDataEnhancerService.baseUrl}/holdings/${trackinsightSymbol}.json`,
       {
-        signal: AbortSignal.timeout(
-          this.configurationService.get('REQUEST_TIMEOUT')
-        )
+        signal: AbortSignal.timeout(requestTimeout)
       }
     )
       .then((res) => res.json())
       .catch(() => {
-        return fetch(
-          `${TrackinsightDataEnhancerService.baseUrl}/holdings/${
-            symbol.split('.')?.[0]
-          }.json`,
-          {
-            signal: AbortSignal.timeout(
-              this.configurationService.get('REQUEST_TIMEOUT')
-            )
-          }
-        )
-          .then((res) => res.json())
-          .catch(() => {
-            return {};
-          });
+        return {};
       });
 
     if (
@@ -180,4 +168,33 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
   public getTestSymbol() {
     return 'QQQ';
   }
+
+  private async searchTrackinsightSymbol({
+    requestTimeout,
+    symbol
+  }: {
+    requestTimeout: number;
+    symbol: string;
+  }) {
+    return 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 ||
+          jsonRes['results']?.['docs']?.[0]?.['ticker'] === symbol
+        ) {
+          return jsonRes['results']['docs'][0]['ticker'];
+        }
+
+        return undefined;
+      })
+      .catch(() => {
+        return undefined;
+      });
+  }
 }