Fixing Patients and Trials parsing, some refined to tryv0.11.1

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala
index 5a2955f..bf1c0fd 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala
@@ -2,6 +2,8 @@ package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
+import eu.timepit.refined.api.Refined
+import eu.timepit.refined.collection.NonEmpty
 import spray.json._
 import xyz.driver.pdsuicommon.domain.{LongId, StringId, User, UuidId}
 import xyz.driver.pdsuidomain.entities._
@@ -9,12 +11,13 @@ import xyz.driver.pdsuidomain.entities._
 object patientissue {
   import DefaultJsonProtocol._
   import common._
+  import xyz.driver.core.json._
 
   def applyUpdateToPatientIssue(json: JsValue, orig: PatientIssue): PatientIssue = {
     json.asJsObject.getFields("text", "archiveRequired") match {
       case Seq(text, archiveRequired) =>
         orig.copy(
-          text = text.convertTo[String],
+          text = text.convertTo[String Refined NonEmpty],
           archiveRequired = archiveRequired.convertTo[Boolean]
         )
 
@@ -31,7 +34,7 @@ object patientissue {
           patientId = patientId,
           lastUpdate = LocalDateTime.MIN,
           isDraft = true,
-          text = text.convertTo[String],
+          text = text.convertTo[String Refined NonEmpty],
           archiveRequired = false
         )
 
@@ -40,7 +43,7 @@ object patientissue {
 
   }
 
-  implicit val patientIssueWriter = new RootJsonWriter[PatientIssue] {
+  implicit val patientIssueWriter: RootJsonWriter[PatientIssue] = new RootJsonWriter[PatientIssue] {
     override def write(obj: PatientIssue) = JsObject(
       "id"              -> obj.id.toJson,
       "text"            -> obj.text.toJson,