1 files changed, 26 insertions, 26 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/MedicalRecordGen.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/MedicalRecordGen.scala
index 0ea3cdd..90c98c3 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/MedicalRecordGen.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/MedicalRecordGen.scala
@@ -7,31 +7,31 @@ import xyz.driver.pdsuicommon.domain.{LongId, TextJson, User}
 import xyz.driver.pdsuidomain.fakes.entities.common.{nextLocalDateTime, nextLongId, nextStringId, nextUuidId}
 
 object MedicalRecordGen {
-  private val maxItemsInCollectionNumber = 50
+  private val maxItemsInCollectionNumber: Int = 50
 
-  private val pageMaxNumber = 1000
+  private val pageMaxNumber: Int = 1000
 
-  private val medicalRecordMetas = {
+  private val medicalRecordMetas: Set[() => MedicalRecord.Meta] = {
     Set(
-      () => nextMedicalRecordMetaReorder,
-      () => nextMedicalRecordMetaDuplicate,
-      () => nextMedicalRecordMetaRotation
+      () => nextMedicalRecordMetaReorder(),
+      () => nextMedicalRecordMetaDuplicate(),
+      () => nextMedicalRecordMetaRotation()
     )
   }
 
   def nextMedicalRecordMetas(count: Int): List[MedicalRecord.Meta] =
-    List.fill(count)(nextMedicalRecordMeta)
+    List.fill(count)(nextMedicalRecordMeta())
 
-  private def nextMedicalRecordMetasJson: TextJson[List[MedicalRecord.Meta]] =
+  def nextMedicalRecordMetasJson(): TextJson[List[MedicalRecord.Meta]] =
     TextJson(nextMedicalRecordMetas(nextInt(maxItemsInCollectionNumber, minValue = 0)))
 
-  private def nextDocument: Document =
-    DocumentGen.nextDocument
+  private def nextDocument(): Document =
+    DocumentGen.nextDocument()
 
   private def nextDocuments(count: Int): List[Document] =
-    List.fill(count)(nextDocument)
+    List.fill(count)(nextDocument())
 
-  private def nextDocuments(recordId: LongId[MedicalRecord]): TextJson[List[Document]] = {
+  def nextDocuments(recordId: LongId[MedicalRecord]): TextJson[List[Document]] = {
     val documents = nextDocuments(
       nextInt(maxItemsInCollectionNumber, minValue = 0)
     )
@@ -40,17 +40,17 @@ object MedicalRecordGen {
   }
 
 
-  def nextMedicalRecordStatus: MedicalRecord.Status =
-    generators.oneOf[MedicalRecord.Status](MedicalRecord.Status.All)
+  def nextMedicalRecordStatus(): MedicalRecord.Status =
+    MedicalRecord.Status.New
 
-  def nextMedicalRecordHistoryState: MedicalRecordHistory.State =
+  def nextMedicalRecordHistoryState(): MedicalRecordHistory.State =
     generators.oneOf[MedicalRecordHistory.State](MedicalRecordHistory.State.All)
 
-  def nextMedicalRecordHistoryAction: MedicalRecordHistory.Action =
+  def nextMedicalRecordHistoryAction(): MedicalRecordHistory.Action =
     generators.oneOf[MedicalRecordHistory.Action](MedicalRecordHistory.Action.All)
 
 
-  def nextMedicalRecordMetaReorder: MedicalRecord.Meta.Reorder = {
+  def nextMedicalRecordMetaReorder(): MedicalRecord.Meta.Reorder = {
     val itemsNumber =
       maxItemsInCollectionNumber
     val items = scala.util.Random
@@ -63,7 +63,7 @@ object MedicalRecordGen {
   }
 
 
-  def nextMedicalRecordMetaDuplicate: MedicalRecord.Meta.Duplicate = {
+  def nextMedicalRecordMetaDuplicate(): MedicalRecord.Meta.Duplicate = {
     val startPageGen =
       nextInt(pageMaxNumber, minValue = 0)
     val endPageGen =
@@ -78,7 +78,7 @@ object MedicalRecordGen {
     )
   }
 
-  def nextMedicalRecordMetaRotation: MedicalRecord.Meta.Rotation = {
+  def nextMedicalRecordMetaRotation(): MedicalRecord.Meta.Rotation = {
     val items =
       Array.tabulate(maxItemsInCollectionNumber)(
         index => nextString() -> index
@@ -90,7 +90,7 @@ object MedicalRecordGen {
     )
   }
 
-  def nextMedicalRecordMeta: MedicalRecord.Meta = {
+  def nextMedicalRecordMeta(): MedicalRecord.Meta = {
     generators.oneOf(medicalRecordMetas)()
   }
 
@@ -99,8 +99,8 @@ object MedicalRecordGen {
     val id = nextLongId[MedicalRecord]
     MedicalRecord(
       id = nextLongId[MedicalRecord],
-      status = nextMedicalRecordStatus,
-      previousStatus = nextOption(nextMedicalRecordStatus),
+      status = nextMedicalRecordStatus(),
+      previousStatus = None,
       assignee = nextOption(nextStringId),
       previousAssignee = nextOption(nextStringId),
       lastActiveUserId = nextOption(nextStringId),
@@ -109,8 +109,8 @@ object MedicalRecordGen {
       disease = generators.nextString(),
       caseId = nextOption(CaseId(generators.nextString())),
       physician = nextOption(generators.nextString()),
-      meta = nextOption(nextMedicalRecordMetasJson),
-      predictedMeta = nextOption(nextMedicalRecordMetasJson),
+      meta = nextOption(nextMedicalRecordMetasJson()),
+      predictedMeta = nextOption(nextMedicalRecordMetasJson()),
       predictedDocuments = nextOption(nextDocuments(id)),
       lastUpdate = nextLocalDateTime
     )
@@ -121,8 +121,8 @@ object MedicalRecordGen {
       id = nextLongId[MedicalRecordHistory],
       executor = nextStringId[User],
       recordId = nextLongId[MedicalRecord],
-      state = nextMedicalRecordHistoryState,
-      action = nextMedicalRecordHistoryAction,
+      state = nextMedicalRecordHistoryState(),
+      action = nextMedicalRecordHistoryAction(),
       created = nextLocalDateTime
     )
   }