fix merge conflictsv0.7.5

1 files changed, 4 insertions, 7 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
index eccb254..258aa03 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
@@ -308,13 +308,7 @@ object DocumentType {
 
 object Document {
 
-  final case class Meta(predicted: Option[Boolean], startPage: Double, endPage: Double) {
-
-    /**
-      * Return a regular meta: this meta is considered as not predicted
-      */
-    def confirmed: Meta = copy(predicted = predicted.map(_ => false))
-  }
+  final case class Meta(startPage: Double, endPage: Double)
 
   class DocumentStatusSerializer extends JsonSerializer[Status] {
     def serialize(value: Status, gen: JsonGenerator, serializers: SerializerProvider): Unit = {
@@ -419,6 +413,8 @@ object Document {
 
       providerTypeId <- Validators.nonEmpty("providerTypeId")(input.providerTypeId)
 
+      institutionName <- Validators.nonEmpty("institutionName")(input.institutionName)
+
       meta <- Validators.nonEmpty("meta")(input.meta)
 
       startDate <- Validators.nonEmpty("startDate")(input.startDate)
@@ -456,6 +452,7 @@ final case class Document(id: LongId[Document] = LongId(0L),
                           providerName: Option[String], // not null
                           providerTypeId: Option[LongId[ProviderType]], // not null
                           requiredType: Option[Document.RequiredType],
+                          institutionName: Option[String],
                           meta: Option[TextJson[Meta]], // not null
                           startDate: Option[LocalDate], // not null
                           endDate: Option[LocalDate],