fixing test in CriterionFormatSuite

9 files changed, 17 insertions, 14 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/SlotArms.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/SlotArms.scala
index 8363c7e..932de38 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/SlotArms.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/SlotArms.scala
@@ -18,4 +18,3 @@ object SlotArm {
     phi"Arm(id=$id, name=${Unsafe(x.name)}, trialId=${Unsafe(x.trialId)})"
   }
 }
-
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityArm.scala
index 51821d8..e7eb022 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityArm.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityArm.scala
@@ -24,7 +24,7 @@ object ApiEligibilityArm {
       (JsPath \ "name").format[String] and
       (JsPath \ "originalName").format[String] and
       (JsPath \ "trialId").format[String]
-    )(ApiEligibilityArm.apply, unlift(ApiEligibilityArm.unapply))
+  )(ApiEligibilityArm.apply, unlift(ApiEligibilityArm.unapply))
 
   def fromDomain(arm: EligibilityArm): ApiEligibilityArm = ApiEligibilityArm(
     id = arm.id.id,
@@ -32,4 +32,4 @@ object ApiEligibilityArm {
     originalName = arm.originalName,
     trialId = arm.trialId.id
   )
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityCreateArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityCreateArm.scala
index a31182f..6f55c10 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityCreateArm.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityCreateArm.scala
@@ -4,7 +4,6 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuidomain.entities.EligibilityArm
 import play.api.libs.json.{Format, Json}
 
-
 final case class ApiCreateEligibilityArm(name: String, trialId: String) {
 
   def toDomain = EligibilityArm(
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiPartialSlotArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiPartialSlotArm.scala
index 06696fd..2f8e93f 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiPartialSlotArm.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiPartialSlotArm.scala
@@ -1,6 +1,5 @@
 package xyz.driver.pdsuidomain.formats.json.slotarm
 
-
 import xyz.driver.pdsuidomain.entities.SlotArm
 import play.api.libs.json.{Format, Json}
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiSlotArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiSlotArm.scala
index 2e26a01..375c1a2 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiSlotArm.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiSlotArm.scala
@@ -24,7 +24,7 @@ object ApiSlotArm {
       (JsPath \ "name").format[String] and
       (JsPath \ "originalName").format[String] and
       (JsPath \ "trialId").format[String]
-    )(ApiSlotArm.apply, unlift(ApiSlotArm.unapply))
+  )(ApiSlotArm.apply, unlift(ApiSlotArm.unapply))
 
   def fromDomain(arm: SlotArm): ApiSlotArm = ApiSlotArm(
     id = arm.id.id,
@@ -32,4 +32,4 @@ object ApiSlotArm {
     originalName = arm.originalName,
     trialId = arm.trialId.id
   )
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala
index fdefa65..7dbf0d9 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala
@@ -21,7 +21,9 @@ object CriterionService {
     def userMessage: String = "Access denied"
   }
 
-  final case class RichCriterion(criterion: Criterion, armIds: Seq[LongId[EligibilityArm]], labels: Seq[CriterionLabel])
+  final case class RichCriterion(criterion: Criterion,
+                                 armIds: Seq[LongId[EligibilityArm]],
+                                 labels: Seq[CriterionLabel])
   object RichCriterion {
     implicit def toPhiString(x: RichCriterion): PhiString = {
       import x._
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityArmService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityArmService.scala
index fc28e5f..b34b34e 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityArmService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityArmService.scala
@@ -114,11 +114,14 @@ trait EligibilityArmService {
              pagination: Option[Pagination] = None)(
           implicit requestContext: AuthenticatedRequestContext): Future[GetListReply]
 
-  def getById(armId: LongId[EligibilityArm])(implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply]
+  def getById(armId: LongId[EligibilityArm])(
+          implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply]
 
-  def create(draftEligibilityArm: EligibilityArm)(implicit requestContext: AuthenticatedRequestContext): Future[CreateReply]
+  def create(draftEligibilityArm: EligibilityArm)(
+          implicit requestContext: AuthenticatedRequestContext): Future[CreateReply]
 
-  def update(origEligibilityArm: EligibilityArm, draftEligibilityArm: EligibilityArm)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply]
+  def update(origEligibilityArm: EligibilityArm, draftEligibilityArm: EligibilityArm)(
+          implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply]
 
   def delete(id: LongId[EligibilityArm])(implicit requestContext: AuthenticatedRequestContext): Future[DeleteReply]
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/SlotArmService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/SlotArmService.scala
index 3c55909..af7084b 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/SlotArmService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/SlotArmService.scala
@@ -118,7 +118,8 @@ trait SlotArmService {
 
   def create(draftSlotArm: SlotArm)(implicit requestContext: AuthenticatedRequestContext): Future[CreateReply]
 
-  def update(origSlotArm: SlotArm, draftSlotArm: SlotArm)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply]
+  def update(origSlotArm: SlotArm, draftSlotArm: SlotArm)(
+          implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply]
 
   def delete(id: LongId[SlotArm])(implicit requestContext: AuthenticatedRequestContext): Future[DeleteReply]
 }
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/CriterionFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/CriterionFormatSuite.scala
index d24c4c1..9601834 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/CriterionFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/CriterionFormatSuite.scala
@@ -3,7 +3,7 @@ package xyz.driver.pdsuidomain.formats.json.sprayformats
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
 import xyz.driver.pdsuicommon.domain.{LongId, StringId}
-import xyz.driver.pdsuidomain.entities.{Arm, Criterion, CriterionLabel}
+import xyz.driver.pdsuidomain.entities.{EligibilityArm, Criterion, CriterionLabel}
 import xyz.driver.pdsuidomain.services.CriterionService.RichCriterion
 
 class CriterionFormatSuite extends FlatSpec with Matchers {
@@ -35,7 +35,7 @@ class CriterionFormatSuite extends FlatSpec with Matchers {
         isDefining = true
       )
     )
-    val arms = List(LongId[Arm](20), LongId[Arm](21), LongId[Arm](21))
+    val arms = List(LongId[EligibilityArm](20), LongId[EligibilityArm](21), LongId[EligibilityArm](21))
     val richCriterion = RichCriterion(
       criterion = criterion,
       armIds = arms,