From 78f467dd0b3b9f35bb49ae973b26fb37c458b138 Mon Sep 17 00:00:00 2001 From: vlad Date: Mon, 30 Oct 2017 14:21:55 -0700 Subject: Fixing Patients and Trials parsing, some refined to try --- .../scala/xyz/driver/pdsuidomain/entities/PatientHypothesis.scala | 4 +++- src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities') diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHypothesis.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHypothesis.scala index 23bb546..7943fb9 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHypothesis.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHypothesis.scala @@ -1,5 +1,7 @@ package xyz.driver.pdsuidomain.entities +import eu.timepit.refined.api.Refined +import eu.timepit.refined.numeric.NonNegative import xyz.driver.pdsuicommon.domain.UuidId import xyz.driver.pdsuicommon.logging._ @@ -15,4 +17,4 @@ final case class PatientHypothesis(id: UuidId[PatientHypothesis], patientId: UuidId[Patient], hypothesisId: UuidId[Hypothesis], rationale: Option[String], - matchedTrials: Long) + matchedTrials: Long Refined NonNegative) diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala index f616754..7f17419 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala @@ -2,6 +2,8 @@ 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._ @@ -10,7 +12,7 @@ final case class PatientIssue(id: LongId[PatientIssue], patientId: UuidId[Patient], lastUpdate: LocalDateTime, isDraft: Boolean, - text: String, + text: String Refined NonEmpty, archiveRequired: Boolean) object PatientIssue { -- cgit v1.2.3