aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandr <ognelisar@gmail.com>2017-10-12 16:49:49 +0700
committerAleksandr <ognelisar@gmail.com>2017-10-12 16:49:49 +0700
commit6a925b07d0ffb084cb07051ed334ce17defab128 (patch)
tree84aa1f5b01f2ca707dce55a5d24d866a8e06ddd4
parent91ac9c92f5b8232d22a41885b6d64686e22fcc3d (diff)
downloadrest-query-6a925b07d0ffb084cb07051ed334ce17defab128.tar.gz
rest-query-6a925b07d0ffb084cb07051ed334ce17defab128.tar.bz2
rest-query-6a925b07d0ffb084cb07051ed334ce17defab128.zip
Code is formatted
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibilityarm.scala35
1 files changed, 14 insertions, 21 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibilityarm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibilityarm.scala
index 4b72096..039e088 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibilityarm.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibilityarm.scala
@@ -19,21 +19,19 @@ object eligibilityarm {
deserializationError(s"Expected Json Object as $className, but got $json")
}
-
implicit def eligibilityArmWithDiseasesWriter: RootJsonWriter[EligibilityArmWithDiseases] =
new RootJsonWriter[EligibilityArmWithDiseases] {
override def write(obj: EligibilityArmWithDiseases): JsValue = {
JsObject(
- "id" -> obj.eligibilityArm.id.toJson,
- "name" -> obj.eligibilityArm.name.toJson,
+ "id" -> obj.eligibilityArm.id.toJson,
+ "name" -> obj.eligibilityArm.name.toJson,
"originalName" -> obj.eligibilityArm.originalName.toJson,
- "trialId" -> obj.eligibilityArm.trialId.toJson,
- "diseases" -> obj.eligibilityArmDiseases.map(_.disease.toJson).toJson
+ "trialId" -> obj.eligibilityArm.trialId.toJson,
+ "diseases" -> obj.eligibilityArmDiseases.map(_.disease.toJson).toJson
)
}
}
-
implicit def eligibilityArmWithDiseasesReader: RootJsonReader[EligibilityArmWithDiseases] = {
new RootJsonReader[EligibilityArmWithDiseases] {
implicit val className: String = "create EligibilityArmWithDiseases"
@@ -56,8 +54,6 @@ object eligibilityarm {
.map(_.convertTo[Seq[String]])
.getOrElse(deserializationErrorFieldMessage("diseases", json))
-
-
val eligibilityArm = EligibilityArm(
id = LongId(0),
name = name,
@@ -80,7 +76,8 @@ object eligibilityarm {
}
}
- def applyUpdateToEligibilityArmWithDiseases(json: JsValue, orig: EligibilityArmWithDiseases): EligibilityArmWithDiseases = {
+ def applyUpdateToEligibilityArmWithDiseases(json: JsValue,
+ orig: EligibilityArmWithDiseases): EligibilityArmWithDiseases = {
implicit val className: String = "update EligibilityArmWithDiseases"
json match {
case JsObject(fields) =>
@@ -95,18 +92,14 @@ object eligibilityarm {
.getOrElse(orig.eligibilityArmDiseases.map(_.disease))
orig.copy(
- eligibilityArm =
- orig
- .eligibilityArm
- .copy(name = name),
- eligibilityArmDiseases =
- orig
- .eligibilityArmDiseases
- .zip(diseases)
- .map {
- case (eligibilityArmDisease, disease) =>
- eligibilityArmDisease.copy(disease = disease)
- }
+ eligibilityArm = orig.eligibilityArm
+ .copy(name = name),
+ eligibilityArmDiseases = orig.eligibilityArmDiseases
+ .zip(diseases)
+ .map {
+ case (eligibilityArmDisease, disease) =>
+ eligibilityArmDisease.copy(disease = disease)
+ }
)
case _ => deserializationErrorEntityMessage(json)