Setup S3 bucket URL

johnspade · May 28, 2023 · c69d9b0 · c69d9b0
1 parent bb435d3
commit c69d9b0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/api/src/main/scala/ru/johnspade/nastenka/api/ApiInvestigationService.scala b/api/src/main/scala/ru/johnspade/nastenka/api/ApiInvestigationService.scala
@@ -5,6 +5,7 @@ import ru.johnspade.nastenka.errors.InvestigationNotFound
 import ru.johnspade.nastenka.models.Investigation
 import ru.johnspade.nastenka.models.InvestigationFullModel
 import ru.johnspade.nastenka.models.NewInvestigation
+import ru.johnspade.nastenka.models.Pin
 import ru.johnspade.nastenka.models.PinModel
 import ru.johnspade.nastenka.models.UpdatedInvestigation
 import zio.*
@@ -24,8 +25,15 @@ trait ApiInvestigationService:
 
  def delete(id: UUID): ZIO[Any, Nothing, Unit]
 
-class ApiInvestigationServiceLive(investigationRepo: ApiInvestigationRepository, emailConfig: EmailConfig)
- extends ApiInvestigationService:
+class ApiInvestigationServiceLive(
+ investigationRepo: ApiInvestigationRepository,
+ emailConfig: EmailConfig,
+ s3Config: S3PublicConfig
+) extends ApiInvestigationService:
+ private val pinModelTransformer = Transformer
+ .define[Pin, PinModel]
+ .build(Field.computed(_.images, _.images.map(fileKey => s"${s3Config.publicBucketUrl}/$fileKey")))
+
  override def getAll: ZIO[Any, Nothing, List[Investigation]] =
  investigationRepo.getAll.orDie
 
@@ -37,7 +45,10 @@ class ApiInvestigationServiceLive(investigationRepo: ApiInvestigationRepository,
  .refineToOrDie[InvestigationNotFound]
  .map(
  _.into[InvestigationFullModel]
- .transform(Field.const(_.email, s"$username+$id@$domain"))
+ .transform(
+ Field.const(_.email, s"$username+$id@$domain"),
+ Field.computed(_.pins, _.pins.map(pinModelTransformer.transform))
+ )
  )
 
  override def create(newInvestigation: NewInvestigation): ZIO[Any, Nothing, Investigation] =
@@ -68,5 +79,6 @@ object ApiInvestigationServiceLive:
  for
  investigationRepo <- ZIO.service[ApiInvestigationRepository]
  emailConfig <- ZIO.config(EmailConfig.descriptor)
- yield new ApiInvestigationServiceLive(investigationRepo, emailConfig)
+ s3PublicConfig <- ZIO.config(S3PublicConfig.descriptor)
+ yield new ApiInvestigationServiceLive(investigationRepo, emailConfig, s3PublicConfig)
  )
diff --git a/api/src/main/scala/ru/johnspade/nastenka/api/S3PublicConfig.scala b/api/src/main/scala/ru/johnspade/nastenka/api/S3PublicConfig.scala
@@ -0,0 +1,8 @@
+package ru.johnspade.nastenka.api
+
+import zio.*
+
+final case class S3PublicConfig(publicBucketUrl: String)
+
+object S3PublicConfig:
+ val descriptor: Config[S3PublicConfig] = Config.string("S3_PUBLIC_BUCKET_URL").map(url => S3PublicConfig(url))
diff --git a/frontend/src/main/scala/ru/johnspade/nastenka/frontend/views/InvestigationView.scala b/frontend/src/main/scala/ru/johnspade/nastenka/frontend/views/InvestigationView.scala
@@ -104,7 +104,7 @@ final class InvestigationView(investigationPage: Signal[Page.InvestigationPage])
  ),
  renderContent(pin),
  div(
- pin.images.map(k => s"http://localhost:9000/nastenka/$k").map { link =>
+ pin.images.map { link =>
  img(
  src(link)
  )