From be74ae7c5531af998d38b9de8052791f17b25341 Mon Sep 17 00:00:00 2001 From: ilovehao Date: Thu, 10 Aug 2017 13:43:06 -0700 Subject: Remove the data models of trial location (#19) * Remove the data models of trial location * scalafmt --- .../driver/pdsuidomain/entities/ScrapedTrial.scala | 28 +++------------------- 1 file changed, 3 insertions(+), 25 deletions(-) (limited to 'src/main/scala/xyz/driver') 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, -- cgit v1.2.3