diff options
Diffstat (limited to 'src/main')
4 files changed, 10 insertions, 30 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala b/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala index 42f7435..5c07a9a 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala @@ -1,10 +1,12 @@ package xyz.driver.pdsuicommon.auth -import xyz.driver.entities.users.UserInfo +import xyz.driver.entities.users.AuthUserInfo import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuicommon.domain.User -class AuthenticatedRequestContext(val driverUser: UserInfo, override val requestId: RequestId, val authToken: String) +class AuthenticatedRequestContext(val driverUser: AuthUserInfo, + override val requestId: RequestId, + val authToken: String) extends AnonymousRequestContext(requestId) { val executor: User = new User(driverUser) @@ -25,7 +27,7 @@ class AuthenticatedRequestContext(val driverUser: UserInfo, override val request object AuthenticatedRequestContext { - def apply(driverUser: UserInfo, authToken: String = "") = + def apply(driverUser: AuthUserInfo, authToken: String = "") = new AuthenticatedRequestContext(driverUser, RequestId(), authToken) implicit def toPhiString(x: AuthenticatedRequestContext): PhiString = { diff --git a/src/main/scala/xyz/driver/pdsuicommon/domain/User.scala b/src/main/scala/xyz/driver/pdsuicommon/domain/User.scala index 654af1a..f75f391 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/domain/User.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/domain/User.scala @@ -15,7 +15,7 @@ final case class User(id: StringId[User], latestActivity: Option[LocalDateTime], deleted: Option[LocalDateTime]) { - def this(driverUser: xyz.driver.entities.users.UserInfo) { + def this(driverUser: xyz.driver.entities.users.AuthUserInfo) { this( id = StringId[xyz.driver.pdsuicommon.domain.User](driverUser.id.value), email = Email(driverUser.email.toString), 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, diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala index 3638ac9..0ff29ef 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala @@ -123,6 +123,6 @@ trait RestHelper { case _ => Map() } - new ServiceRequestContext(contextHeaders = auth) + new ServiceRequestContext(contextHeaders = auth, trackingId = requestContext.requestId.value) } } |