refactor query term validation

opentargets · Nov 18, 2024 · 6a544a0 · 6a544a0
1 parent 45aec0d
commit 6a544a0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/app/models/Backend.scala b/app/models/Backend.scala
@@ -578,12 +578,14 @@ class Backend @Inject() (implicit
       e <- defaultESSettings.entities
       if (entityNames.contains(e.name) && e.searchIndex.isDefined)
     } yield e
-    withQueryTermsNumberValidation(queryTerms, defaultOTSettings.qValidationLimitNTerms) match {
-      case Success(terms) =>
-        esRetriever.getTermsResultsMapping(entities, terms)
-      case Failure(error) =>
-        Future.failed(error)
-    }
+    esRetriever.getTermsResultsMapping(entities, queryTerms)
+
+    // withQueryTermsNumberValidation(queryTerms, defaultOTSettings.qValidationLimitNTerms) match {
+    //   case Success(terms) =>
+    //     esRetriever.getTermsResultsMapping(entities, terms)
+    //   case Failure(error) =>
+    //     Future.failed(error)
+    // }
 
   }
 

diff --git a/app/models/GQLSchema.scala b/app/models/GQLSchema.scala
@@ -7,13 +7,14 @@ import entities._
 import models.entities.CredibleSet.credibleSetImp
 import models.entities.GwasIndex.gwasImp
 import sangria.execution.deferred._
-
+import gql.validators.QueryTermsValidator._
 import scala.concurrent.ExecutionContext.Implicits.global
 import models.entities.Interaction._
 import models.gql.Objects._
 import models.gql.Arguments._
 import models.gql.Fetchers._
-import org.checkerframework.checker.units.qual.C
+import scala.concurrent._
+import scala.util.{Try, Failure, Success}
 
 trait GQLEntities extends Logging {}
 
@@ -116,7 +117,10 @@ object GQLSchema {
         arguments = queryTerms :: entityNames :: Nil,
         resolve = ctx => {
           val entities = ctx.arg(entityNames).getOrElse(Seq.empty)
-          ctx.ctx.mapIds(ctx.arg(queryTerms), entities)
+          withQueryTermsNumberValidation(ctx.arg(queryTerms), Pagination.sizeMax) match {
+            case Success(terms) => ctx.ctx.mapIds(terms, entities)
+            case Failure(error) => Future.failed(error)
+          }
         }
       ),
       Field(