diff options
| author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-08-10 19:25:00 +0600 |
|---|---|---|
| committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-08-11 14:41:30 +0600 |
| commit | 9e60edb6216fce615b13f9bcc68d8f86258b85c3 (patch) | |
| tree | 04ca0ec035cabd617bc215f470166d507cdc4f27 /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala | |
| parent | ef9517e1b8f599fbdd15c474cf7dfea61e803c2f (diff) | |
| download | rest-query-9e60edb6216fce615b13f9bcc68d8f86258b85c3.tar.gz rest-query-9e60edb6216fce615b13f9bcc68d8f86258b85c3.tar.bz2 rest-query-9e60edb6216fce615b13f9bcc68d8f86258b85c3.zip | |
PDSUI-2188 Created and fixed test for json formats of TriC
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala index e7b6d54..c1751bf 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala @@ -1,5 +1,7 @@ package xyz.driver.pdsuidomain.formats.json.sprayformats +import java.time.{ZoneId, ZonedDateTime} + import spray.json._ import xyz.driver.core.json.EnumJsonFormat import xyz.driver.pdsuicommon.domain.{LongId, UuidId} @@ -33,7 +35,7 @@ object trial { JsObject( "id" -> obj.id.toJson, "externalid" -> obj.externalId.toJson, - "lastUpdate" -> obj.lastUpdate.toJson, + "lastUpdate" -> ZonedDateTime.of(obj.lastUpdate, ZoneId.of("Z")).toJson, "status" -> obj.status.toJson, "assignee" -> obj.assignee.toJson, "previousStatus" -> obj.previousStatus.toJson, @@ -57,22 +59,22 @@ object trial { case JsObject(fields) => val hypothesisId = fields .get("hypothesisId") - .map(_.convertTo[UuidId[Hypothesis]]) - .orElse(orig.hypothesisId) + .map(_.convertTo[Option[UuidId[Hypothesis]]]) + .getOrElse(orig.hypothesisId) val studyDesignId = fields .get("studyDesignId") - .map(_.convertTo[LongId[StudyDesign]]) - .orElse(orig.studyDesignId) + .map(_.convertTo[Option[LongId[StudyDesign]]]) + .getOrElse(orig.studyDesignId) val overview = fields .get("overview") - .map(_.convertTo[String]) - .orElse(orig.overview) + .map(_.convertTo[Option[String]]) + .getOrElse(orig.overview) val title = fields .get("title") - .map(_.convertTo[String]) + .map(_.convertTo[Option[String]].getOrElse("")) .getOrElse(orig.title) orig.copy( |