diff options
author | vlad <vlad@driver.xyz> | 2017-10-30 14:36:01 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-10-30 14:36:01 -0700 |
commit | 18c226b95abbb1c86067bc62cd5c0260bf3af6d1 (patch) | |
tree | 9156ff4fc36618c3949a4deff577cecbc6ba642a /src/main/scala/xyz | |
parent | 78f467dd0b3b9f35bb49ae973b26fb37c458b138 (diff) | |
download | rest-query-18c226b95abbb1c86067bc62cd5c0260bf3af6d1.tar.gz rest-query-18c226b95abbb1c86067bc62cd5c0260bf3af6d1.tar.bz2 rest-query-18c226b95abbb1c86067bc62cd5c0260bf3af6d1.zip |
Rolling back some Refined codev0.11.2
Diffstat (limited to 'src/main/scala/xyz')
3 files changed, 4 insertions, 9 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala index 7f17419..f616754 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala @@ -2,8 +2,6 @@ package xyz.driver.pdsuidomain.entities import java.time.LocalDateTime -import eu.timepit.refined.api.Refined -import eu.timepit.refined.collection.NonEmpty import xyz.driver.pdsuicommon.domain._ import xyz.driver.pdsuicommon.logging._ @@ -12,7 +10,7 @@ final case class PatientIssue(id: LongId[PatientIssue], patientId: UuidId[Patient], lastUpdate: LocalDateTime, isDraft: Boolean, - text: String Refined NonEmpty, + text: String, archiveRequired: Boolean) object PatientIssue { diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala index 2780526..3c14a37 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala @@ -182,7 +182,7 @@ object treatmentmatching { patientId = nextUuidId[Patient], lastUpdate = nextLocalDateTime, isDraft = generators.nextBoolean(), - text = generators.nextNonEmptyString(), + text = generators.nextString(), archiveRequired = generators.nextBoolean() ) 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 bf1c0fd..9345581 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala @@ -2,8 +2,6 @@ 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._ @@ -11,13 +9,12 @@ 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 Refined NonEmpty], + text = text.convertTo[String], archiveRequired = archiveRequired.convertTo[Boolean] ) @@ -34,7 +31,7 @@ object patientissue { patientId = patientId, lastUpdate = LocalDateTime.MIN, isDraft = true, - text = text.convertTo[String Refined NonEmpty], + text = text.convertTo[String], archiveRequired = false ) |