Export entities JSON formatsv0.1.13

6 files changed, 37 insertions, 46 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/ExportService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/ExportService.scala
index 8fb399a..ddc927d 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/ExportService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/ExportService.scala
@@ -28,7 +28,7 @@ object ExportService {
   sealed trait GetTrialListReply
   object GetTrialListReply {
     case class EntityList(xs: Seq[ExportTrial], totalFound: Int, lastUpdate: Option[LocalDateTime])
-      extends GetTrialListReply
+        extends GetTrialListReply
   }
 
   sealed trait GetTrialReply
@@ -47,18 +47,17 @@ trait ExportService {
 
   import ExportService._
 
-  def getPatient(id: UuidId[Patient])
-                (implicit requestContext: AnonymousRequestContext): Future[GetPatientReply]
+  def getPatient(id: UuidId[Patient])(implicit requestContext: AnonymousRequestContext): Future[GetPatientReply]
 
-  def getTrialList(filter: SearchFilterExpr = SearchFilterExpr.Empty)
-                  (implicit requestContext: AnonymousRequestContext): Future[GetTrialListReply]
+  def getTrialList(filter: SearchFilterExpr = SearchFilterExpr.Empty)(
+          implicit requestContext: AnonymousRequestContext): Future[GetTrialListReply]
 
-  def getTrial(trialId: StringId[Trial], condition: String)
-              (implicit requestContext: AnonymousRequestContext): Future[GetTrialReply]
+  def getTrial(trialId: StringId[Trial], condition: String)(
+          implicit requestContext: AnonymousRequestContext): Future[GetTrialReply]
 
-  def getRecords(patientId: UuidId[Patient])
-                (implicit requestContext: AnonymousRequestContext): Future[MedicalRecordService.GetListReply]
+  def getRecords(patientId: UuidId[Patient])(
+          implicit requestContext: AnonymousRequestContext): Future[MedicalRecordService.GetListReply]
 
-  def getRecordPdf(recordId: LongId[MedicalRecord])
-                  (implicit requestContext: AnonymousRequestContext): Future[MedicalRecordService.GetPdfSourceReply]
+  def getRecordPdf(recordId: LongId[MedicalRecord])(
+          implicit requestContext: AnonymousRequestContext): Future[MedicalRecordService.GetPdfSourceReply]
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/LinkedPatientService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/LinkedPatientService.scala
index 8fc1662..a69283a 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/LinkedPatientService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/LinkedPatientService.scala
@@ -17,10 +17,7 @@ object LinkedPatientService {
     def userMessage: String = "Patient not found"
   }
 
-  final case class RichLinkedPatient(email: Email,
-                                     name: String,
-                                     patientId: UuidId[Patient],
-                                     trialId: StringId[Trial]) {
+  final case class RichLinkedPatient(email: Email, name: String, patientId: UuidId[Patient], trialId: StringId[Trial]) {
     def toLinkedPatient(user: User) = LinkedPatient(
       userId = user.id,
       patientId = patientId,
@@ -45,10 +42,9 @@ object LinkedPatientService {
     final case class Created(x: RichLinkedPatient, createdUser: Option[User]) extends CreateReply
 
     case object PatientNotFoundError
-      extends CreateReply with DefaultPatientNotFoundError with DomainError.NotFoundError
+        extends CreateReply with DefaultPatientNotFoundError with DomainError.NotFoundError
 
-    case object TrialNotFoundError
-      extends CreateReply with DefaultPatientNotFoundError with DomainError.NotFoundError
+    case object TrialNotFoundError extends CreateReply with DefaultPatientNotFoundError with DomainError.NotFoundError
 
     final case class CommonError(userMessage: String) extends CreateReply with DomainError
   }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/MailService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/MailService.scala
index 3022716..53f897a 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/MailService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/MailService.scala
@@ -20,11 +20,11 @@ object MailService {
     factory.setObjectHandler(new ScalaObjectHandler)
 
     protected def inputStream: InputStream = getClass.getClassLoader.getResourceAsStream(filename)
-    protected def templateContent: String = Source.fromInputStream(inputStream).getLines().mkString
+    protected def templateContent: String  = Source.fromInputStream(inputStream).getLines().mkString
 
     def content: String = {
       val template = factory.compile(new StringReader(templateContent), filename)
-      val writer = new StringWriter
+      val writer   = new StringWriter
       template
         .execute(writer, parameters)
         .close()
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/QueueUploadService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/QueueUploadService.scala
index 55a408f..f201fd9 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/QueueUploadService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/QueueUploadService.scala
@@ -21,7 +21,8 @@ object QueueUploadService {
     type Error = CreateReply with DomainError
 
     case class Created(x: BridgeUploadQueue.Item) extends CreateReply
-    case object AuthorizationError extends CreateReply with DomainError.AuthorizationError with DefaultAccessDeniedError
+    case object AuthorizationError
+        extends CreateReply with DomainError.AuthorizationError with DefaultAccessDeniedError
     case class CommonError(userMessage: String) extends CreateReply with DomainError
   }
 
@@ -30,8 +31,9 @@ object QueueUploadService {
     type Error = GetByIdReply with DomainError
 
     case class Entity(x: BridgeUploadQueue.Item) extends GetByIdReply
-    case object AuthorizationError extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError
-    case object NotFoundError extends GetByIdReply with DomainError.NotFoundError with DefaultNotFoundError
+    case object AuthorizationError
+        extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError
+    case object NotFoundError                   extends GetByIdReply with DomainError.NotFoundError with DefaultNotFoundError
     case class CommonError(userMessage: String) extends GetByIdReply with DomainError
   }
 
@@ -39,11 +41,10 @@ object QueueUploadService {
   object GetListReply {
     type Error = GetListReply with DomainError
 
-    case class EntityList(xs: Seq[BridgeUploadQueue.Item],
-                          totalFound: Int) extends GetListReply
+    case class EntityList(xs: Seq[BridgeUploadQueue.Item], totalFound: Int) extends GetListReply
 
     case object AuthorizationError
-      extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError
+        extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError
   }
 
   sealed trait ResetReply
@@ -51,9 +52,9 @@ object QueueUploadService {
     type Error = ResetReply with DomainError
 
     case class Updated(updated: BridgeUploadQueue.Item) extends ResetReply
-    case object AuthorizationError extends ResetReply with DomainError.AuthorizationError with DefaultAccessDeniedError
-    case object NotFoundError extends ResetReply with DefaultNotFoundError with DomainError.NotFoundError
-    case class CommonError(userMessage: String) extends ResetReply with DomainError
+    case object AuthorizationError                      extends ResetReply with DomainError.AuthorizationError with DefaultAccessDeniedError
+    case object NotFoundError                           extends ResetReply with DefaultNotFoundError with DomainError.NotFoundError
+    case class CommonError(userMessage: String)         extends ResetReply with DomainError
   }
 }
 
@@ -61,18 +62,15 @@ trait QueueUploadService {
 
   import QueueUploadService._
 
-  def create(kind: String, tag: String)
-            (implicit requestContext: AuthenticatedRequestContext): Future[CreateReply]
+  def create(kind: String, tag: String)(implicit requestContext: AuthenticatedRequestContext): Future[CreateReply]
 
-  def getById(kind: String, tag: String)
-             (implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply]
+  def getById(kind: String, tag: String)(implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply]
 
   def getAll(filter: SearchFilterExpr = SearchFilterExpr.Empty,
              sorting: Option[Sorting] = None,
-             pagination: Option[Pagination] = None)
-            (implicit requestContext: AuthenticatedRequestContext): Future[GetListReply]
+             pagination: Option[Pagination] = None)(
+          implicit requestContext: AuthenticatedRequestContext): Future[GetListReply]
 
-  def reset(kind: String, tag: String)
-           (implicit requestContext: AuthenticatedRequestContext): Future[ResetReply]
+  def reset(kind: String, tag: String)(implicit requestContext: AuthenticatedRequestContext): Future[ResetReply]
 
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/UserHistoryService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/UserHistoryService.scala
index 3034027..e342813 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/UserHistoryService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/UserHistoryService.scala
@@ -13,8 +13,7 @@ object UserHistoryService {
   object GetListReply {
     case class EntityList(xs: Seq[UserHistory], totalFound: Int) extends GetListReply
 
-    case object AuthorizationError
-      extends GetListReply with DomainError.AuthorizationError {
+    case object AuthorizationError extends GetListReply with DomainError.AuthorizationError {
       def userMessage: String = "Access denied"
     }
   }
@@ -26,6 +25,6 @@ trait UserHistoryService {
 
   def getAll(filter: SearchFilterExpr = SearchFilterExpr.Empty,
              sorting: Option[Sorting] = None,
-             pagination: Option[Pagination] = None)
-            (implicit requestContext: AuthenticatedRequestContext): Future[GetListReply]
+             pagination: Option[Pagination] = None)(
+          implicit requestContext: AuthenticatedRequestContext): Future[GetListReply]
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/SendGridMailService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/SendGridMailService.scala
index 37dc758..e308fe6 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/rest/SendGridMailService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/SendGridMailService.scala
@@ -18,11 +18,11 @@ object SendGridMailService {
 class SendGridMailService(settings: Settings) extends MailService with PhiLogging {
 
   def sendTo(email: String, template: Template): Boolean = {
-    val to = new Email(email)
+    val to      = new Email(email)
     val content = new Content(template.contentType, template.content)
-    val mail = new Mail(new Email(settings.from), template.subject, to, content)
+    val mail    = new Mail(new Email(settings.from), template.subject, to, content)
 
-    val request = new Request()
+    val request  = new Request()
     val sendGrid = new SendGrid(settings.apiKey)
 
     try {
@@ -35,8 +35,7 @@ class SendGridMailService(settings: Settings) extends MailService with PhiLoggin
       }
 
       response.statusCode == ExpectedHttpCode
-    }
-    catch {
+    } catch {
       case NonFatal(e) =>
         logger.error(phi"Can not send an email: $e")
         false