aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain/services/TrialService.scala
diff options
context:
space:
mode:
authorJakob Odersky <jakob@driver.xyz>2017-08-07 15:52:34 -0700
committerJakob Odersky <jakob@driver.xyz>2017-08-16 19:26:10 -0700
commit5ad077c8ae500f6154043dc0c8ffd457ddaba204 (patch)
tree1da688c2c03e00d9a06aafd1df97c6f87e4eaa7a /src/main/scala/xyz/driver/pdsuidomain/services/TrialService.scala
parent7f3e788642b1d3946fccc0e13d3c3121034d9d7d (diff)
downloadrest-query-5ad077c8ae500f6154043dc0c8ffd457ddaba204.tar.gz
rest-query-5ad077c8ae500f6154043dc0c8ffd457ddaba204.tar.bz2
rest-query-5ad077c8ae500f6154043dc0c8ffd457ddaba204.zip
Use akka streams in trial pdfs
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/services/TrialService.scala')
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/services/TrialService.scala24
1 files changed, 4 insertions, 20 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/TrialService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/TrialService.scala
index d140d27..5bd99a8 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/TrialService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/TrialService.scala
@@ -2,13 +2,15 @@ package xyz.driver.pdsuidomain.services
import java.time.LocalDateTime
+import akka.NotUsed
+import akka.stream.scaladsl.Source
+import akka.util.ByteString
import xyz.driver.pdsuicommon.auth.AuthenticatedRequestContext
import xyz.driver.pdsuicommon.db._
import xyz.driver.pdsuicommon.domain.StringId
import xyz.driver.pdsuicommon.error.DomainError
import xyz.driver.pdsuicommon.logging._
import xyz.driver.pdsuidomain.entities.Trial
-import xyz.driver.pdsuidomain.entities.Trial.PdfSource
import xyz.driver.pdsuidomain.entities.export.trial.ExportTrialWithLabels
import scala.concurrent.Future
@@ -66,24 +68,6 @@ object TrialService {
extends GetTrialWithLabelsReply with DomainError.AuthorizationError with DefaultAccessDeniedError
}
- sealed trait GetPdfSourceReply
- object GetPdfSourceReply {
- type Error = GetPdfSourceReply with DomainError
-
- final case class Entity(x: PdfSource) extends GetPdfSourceReply
-
- case object AuthorizationError
- extends GetPdfSourceReply with DomainError.AuthorizationError with DefaultAccessDeniedError
-
- case object NotFoundError extends GetPdfSourceReply with DomainError.NotFoundError {
- def userMessage: String = "Trial's PDF hasn't been found"
- }
-
- case object TrialNotFoundError extends GetPdfSourceReply with DomainError.NotFoundError with DefaultNotFoundError
-
- final case class CommonError(userMessage: String) extends GetPdfSourceReply with DomainError
- }
-
sealed trait UpdateReply
object UpdateReply {
type Error = UpdateReply with DomainError
@@ -114,7 +98,7 @@ trait TrialService {
implicit requestContext: AuthenticatedRequestContext): Future[GetTrialWithLabelsReply]
def getPdfSource(trialId: StringId[Trial])(
- implicit requestContext: AuthenticatedRequestContext): Future[GetPdfSourceReply]
+ implicit requestContext: AuthenticatedRequestContext): Future[Source[ByteString, NotUsed]]
def getAll(filter: SearchFilterExpr = SearchFilterExpr.Empty,
sorting: Option[Sorting] = None,