Using EligibilityArm in EligibilityVerificationService definitionv0.8.3

3 files changed, 8 insertions, 6 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityVerificationService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityVerificationService.scala
index c09dd9a..3788617 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityVerificationService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityVerificationService.scala
@@ -6,7 +6,7 @@ import xyz.driver.entities.patient.{CancerType, Patient}
 import xyz.driver.entities.users.AuthUserInfo
 import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuidomain.entities.eligibility.{MatchedPatient, MismatchRankedLabels}
-import xyz.driver.pdsuidomain.entities.Arm
+import xyz.driver.pdsuidomain.entities.EligibilityArm
 
 import scala.concurrent.Future
 import scalaz.ListT
@@ -15,6 +15,8 @@ trait EligibilityVerificationService {
 
   def getMatchedPatients()(implicit ctx: AuthorizedServiceRequestContext[AuthUserInfo]): ListT[Future, MatchedPatient]
 
-  def getMismatchRankedLabels(patientId: Id[Patient], cancerType: CancerType, excludedArms: Seq[LongId[Arm]])(
+  def getMismatchRankedLabels(patientId: Id[Patient],
+                              cancerType: CancerType,
+                              excludedArms: Seq[LongId[EligibilityArm]])(
           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 c9b5443..35c518c 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeEligibilityVerificationService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeEligibilityVerificationService.scala
@@ -7,7 +7,7 @@ import xyz.driver.entities.patient.Patient
 import xyz.driver.entities.users.AuthUserInfo
 import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuidomain.entities.eligibility.MismatchRankedLabels
-import xyz.driver.pdsuidomain.entities.{Arm, eligibility}
+import xyz.driver.pdsuidomain.entities.{EligibilityArm, eligibility}
 import xyz.driver.pdsuidomain.services.EligibilityVerificationService
 
 import scala.concurrent.Future
@@ -22,7 +22,7 @@ class FakeEligibilityVerificationService extends EligibilityVerificationService
 
   override def getMismatchRankedLabels(patientId: Id[Patient],
                                        cancerType: patient.CancerType,
-                                       excludedArms: Seq[LongId[Arm]])(
+                                       excludedArms: Seq[LongId[EligibilityArm]])(
           implicit ctx: AuthorizedServiceRequestContext[AuthUserInfo]): Future[eligibility.MismatchRankedLabels] =
     Future.successful(
       MismatchRankedLabels(
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 8869106..d727d70 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestEligibilityVerificationService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestEligibilityVerificationService.scala
@@ -10,7 +10,7 @@ import xyz.driver.entities.patient.Patient
 import xyz.driver.entities.users.AuthUserInfo
 import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuidomain.entities.eligibility.{MatchedPatient, MismatchRankedLabels}
-import xyz.driver.pdsuidomain.entities.{Arm, eligibility}
+import xyz.driver.pdsuidomain.entities.{EligibilityArm, eligibility}
 import xyz.driver.pdsuidomain.services.EligibilityVerificationService
 
 import scala.concurrent.{ExecutionContext, Future}
@@ -34,7 +34,7 @@ class RestEligibilityVerificationService(transport: ServiceTransport, baseUri: U
 
   override def getMismatchRankedLabels(patientId: Id[Patient],
                                        cancerType: patient.CancerType,
-                                       excludedArms: Seq[LongId[Arm]])(
+                                       excludedArms: Seq[LongId[EligibilityArm]])(
           implicit ctx: AuthorizedServiceRequestContext[AuthUserInfo]): Future[eligibility.MismatchRankedLabels] = {
 
     val query =