Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use module pattern (remove execute method on requests) #83

Merged
merged 9 commits into from
Feb 23, 2023
Merged

Use module pattern (remove execute method on requests) #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d5777d1
Remove execute method on requests
mvelimir Feb 21, 2023
1c03362
Expose execute through Elasticsearch trait
mvelimir Feb 22, 2023
364303a
Remove Throwable from layer creation
mvelimir Feb 22, 2023
3af9647
Remove override in trait method implementation
mvelimir Feb 22, 2023
28330e8
Use TaskLayer type alias
mvelimir Feb 22, 2023
5b4037f
Inline requests in example application
mvelimir Feb 22, 2023
c2e802b
Use ElasticExecutor service for tests
mvelimir Feb 22, 2023
a475f52
Refactor layer creation
mvelimir Feb 22, 2023
c107f17
Fix integration testing
mvelimir Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions modules/example/src/main/scala/example/Main.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import sttp.client3.SttpBackend
import sttp.client3.httpclient.zio.HttpClientZioBackend
import zio._
import zio.config.getConfig
import zio.elasticsearch.{ElasticConfig, ElasticExecutor, ElasticRequest}
import zio.elasticsearch.{ElasticConfig, ElasticExecutor, ElasticRequest, Elasticsearch}
import zio.http.{Server, ServerConfig}

import scala.io.Source
Expand All @@ -38,25 +38,26 @@ object Main extends ZIOAppDefault {
AppConfig.live,
elasticConfigLive,
ElasticExecutor.live,
Elasticsearch.layer,
HttpClientZioBackend.layer()
)
}

