remove term search from api, cleanup envs

bcgov · Jan 30, 2024 · 5d2ebea · 5d2ebea
1 parent fcc2c61
commit 5d2ebea
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 238 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/api/src/paths/taxonomy/itis/search.test.ts b/api/src/paths/taxonomy/itis/search.test.ts
diff --git a/api/src/paths/taxonomy/itis/search.ts b/api/src/paths/taxonomy/itis/search.ts
diff --git a/api/src/services/es-service.ts b/api/src/services/es-service.ts
@@ -87,23 +87,6 @@ export class ESService {
     });
   }
 
-  /**
-   * Returns the ITIS search URL.
-   *
-   * @param {string} searchParams
-   * @return {*}  {Promise<string>}
-   * @memberof ESService
-   */
-  async getItisTermSearchUrl(searchParams: string): Promise<string> {
-    const itisUrl = process.env.ITIS_URL;
-    if (!itisUrl) {
-      throw new Error('ITIS_SEARCH_URL not defined.');
-    }
-    const itisSearchSpecies = this._getItisSearchSpeciesQuery(searchParams);
-
-    return `${itisUrl}?${ITIS_PARAMS.SORT}&${itisSearchSpecies}&${ITIS_PARAMS.FILTER}`;
-  }
-
   /**
    * Returns the ITIS search URL for TSN ids.
    *

diff --git a/api/src/services/taxonomy-service.ts b/api/src/services/taxonomy-service.ts
@@ -51,29 +51,6 @@ export interface IItisSearchResult {
  * @extends {ESService}
  */
 export class TaxonomyService extends ESService {
-  /**
-   * Returns the ITIS search species Query.
-   *
-   * @param {*} searchRequest
-   * @return {*}  {(Promise<IItisSearchResult[] | undefined>)}
-   * @memberof TaxonomyService
-   */
-  async itisTermSearch(searchRequest: string): Promise<IItisSearchResult[] | undefined> {
-    try {
-      const itisClient = await this.getItisTermSearchUrl(searchRequest);
-
-      const response = await axios.get(itisClient);
-
-      if (!response.data || !response.data.response || !response.data.response.docs) {
-        return [];
-      }
-
-      return this._sanitizeItisData(response.data.response.docs);
-    } catch (error) {
-      defaultLog.debug({ label: 'itisTermSearch', message: 'error', error });
-    }
-  }
-
   /**
    * Returns the ITIS search by TSN.
    *

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -46,7 +46,7 @@ services:
       - ELASTICSEARCH_EML_INDEX=${ELASTICSEARCH_EML_INDEX}
       - ELASTICSEARCH_TAXONOMY_INDEX=${ELASTICSEARCH_TAXONOMY_INDEX}
       # ITIS API
-      - ITIS_URL=${ITIS_URL}
+      - ITIS_SOLR_URL=${ITIS_SOLR_URL}
       - S3_KEY_PREFIX=${S3_KEY_PREFIX}
       - TZ=${API_TZ}
       - API_HOST=${API_HOST}
@@ -175,6 +175,7 @@ services:
       - REACT_APP_KEYCLOAK_HOST=${KEYCLOAK_HOST}
       - REACT_APP_KEYCLOAK_REALM=${KEYCLOAK_REALM}
       - REACT_APP_KEYCLOAK_CLIENT_ID=${KEYCLOAK_CLIENT_ID}
+      - REACT_APP_ITIS_SOLR_URL=${ITIS_SOLR_URL}
     volumes:
       - ./app:/opt/app-root/src
       - /opt/app-root/src/node_modules # prevents local node_modules overriding container node_modules

diff --git a/env_config/env.docker b/env_config/env.docker
@@ -153,7 +153,7 @@ ELASTICSEARCH_TAXONOMY_INDEX=taxonomy_3.0.0
 # ------------------------------------------------------------------------------
 # ITIS Platform API
 # ------------------------------------------------------------------------------
-ITIS_URL=https://services.itis.gov/
+ITIS_SOLR_URL=https://services.itis.gov/
 
 # ------------------------------------------------------------------------------
 # GeoServer - https://geoserver.org/