Latest PDS UI utils

3 files changed, 19 insertions, 11 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala
index 2788bf2..7a65af8 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala
@@ -21,7 +21,7 @@ final case class ApiCriterionLabel(labelId: Option[Long],
     categoryId = categoryId.map(LongId[Category]),
     value = value.map {
       case "Yes" => true
-      case "No" => false
+      case "No"  => false
     },
     isDefining = isDefining
   )
@@ -41,9 +41,13 @@ object ApiCriterionLabel {
   implicit val format: Format[ApiCriterionLabel] = (
     (JsPath \ "labelId").formatNullable[Long] and
       (JsPath \ "categoryId").formatNullable[Long] and
-      (JsPath \ "value").formatNullable[String](Format(Reads.of[String].filter(ValidationError("unknown value"))({ x =>
-        x == "Yes" || x == "No"
-      }), Writes.of[String])) and
+      (JsPath \ "value").formatNullable[String](
+        Format(Reads
+                 .of[String]
+                 .filter(ValidationError("unknown value"))({ x =>
+                   x == "Yes" || x == "No"
+                 }),
+               Writes.of[String])) and
       (JsPath \ "isDefining").format[Boolean]
-    ) (ApiCriterionLabel.apply, unlift(ApiCriterionLabel.unapply))
+  )(ApiCriterionLabel.apply, unlift(ApiCriterionLabel.unapply))
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiExtractedDataLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiExtractedDataLabel.scala
index 9159d27..cb45025 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiExtractedDataLabel.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiExtractedDataLabel.scala
@@ -22,11 +22,15 @@ object ApiExtractedDataLabel {
   implicit val format: Format[ApiExtractedDataLabel] = (
     (JsPath \ "id").formatNullable[Long] and
       (JsPath \ "categoryId").formatNullable[Long] and
-      (JsPath \ "value").formatNullable[String](Format(Reads.of[String].filter(ValidationError("unknown value"))({
-        case x if FuzzyValue.fromString.isDefinedAt(x) => true
-        case _ => false
-      }), Writes.of[String]))
-    ) (ApiExtractedDataLabel.apply, unlift(ApiExtractedDataLabel.unapply))
+      (JsPath \ "value").formatNullable[String](
+        Format(Reads
+                 .of[String]
+                 .filter(ValidationError("unknown value"))({
+                   case x if FuzzyValue.fromString.isDefinedAt(x) => true
+                   case _                                         => false
+                 }),
+               Writes.of[String]))
+  )(ApiExtractedDataLabel.apply, unlift(ApiExtractedDataLabel.unapply))
 
   def fromDomain(dataLabel: ExtractedDataLabel) = ApiExtractedDataLabel(
     id = dataLabel.labelId.map(_.id),
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiLabel.scala
index 8c30f3a..042b380 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiLabel.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiLabel.scala
@@ -12,7 +12,7 @@ object ApiLabel {
     (JsPath \ "id").format[Long] and
       (JsPath \ "name").format[String] and
       (JsPath \ "categoryId").format[Long]
-    ) (ApiLabel.apply, unlift(ApiLabel.unapply))
+  )(ApiLabel.apply, unlift(ApiLabel.unapply))
 
   def fromDomain(x: Label) = ApiLabel(
     id = x.id.id,