From 7bf2da3afbde1b4cec0d68cb4899e51a63e8a9b1 Mon Sep 17 00:00:00 2001 From: Kseniya Tomskikh Date: Mon, 28 Aug 2017 15:27:40 +0700 Subject: Created custom formats of TriC for swagger --- .../driver/pdsuidomain/fakes/entities/common.scala | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala (limited to 'src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala') diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala new file mode 100644 index 0000000..fbab2ce --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala @@ -0,0 +1,34 @@ +package xyz.driver.pdsuidomain.fakes.entities + +import java.time.{LocalDate, LocalDateTime, LocalTime} + +import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId} +import xyz.driver.pdsuidomain.entities.{Trial, TrialHistory} + +object common { + import xyz.driver.core.generators + + def nextUuidId[T] = UuidId[T](generators.nextUuid()) + + def nextLongId[T] = LongId[T](generators.nextInt(Int.MaxValue).toLong) + + def nextStringId[T] = StringId[T](generators.nextString(maxLength = 20)) + + def nextTrialStatus = generators.oneOf[Trial.Status](Trial.Status.All) + + def nextPreviousTrialStatus = generators.oneOf[Trial.Status](Trial.Status.AllPrevious) + + def nextLocalDateTime = LocalDateTime.of(nextLocalDate, LocalTime.MIDNIGHT) + + def nextLocalDate = { + val date = generators.nextDate() + LocalDate.of(date.year, date.month, date.day) + } + + def nextCondition = generators.oneOf[Trial.Condition](Trial.Condition.All) + + def nextTrialAction = generators.oneOf[TrialHistory.Action](TrialHistory.Action.All) + + def nextTrialState = generators.oneOf[TrialHistory.State](TrialHistory.State.All) + +} -- cgit v1.2.3 From f1f9740b7d301c4e7cc7c5c2e38f7661ea0cfbb5 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Thu, 14 Sep 2017 13:32:50 -0700 Subject: Fix random date generation --- src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala') diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala index fbab2ce..52d7b98 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala @@ -22,7 +22,7 @@ object common { def nextLocalDate = { val date = generators.nextDate() - LocalDate.of(date.year, date.month, date.day) + LocalDate.of(date.year, date.month + 1, date.day + 1) } def nextCondition = generators.oneOf[Trial.Condition](Trial.Condition.All) -- cgit v1.2.3 From d4b18efda238f506103dddbf3b400ae17c797276 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Tue, 19 Sep 2017 22:02:44 -0700 Subject: Fix date generation --- .../scala/xyz/driver/pdsuidomain/fakes/entities/common.scala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala') diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala index 52d7b98..b259b07 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala @@ -4,6 +4,7 @@ import java.time.{LocalDate, LocalDateTime, LocalTime} import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId} import xyz.driver.pdsuidomain.entities.{Trial, TrialHistory} +import scala.util.Random object common { import xyz.driver.core.generators @@ -20,10 +21,11 @@ object common { def nextLocalDateTime = LocalDateTime.of(nextLocalDate, LocalTime.MIDNIGHT) - def nextLocalDate = { - val date = generators.nextDate() - LocalDate.of(date.year, date.month + 1, date.day + 1) - } + def nextLocalDate = LocalDate.of( + 1970 + Random.nextInt(68), + 1 + Random.nextInt(12), + 1 + Random.nextInt(28) // all months have at least 28 days + ) def nextCondition = generators.oneOf[Trial.Condition](Trial.Condition.All) -- cgit v1.2.3