private[this] def prepare: RIO[SttpBackend[Task, Any] with ElasticExecutor, Unit] = {
val deleteIndex: RIO[ElasticExecutor, Unit] =
private[this] def prepare: RIO[SttpBackend[Task, Any] with Elasticsearch, Unit] = {
val deleteIndex: RIO[Elasticsearch, Unit] =
for {
_ <- ZIO.logInfo(s"Deleting index '$Index'...")
_ <- ElasticRequest.deleteIndex(Index).execute
_ <- Elasticsearch.execute(ElasticRequest.deleteIndex(Index))
} yield ()

val createIndex: RIO[ElasticExecutor, Unit] =
val createIndex: RIO[Elasticsearch, Unit] =
for {
_ <- ZIO.logInfo(s"Creating index '$Index'...")
mapping <- ZIO.fromTry(Using(Source.fromURL(getClass.getResource("/mapping.json")))(_.mkString))
_ <- ElasticRequest.createIndex(Index, Some(mapping)).execute
_ <- Elasticsearch.execute(ElasticRequest.createIndex(Index, Some(mapping)))
} yield ()

val populate: RIO[SttpBackend[Task, Any] with ElasticExecutor, Unit] =
val populate: RIO[SttpBackend[Task, Any] with Elasticsearch, Unit] =
(for {
repositories <- RepoFetcher.fetchAllByOrganization(organization)
_ <- ZIO.logInfo("Adding GitHub repositories...")
Expand All @@ -66,7 +67,7 @@ object Main extends ZIOAppDefault {
deleteIndex *> createIndex *> populate
}

private[this] def runServer: RIO[HttpConfig with ElasticExecutor, ExitCode] = {
private[this] def runServer: RIO[HttpConfig with Elasticsearch, ExitCode] = {
val serverConfigLive = ZLayer.fromFunction((http: HttpConfig) => ServerConfig.default.port(http.port))

(for {
Expand Down
38 changes: 20 additions & 18 deletions modules/example/src/main/scala/example/RepositoriesElasticsearch.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,58 +22,60 @@ import zio.elasticsearch.{
CreationOutcome,
DeletionOutcome,
DocumentId,
ElasticExecutor,
ElasticQuery,
ElasticRequest,
Elasticsearch,
Routing
}
import zio.prelude.Newtype.unsafeWrap

final case class RepositoriesElasticsearch(executor: ElasticExecutor) {
final case class RepositoriesElasticsearch(elasticsearch: Elasticsearch) {

def findAll(): Task[List[GitHubRepo]] =
executor.execute(ElasticRequest.search[GitHubRepo](Index, matchAll))
elasticsearch.execute(ElasticRequest.search[GitHubRepo](Index, matchAll))

def findById(organization: String, id: String): Task[Option[GitHubRepo]] =
for {
routing <- routingOf(organization)
req = ElasticRequest.getById[GitHubRepo](Index, DocumentId(id)).routing(routing)
res <- executor.execute(req)
res <- elasticsearch.execute(ElasticRequest.getById[GitHubRepo](Index, DocumentId(id)).routing(routing))
} yield res

def create(repository: GitHubRepo): Task[CreationOutcome] =
for {
routing <- routingOf(repository.organization)
req = ElasticRequest.create(Index, DocumentId(repository.id), repository).routing(routing).refreshTrue
res <- executor.execute(req)
res <- elasticsearch.execute(
ElasticRequest.create(Index, DocumentId(repository.id), repository).routing(routing).refreshTrue
)
} yield res

def createAll(repositories: List[GitHubRepo]): Task[Unit] =
for {
routing <- routingOf(organization)
reqs = repositories.map { repository =>
ElasticRequest.create[GitHubRepo](Index, unsafeWrap(DocumentId)(repository.id), repository)
}
bulkReq = ElasticRequest.bulk(reqs: _*).routing(routing)
_ <- executor.execute(bulkReq)
_ <- elasticsearch.execute(
ElasticRequest
.bulk(repositories.map { repository =>
ElasticRequest.create[GitHubRepo](Index, unsafeWrap(DocumentId)(repository.id), repository)
}: _*)
.routing(routing)
)
} yield ()

def upsert(id: String, repository: GitHubRepo): Task[Unit] =
for {
routing <- routingOf(repository.organization)
req = ElasticRequest.upsert(Index, DocumentId(id), repository).routing(routing).refresh(value = true)
_ <- executor.execute(req)
_ <- elasticsearch.execute(
ElasticRequest.upsert(Index, DocumentId(id), repository).routing(routing).refresh(value = true)
)
} yield ()

def remove(organization: String, id: String): Task[DeletionOutcome] =
for {
routing <- routingOf(organization)
req = ElasticRequest.deleteById(Index, DocumentId(id)).routing(routing).refreshFalse
res <- executor.execute(req)
res <- elasticsearch.execute(ElasticRequest.deleteById(Index, DocumentId(id)).routing(routing).refreshFalse)
} yield res

def search(query: ElasticQuery[_]): Task[List[GitHubRepo]] =
executor.execute(ElasticRequest.search[GitHubRepo](Index, query))
elasticsearch.execute(ElasticRequest.search[GitHubRepo](Index, query))

private def routingOf(value: String): IO[IllegalArgumentException, Routing.Type] =
Routing.make(value).toZIO.mapError(e => new IllegalArgumentException(e))
Expand Down Expand Up @@ -103,6 +105,6 @@ object RepositoriesElasticsearch {
def search(query: ElasticQuery[_]): RIO[RepositoriesElasticsearch, List[GitHubRepo]] =
ZIO.serviceWithZIO[RepositoriesElasticsearch](_.search(query))

lazy val live: URLayer[ElasticExecutor, RepositoriesElasticsearch] =
lazy val live: URLayer[Elasticsearch, RepositoriesElasticsearch] =
ZLayer.fromFunction(RepositoriesElasticsearch(_))
}
3 changes: 1 addition & 2 deletions modules/example/src/main/scala/example/external/github/RepoFetcher.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ object RepoFetcher {
): RIO[SttpBackend[Task, Any], List[GitHubRepo]] =
for {
client <- ZIO.service[SttpBackend[Task, Any]]
req = basicRequest.get(uri"https://api.github.com/orgs/$organization/repos?per_page=$limit")
res <- req.send(client)
res <- basicRequest.get(uri"https://api.github.com/orgs/$organization/repos?per_page=$limit").send(client)
} yield res.body.toOption
.map(_.fromJson[List[RepoResponse]].fold(_ => Nil, _.map(GitHubRepo.fromResponse).toList))
.getOrElse(Nil)
Expand Down
Loading