diff options
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities')
3 files changed, 15 insertions, 98 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala index 5e743b7..be51e4f 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala @@ -16,12 +16,6 @@ sealed trait InterventionType { object InterventionType { - final case object RadiationTherapy extends InterventionType { - val id: LongId[InterventionType] = LongId[InterventionType](1) - val name: String = "Radiation therapy" - val deliveryMethods: Set[DeliveryMethod] = commonMethods - } - final case object Chemotherapy extends InterventionType { val id: LongId[InterventionType] = LongId[InterventionType](2) val name: String = "Chemotherapy" @@ -40,12 +34,6 @@ object InterventionType { val deliveryMethods: Set[DeliveryMethod] = commonMethods } - final case object Surgery extends InterventionType { - val id: LongId[InterventionType] = LongId[InterventionType](5) - val name: String = "Surgery" - val deliveryMethods: Set[DeliveryMethod] = commonMethods - } - final case object HormoneTherapy extends InterventionType { val id: LongId[InterventionType] = LongId[InterventionType](6) val name: String = "Hormone therapy" @@ -152,7 +140,7 @@ object InterventionType { } } - val commonMethods = Set[DeliveryMethod]( + val commonMethods: Set[DeliveryMethod] = Set[DeliveryMethod]( IntravenousInfusionIV, IntramuscularInjection, SubcutaneousInjection, @@ -166,11 +154,9 @@ object InterventionType { ) val All: Map[LongId[InterventionType], InterventionType] = Map[LongId[InterventionType], InterventionType]( - LongId[InterventionType](1) -> RadiationTherapy, LongId[InterventionType](2) -> Chemotherapy, LongId[InterventionType](3) -> TargetedTherapy, LongId[InterventionType](4) -> Immunotherapy, - LongId[InterventionType](5) -> Surgery, LongId[InterventionType](6) -> HormoneTherapy, LongId[InterventionType](7) -> Other, LongId[InterventionType](8) -> Radiation, diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/ScrapedTrial.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/ScrapedTrial.scala deleted file mode 100644 index e7ee1cb..0000000 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/ScrapedTrial.scala +++ /dev/null @@ -1,81 +0,0 @@ -package xyz.driver.pdsuidomain.entities - -import java.time.LocalDateTime -import java.util.UUID - -import xyz.driver.pdsuicommon.logging._ -import xyz.driver.pdsuicommon.domain.UuidId - -final case class ScrapedStudyDesign(value: String) - -final case class ScrapedOverall(affiliation: String, - status: String, - facilityName: Option[String], - firstName: Option[String], - lastName: Option[String], - phone: Option[String], - phoneExt: Option[String], - email: Option[String], - isBackup: Boolean) - -final case class ScrapedInterventionType(value: String) - -final case class ScrapedIntervention(name: String, - kind: ScrapedInterventionType, - description: Option[String], - isSynonym: Boolean) - -object ScrapedIntervention { - - implicit def toPhiString(x: ScrapedIntervention): PhiString = - phi"ScrapedIntervention(${Unsafe(x.name)})" -} - -final case class ScrapedArm(name: String, kind: Option[String], interventions: Set[ScrapedIntervention]) - -object ScrapedArm { - - implicit def toPhiString(x: ScrapedArm): PhiString = { - import x._ - phi"ScrapedArm(name=${Unsafe(name)}, inverventions=$interventions)" - } -} - -final case class ScrapedTrialChecksum(eligibilityCriteria: String, - briefSummary: String, - detailedDescription: String, - armDescription: String) - -object ScrapedTrialChecksum { - - implicit def toPhiString(x: ScrapedTrialChecksum): PhiString = { - import x._ - phi"ScrapedTrialChecksum(eligibilityCriteria=${Unsafe(eligibilityCriteria)}, briefSummary=${Unsafe(briefSummary)}, " + - phi"detailedDescription=${Unsafe(detailedDescription)}, armDescription=${Unsafe(armDescription)}" - } -} - -object ScrapedTrial { - - implicit def toPhiString(x: ScrapedTrial): PhiString = { - import x._ - phi"ScrapedTrial(rawId=$rawId, nctId=${Unsafe(nctId)}, arms=$arms, checksum=$checksum)" - } -} - -final case class ScrapedTrial(rawId: UuidId[ScrapedTrial], - createdAt: LocalDateTime, - disease: String, - nctId: String, - nctUuid: UUID, - title: Option[String], - startDate: Option[LocalDateTime], - phase: String, - studyDesign: Option[ScrapedStudyDesign], - overall: Set[ScrapedOverall], - // // see ClinicalTrialRaw - // trialHtml: String, - // eligibilityText: String, - lastReviewed: LocalDateTime, - arms: Set[ScrapedArm], - checksum: ScrapedTrialChecksum) diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala index cb75803..2713b4e 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala @@ -49,6 +49,18 @@ object StudyDesign { } } +object TrialCreationRequest { + + implicit def toPhiString(x: TrialCreationRequest): PhiString = phi"${Unsafe(x.toString)}" +} + +final case class TrialCreationRequest(id: UuidId[Trial], + nctId: String, + title: Option[String], + phase: String, + studyDesign: Option[StudyDesign], + lastReviewed: LocalDateTime) + object Trial { sealed trait Status { @@ -67,7 +79,7 @@ object Trial { case object Flagged extends Status case object Archived extends Status - val All = Set[Status]( + val All: Set[Status] = Set[Status]( New, ReviewSummary, Summarized, @@ -79,7 +91,7 @@ object Trial { Archived ) - val AllPrevious = Set[Status](New, ReviewSummary, Summarized, ReviewCriteria) + val AllPrevious: Set[Status] = Set[Status](New, ReviewSummary, Summarized, ReviewCriteria) implicit def toPhiString(x: Status): PhiString = Unsafe(Utils.getClassSimpleName(x.getClass)) } |