Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 0 additions & 47 deletions app/models/Backend.scala
Original file line number Diff line number Diff line change
Expand Up @@ -640,53 +640,6 @@ class Backend @Inject() (implicit
prioritisationFt.flatMap(identity)
}

def getKnownDrugs(
queryString: String,
kv: Map[String, String],
sizeLimit: Option[Int],
cursor: Option[String]
): Future[Option[KnownDrugs]] = {

val pag = Pagination(0, sizeLimit.getOrElse(Pagination.sizeDefault))
val sortByField = sort.FieldSort(field = "phase").desc()
val cbIndex = getIndexOrDefault("known_drugs")

val mappedValues =
Seq(keyValue("index", cbIndex)) ++ kv.map(pair => keyValue(pair._1, pair._2)).toSeq

logger.debug(s"querying known drugs", mappedValues*)

val aggs = Seq(
cardinalityAgg("uniqueTargets", "targetId.raw"),
cardinalityAgg("uniqueDiseases", "diseaseId.raw"),
cardinalityAgg("uniqueDrugs", "drugId.raw"),
valueCountAgg("rowsCount", "drugId.raw")
)

esRetriever
.getByFreeQuery(
cbIndex,
queryString,
kv,
pag,
fromJsValue[KnownDrug],
aggs,
Some(sortByField),
Seq("ancestors", "descendants"),
cursor
)
.map {
case (Seq(), _, _) => Some(KnownDrugs(0, 0, 0, 0, cursor, Seq()))
case (seq, agg, nextCursor) =>
logger.trace(Json.prettyPrint(agg))
val drugs = (agg \ "uniqueDrugs" \ "value").as[Long]
val diseases = (agg \ "uniqueDiseases" \ "value").as[Long]
val targets = (agg \ "uniqueTargets" \ "value").as[Long]
val rowsCount = (agg \ "rowsCount" \ "value").as[Long]
Some(KnownDrugs(drugs, diseases, targets, rowsCount, nextCursor, seq))
}
}

def getEvidencesByVariantId(
datasourceIds: Option[Seq[String]],
variantId: String,
Expand Down
6 changes: 0 additions & 6 deletions app/models/entities/Drug.scala
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ case class IndicationRow(
references: Option[Seq[IndicationReference]]
)

case class LinkedIds(count: Int, rows: Seq[String])

case class Indications(
id: String,
indications: Seq[IndicationRow],
Expand Down Expand Up @@ -70,21 +68,17 @@ case class Drug(
synonyms: Seq[String],
tradeNames: Seq[String],
childChemblIds: Option[Seq[String]], // Gone?
yearOfFirstApproval: Option[Int],
drugType: String,
isApproved: Option[Boolean],
crossReferences: Option[Seq[DrugReferences]],
parentId: Option[String],
maximumClinicalTrialPhase: Option[Double],
hasBeenWithdrawn: Boolean,
linkedDiseases: Option[LinkedIds],
linkedTargets: Option[LinkedIds],
blackBoxWarning: Boolean,
description: Option[String]
)

object Drug {
implicit val linkedIdsImpW: OFormat[LinkedIds] = Json.format[models.entities.LinkedIds]
// implicit val drugWarningRefenceImpW = Json.format[models.entities.DrugWarningReference]
implicit val drugWarningsReferenceImpR: Reads[models.entities.DrugWarningReference] = (
(JsPath \ "ref_id").read[String] and
Expand Down
75 changes: 0 additions & 75 deletions app/models/entities/KnownDrug.scala

This file was deleted.

Loading