aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorilovehao <hhuang@driver.xyz>2017-08-10 13:43:06 -0700
committerGitHub <noreply@github.com>2017-08-10 13:43:06 -0700
commitbe74ae7c5531af998d38b9de8052791f17b25341 (patch)
tree291aad37e2dd7864df5c5418991517584841a178
parentc0f720e1d2529068abd9d80e4ee8f4d7517f527e (diff)
downloadrest-query-be74ae7c5531af998d38b9de8052791f17b25341.tar.gz
rest-query-be74ae7c5531af998d38b9de8052791f17b25341.tar.bz2
rest-query-be74ae7c5531af998d38b9de8052791f17b25341.zip
Remove the data models of trial location (#19)v0.2.16
* Remove the data models of trial location * scalafmt
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/entities/ScrapedTrial.scala28
1 files changed, 3 insertions, 25 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/ScrapedTrial.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/ScrapedTrial.scala
index 87c5fd9..e7ee1cb 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/ScrapedTrial.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/ScrapedTrial.scala
@@ -18,27 +18,6 @@ final case class ScrapedOverall(affiliation: String,
email: Option[String],
isBackup: Boolean)
-final case class ScrapedLocationContact(firstName: Option[String],
- lastName: Option[String],
- phone: Option[String],
- phoneExt: Option[String],
- email: Option[String],
- isBackup: Boolean)
-
-final case class ScrapedLocation(id: UuidId[ScrapedLocation],
- createdAt: LocalDateTime,
- facilityName: Option[String],
- city: Option[String],
- state: Option[String],
- zip: Option[String],
- country: Option[String],
- latitude: Option[Double],
- longitude: Option[Double],
- preferredName: Option[String],
- partnershipStatus: Option[String],
- lastReviewed: LocalDateTime,
- contacts: Set[ScrapedLocationContact])
-
final case class ScrapedInterventionType(value: String)
final case class ScrapedIntervention(name: String,
@@ -48,7 +27,8 @@ final case class ScrapedIntervention(name: String,
object ScrapedIntervention {
- implicit def toPhiString(x: ScrapedIntervention): PhiString = phi"ScrapedIntervention(${Unsafe(x.name)})"
+ implicit def toPhiString(x: ScrapedIntervention): PhiString =
+ phi"ScrapedIntervention(${Unsafe(x.name)})"
}
final case class ScrapedArm(name: String, kind: Option[String], interventions: Set[ScrapedIntervention])
@@ -79,8 +59,7 @@ object ScrapedTrial {
implicit def toPhiString(x: ScrapedTrial): PhiString = {
import x._
- phi"ScrapedTrial(rawId=$rawId, nctId=${Unsafe(nctId)}, " +
- phi"location.size=${Unsafe(locations.size)}, arms=$arms, checksum=$checksum)"
+ phi"ScrapedTrial(rawId=$rawId, nctId=${Unsafe(nctId)}, arms=$arms, checksum=$checksum)"
}
}
@@ -94,7 +73,6 @@ final case class ScrapedTrial(rawId: UuidId[ScrapedTrial],
phase: String,
studyDesign: Option[ScrapedStudyDesign],
overall: Set[ScrapedOverall],
- locations: Set[ScrapedLocation],
// // see ClinicalTrialRaw
// trialHtml: String,
// eligibilityText: String,