fix tests.

broadinstitute · Jul 21, 2023 · 929dde6 · 929dde6
1 parent 506506f
commit 929dde6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/seqr/utils/search/elasticsearch/es_search.py b/seqr/utils/search/elasticsearch/es_search.py
@@ -1413,8 +1413,9 @@ def _location_filter(genes, intervals, exclude_locations):
                     }
                 } for key in ['xpos', 'xstop']]
                 interval_q = _build_or_filter('range', range_filters)
-                interval_q |= Q('range', xpos={'lte': xstart}) & Q('range', xstop={'gte': xstop}) &
-                              Q('range', xpos={'gte': get_xpos(interval['chrom'], 0)}) & Q('range', xstop={'lte': get_xpos(interval['chrom'], MAX_POS)})
+                interval_q |= Q('range', xpos={'lte': xstart}) & Q('range', xstop={'gte': xstop}) & \
+                              Q('range', xpos={'gte': get_xpos(interval['chrom'], MIN_POS)}) & \
+                              Q('range', xstop={'lte': get_xpos(interval['chrom'], MAX_POS)})
 
             if q:
                 q |= interval_q

diff --git a/seqr/utils/search/elasticsearch/es_utils_tests.py b/seqr/utils/search/elasticsearch/es_utils_tests.py
@@ -1614,7 +1614,8 @@ def test_filtered_get_es_variants(self):
                         {'bool': {'must': [
                             {'range': {'xpos': {'lte': 2000001234}}},
                             {'range': {'xstop': {'gte': 2000005678}}},
-                            {'script': {'script': "doc['xpos'].value / 1000000000 == doc['xstop'].value / 1000000000"}},
+                            {'range': {'xpos': {'gte': 2000000001}}},
+                            {'range': {'xstop': {'lte': 2300000000}}},
                         ]}},
                         {'terms': {'geneIds': ['ENSG00000223972']}},
                         {'bool': {'must': [