From e59d69854a8587c3596451a319fc74fe12de840f Mon Sep 17 00:00:00 2001 From: Riley Grant Date: Thu, 23 May 2024 17:41:47 -0500 Subject: [PATCH] chore(graphql-api): revert es aliases to generic names --- graphql-api/src/queries/copy-number-variant-queries.ts | 2 +- graphql-api/src/queries/gene-queries.ts | 2 +- graphql-api/src/queries/structural-variant-queries.spec.ts | 4 +--- graphql-api/src/queries/structural-variant-queries.ts | 2 +- .../src/queries/variant-datasets/gnomad-v4-variant-queries.ts | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/graphql-api/src/queries/copy-number-variant-queries.ts b/graphql-api/src/queries/copy-number-variant-queries.ts index 61ad626e8..8dc57a492 100644 --- a/graphql-api/src/queries/copy-number-variant-queries.ts +++ b/graphql-api/src/queries/copy-number-variant-queries.ts @@ -1,6 +1,6 @@ import { fetchAllSearchResults } from './helpers/elasticsearch-helpers' -const GNOMAD_COPY_NUMBER_VARIANTS_V4_INDEX = 'v4p1_gnomad_v4_cnvs' +const GNOMAD_COPY_NUMBER_VARIANTS_V4_INDEX = 'gnomad_v4_cnvs' type CnvDatasetId = 'gnomad_cnv_r4' type DatasetDependentQueryParams = { diff --git a/graphql-api/src/queries/gene-queries.ts b/graphql-api/src/queries/gene-queries.ts index 827762fda..ac7858c21 100644 --- a/graphql-api/src/queries/gene-queries.ts +++ b/graphql-api/src/queries/gene-queries.ts @@ -4,7 +4,7 @@ import { fetchAllSearchResults } from './helpers/elasticsearch-helpers' const GENE_INDICES = { GRCh37: 'genes_grch37', - GRCh38: 'v4p1_genes_grch38', + GRCh38: 'genes_grch38', } const _fetchGeneById = async (esClient: any, geneId: any, referenceGenome: any) => { diff --git a/graphql-api/src/queries/structural-variant-queries.spec.ts b/graphql-api/src/queries/structural-variant-queries.spec.ts index 3ca19d56f..86a0fa2b1 100644 --- a/graphql-api/src/queries/structural-variant-queries.spec.ts +++ b/graphql-api/src/queries/structural-variant-queries.spec.ts @@ -54,9 +54,7 @@ const makeMockClient = (response: any) => { } const expectedIndex = (datasetId: SvDatasetId) => - datasetId === 'gnomad_sv_r4' - ? 'v4p1_gnomad_structural_variants_v3' - : 'gnomad_structural_variants_v2' + datasetId === 'gnomad_sv_r4' ? 'gnomad_structural_variants_v3' : 'gnomad_structural_variants_v2' describe('fetchStructuralVariantById', () => { const variantId = 'dummy-variant' diff --git a/graphql-api/src/queries/structural-variant-queries.ts b/graphql-api/src/queries/structural-variant-queries.ts index e21ec191b..05e956e09 100644 --- a/graphql-api/src/queries/structural-variant-queries.ts +++ b/graphql-api/src/queries/structural-variant-queries.ts @@ -3,7 +3,7 @@ import { isEmpty } from 'lodash' import { fetchAllSearchResults } from './helpers/elasticsearch-helpers' const GNOMAD_STRUCTURAL_VARIANTS_V2_INDEX = 'gnomad_structural_variants_v2' -const GNOMAD_STRUCTURAL_VARIANTS_V3_INDEX = 'v4p1_gnomad_structural_variants_v3' +const GNOMAD_STRUCTURAL_VARIANTS_V3_INDEX = 'gnomad_structural_variants_v3' type SvDatasetId = | 'gnomad_sv_r2_1' diff --git a/graphql-api/src/queries/variant-datasets/gnomad-v4-variant-queries.ts b/graphql-api/src/queries/variant-datasets/gnomad-v4-variant-queries.ts index 53eefadc2..627fd402b 100644 --- a/graphql-api/src/queries/variant-datasets/gnomad-v4-variant-queries.ts +++ b/graphql-api/src/queries/variant-datasets/gnomad-v4-variant-queries.ts @@ -12,7 +12,7 @@ import { getFlagsForContext } from './shared/flags' import { getConsequenceForContext } from './shared/transcriptConsequence' import largeGenes from '../helpers/large-genes' -const GNOMAD_V4_VARIANT_INDEX = 'v4p1_gnomad_v4_variants' +const GNOMAD_V4_VARIANT_INDEX = 'gnomad_v4_variants' type Subset = 'all' | 'non_ukb'