modify the should terms query

opentargets · Oct 21, 2024 · d9573a1 · d9573a1
1 parent 7944e53
commit d9573a1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/app/models/Backend.scala b/app/models/Backend.scala
@@ -141,7 +141,13 @@ class Backend @Inject() (implicit
     val indexName = getIndexOrDefault("variant_index")
 
     //esRetriever.getByIds(indexName, ids, fromJsValue[VariantIndex])
-    esRetriever.getByIndexedTermsMust(indexName, Map("variantId.keyword" -> ids), Pagination.mkDefault, fromJsValue[VariantIndex]).map(_._1)
+    esRetriever
+      .getByIndexedTermsMust(indexName,
+                             Map("variantId.keyword" -> ids),
+                             Pagination.mkDefault,
+                             fromJsValue[VariantIndex]
+      )
+      .map(_._1)
   }
 
   def getBiosample(id: String): Future[Option[Biosample]] = {

diff --git a/app/models/ElasticRetriever.scala b/app/models/ElasticRetriever.scala
@@ -162,6 +162,9 @@ class ElasticRetriever @Inject() (
     getByIndexedQuery(searchRequest, sortByField, buildF)
   }
 
+  /** This fn represents a query where each kv from the map is used in
+    * a bool 'must' (AND) with optional filters that are 'must' (AND).
+    */
   def getByIndexedTermsMust[A, V](
       esIndex: String,
       kv: Map[String, V],
@@ -184,6 +187,9 @@ class ElasticRetriever @Inject() (
     getByIndexedQuery(searchRequest, sortByField, buildF)
   }
 
+  /** This fn represents a query where each kv from the map is used in
+    * a bool 'should' (OR) with optional filters that are 'must' (AND).
+    */
   def getByIndexedTermsShould[A, V](
       esIndex: String,
       kv: Map[String, V],

diff --git a/app/models/ElasticRetrieverQueryBuilders.scala b/app/models/ElasticRetrieverQueryBuilders.scala
@@ -78,12 +78,12 @@ trait ElasticRetrieverQueryBuilders extends QueryApi with Logging {
     val limitClause = indexQuery.pagination.toES
     val query: Iterable[Query] = {
       val querySeq = indexQuery.kv.toSeq
-      querySeq.flatMap { it =>
+      Iterable(f(querySeq.map { it =>
         val terms = it._2.asInstanceOf[Iterable[String]]
-        Iterable(should(termsQuery(it._1, terms)))
-      }
+        termsQuery(it._1, terms)
+      }))
     }
-    val boolQuery: BoolQuery = f(query).filter(indexQuery.filters)
+    val boolQuery: BoolQuery = must(query).filter(indexQuery.filters)
     logger.debug(s"Query: $boolQuery")
     search(indexQuery.esIndex)
       .bool(boolQuery)