Making EligibilityVerificationService to accept AuthorizedServiceRequestContextv0.5.5

3 files changed, 17 insertions, 12 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityVerificationService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityVerificationService.scala
index d3e977e..7cb1228 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityVerificationService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityVerificationService.scala
@@ -1,8 +1,9 @@
 package xyz.driver.pdsuidomain.services
 
 import xyz.driver.core.Id
-import xyz.driver.core.rest.ServiceRequestContext
+import xyz.driver.core.rest.AuthorizedServiceRequestContext
 import xyz.driver.entities.patient.CancerType
+import xyz.driver.entities.users.AuthUserInfo
 import xyz.driver.pdsuidomain.entities.eligibility.{MatchedPatient, MismatchRankedLabels}
 import xyz.driver.pdsuidomain.entities.{Arm, Patient}
 
@@ -11,8 +12,8 @@ import scalaz.ListT
 
 trait EligibilityVerificationService {
 
-  def getMatchedPatients()(implicit ctx: ServiceRequestContext): ListT[Future, MatchedPatient]
+  def getMatchedPatients()(implicit ctx: AuthorizedServiceRequestContext[AuthUserInfo]): ListT[Future, MatchedPatient]
 
   def getMismatchRankedLabels(patientId: Id[Patient], cancerType: CancerType, excludedArms: Seq[Id[Arm]])(
-          implicit ctx: ServiceRequestContext): Future[MismatchRankedLabels]
+          implicit ctx: AuthorizedServiceRequestContext[AuthUserInfo]): Future[MismatchRankedLabels]
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeEligibilityVerificationService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeEligibilityVerificationService.scala
index c5531f9..3633c2d 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeEligibilityVerificationService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeEligibilityVerificationService.scala
@@ -1,8 +1,9 @@
 package xyz.driver.pdsuidomain.services.fake
 
-import xyz.driver.core.rest.ServiceRequestContext
+import xyz.driver.core.rest.AuthorizedServiceRequestContext
 import xyz.driver.core.{Id, generators}
 import xyz.driver.entities.patient
+import xyz.driver.entities.users.AuthUserInfo
 import xyz.driver.pdsuidomain.entities.eligibility.MismatchRankedLabels
 import xyz.driver.pdsuidomain.entities.{Arm, Patient, eligibility}
 import xyz.driver.pdsuidomain.services.EligibilityVerificationService
@@ -12,14 +13,15 @@ import scalaz.ListT
 
 class FakeEligibilityVerificationService extends EligibilityVerificationService {
 
-  override def getMatchedPatients()(implicit ctx: ServiceRequestContext): ListT[Future, eligibility.MatchedPatient] =
+  override def getMatchedPatients()(
+          implicit ctx: AuthorizedServiceRequestContext[AuthUserInfo]): ListT[Future, eligibility.MatchedPatient] =
     ListT.listT[Future](
       Future.successful(List(xyz.driver.pdsuidomain.fakes.entities.eligibility.nextMatchedPatient())))
 
-  override def getMismatchRankedLabels(
-          patientId: Id[Patient],
-          cancerType: patient.CancerType,
-          excludedArms: Seq[Id[Arm]])(implicit ctx: ServiceRequestContext): Future[eligibility.MismatchRankedLabels] =
+  override def getMismatchRankedLabels(patientId: Id[Patient],
+                                       cancerType: patient.CancerType,
+                                       excludedArms: Seq[Id[Arm]])(
+          implicit ctx: AuthorizedServiceRequestContext[AuthUserInfo]): Future[eligibility.MismatchRankedLabels] =
     Future.successful(
       MismatchRankedLabels(
         generators.seqOf(xyz.driver.pdsuidomain.fakes.entities.eligibility.nextLabelMismatchRank()),
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestEligibilityVerificationService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestEligibilityVerificationService.scala
index 07757e3..5a5ede7 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestEligibilityVerificationService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestEligibilityVerificationService.scala
@@ -4,8 +4,9 @@ import akka.http.scaladsl.model.Uri
 import akka.stream.Materializer
 import spray.json.DefaultJsonProtocol
 import xyz.driver.core.Id
-import xyz.driver.core.rest.{RestService, ServiceRequestContext, ServiceTransport}
+import xyz.driver.core.rest.{AuthorizedServiceRequestContext, RestService, ServiceTransport}
 import xyz.driver.entities.patient
+import xyz.driver.entities.users.AuthUserInfo
 import xyz.driver.pdsuidomain.entities.eligibility.{MatchedPatient, MismatchRankedLabels}
 import xyz.driver.pdsuidomain.entities.{Arm, Patient, eligibility}
 import xyz.driver.pdsuidomain.services.EligibilityVerificationService
@@ -23,7 +24,8 @@ class RestEligibilityVerificationService(transport: ServiceTransport, baseUri: U
   import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
   import xyz.driver.pdsuidomain.formats.json.sprayformats.eligibility._
 
-  override def getMatchedPatients()(implicit ctx: ServiceRequestContext): ListT[Future, eligibility.MatchedPatient] = {
+  override def getMatchedPatients()(
+          implicit ctx: AuthorizedServiceRequestContext[AuthUserInfo]): ListT[Future, eligibility.MatchedPatient] = {
     val request = get(baseUri, s"/v1/patients")
     listResponse[MatchedPatient](transport.sendRequest(ctx)(request))
   }
@@ -31,7 +33,7 @@ class RestEligibilityVerificationService(transport: ServiceTransport, baseUri: U
   override def getMismatchRankedLabels(patientId: Id[Patient],
                                        cancerType: patient.CancerType,
                                        excludedArms: Seq[Id[Arm]])(
-          implicit ctx: ServiceRequestContext): Future[eligibility.MismatchRankedLabels] = {
+          implicit ctx: AuthorizedServiceRequestContext[AuthUserInfo]): Future[eligibility.MismatchRankedLabels] = {
 
     val query =
       Seq("disease" -> cancerType.toString.toUpperCase, "ineligible_arms" -> excludedArms.map(_.value).mkString(","))