Skip to content

Commit

Permalink
Migrate ResourceRoutes to Cats Effect
Browse files Browse the repository at this point in the history
  • Loading branch information
@shinyhappydan
shinyhappydan committed Oct 17, 2023
1 parent 5c3ec3d commit 948b85f
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 25 deletions.
76 changes: 54 additions & 22 deletions delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesRoutes.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package ch.epfl.bluebrain.nexus.delta.routes
import akka.http.scaladsl.model.StatusCodes.{Created, OK}
import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.server._
import cats.effect.IO
import cats.syntax.all._
import ch.epfl.bluebrain.nexus.delta.kernel.effect.migration._
import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.schemas
Expand All @@ -13,7 +14,7 @@ import ch.epfl.bluebrain.nexus.delta.routes.ResourcesRoutes.asSourceWithMetadata
import ch.epfl.bluebrain.nexus.delta.sdk._
import ch.epfl.bluebrain.nexus.delta.sdk.acls.AclCheck
import ch.epfl.bluebrain.nexus.delta.sdk.circe.CirceUnmarshalling
import ch.epfl.bluebrain.nexus.delta.sdk.directives.DeltaDirectives._
import ch.epfl.bluebrain.nexus.delta.sdk.ce.DeltaDirectives._
import ch.epfl.bluebrain.nexus.delta.sdk.directives.{AuthDirectives, DeltaSchemeDirectives}
import ch.epfl.bluebrain.nexus.delta.sdk.fusion.FusionConfig
import ch.epfl.bluebrain.nexus.delta.sdk.identities.Identities
Expand All @@ -28,8 +29,6 @@ import ch.epfl.bluebrain.nexus.delta.sdk.resources.model.{Resource, ResourceReje
import ch.epfl.bluebrain.nexus.delta.sdk.resources.{NexusSource, Resources}
import ch.epfl.bluebrain.nexus.delta.sourcing.model.ProjectRef
import io.circe.{Json, Printer}
import monix.bio.IO
import monix.execution.Scheduler

/**
* The resource routes
Expand All @@ -53,7 +52,6 @@ final class ResourcesRoutes(
index: IndexingAction.Execute[Resource]
)(implicit
baseUri: BaseUri,
s: Scheduler,
cr: RemoteContextResolution,
ordering: JsonKeyOrdering,
fusionConfig: FusionConfig,
Expand Down Expand Up @@ -86,8 +84,10 @@ final class ResourcesRoutes(
Created,
resources
.create(ref, resourceSchema, source.value, tag)
.tapEval(indexUIO(ref, _, mode))
.toCatsIO
.flatTap(indexUIO(ref, _, mode))
.map(_.void)
.attemptNarrow[ResourceRejection]
)
}
},
Expand All @@ -102,8 +102,10 @@ final class ResourcesRoutes(
Created,
resources
.create(ref, schema, source.value, tag)
.tapEval(indexUIO(ref, _, mode))
.toCatsIO
.flatTap(indexUIO(ref, _, mode))
.map(_.void)
.attemptNarrow[ResourceRejection]
.rejectWhen(wrongJsonOrNotFound)
)
}
Expand All @@ -123,17 +125,21 @@ final class ResourcesRoutes(
Created,
resources
.create(id, ref, schema, source.value, tag)
.tapEval(indexUIO(ref, _, mode))
.toCatsIO
.flatTap(indexUIO(ref, _, mode))
.map(_.void)
.attemptNarrow[ResourceRejection]
.rejectWhen(wrongJsonOrNotFound)
)
case (Some(rev), source, _) =>
// Update a resource
emit(
resources
.update(id, ref, schemaOpt, rev, source.value)
.tapEval(indexUIO(ref, _, mode))
.toCatsIO
.flatTap(indexUIO(ref, _, mode))
.map(_.void)
.attemptNarrow[ResourceRejection]
.rejectWhen(wrongJsonOrNotFound)
)
}
Expand All @@ -145,8 +151,10 @@ final class ResourcesRoutes(
emit(
resources
.deprecate(id, ref, schemaOpt, rev)
.tapEval(indexUIO(ref, _, mode))
.toCatsIO
.flatTap(indexUIO(ref, _, mode))
.map(_.void)
.attemptNarrow[ResourceRejection]
.rejectWhen(wrongJsonOrNotFound)
)
}
Expand All @@ -160,7 +168,8 @@ final class ResourcesRoutes(
emit(
resources
.fetch(id, ref, schemaOpt)
.leftWiden[ResourceRejection]
.toCatsIO
.attemptNarrow[ResourceRejection]
.rejectWhen(wrongJsonOrNotFound)
)
}
Expand All @@ -174,8 +183,10 @@ final class ResourcesRoutes(
OK,
resources
.refresh(id, ref, schemaOpt)
.tapEval(indexUIO(ref, _, mode))
.toCatsIO
.flatTap(indexUIO(ref, _, mode))
.map(_.void)
.attemptNarrow[ResourceRejection]
.rejectWhen(wrongJsonOrNotFound)
)
}
Expand All @@ -189,30 +200,48 @@ final class ResourcesRoutes(
emit(
resources
.fetch(id, ref, schemaOpt)
.toCatsIO
.flatMap(asSourceWithMetadata)
.attemptNarrow[ResourceRejection]
)
} else {
val sourceIO = resources.fetch(id, ref, schemaOpt).map(_.value.source)
val value = sourceIO.leftWiden[ResourceRejection]
emit(value.rejectWhen(wrongJsonOrNotFound))
emit(
resources
.fetch(id, ref, schemaOpt)
.toCatsIO
.map(_.value.source)
.attemptNarrow[ResourceRejection]
.rejectWhen(wrongJsonOrNotFound)
)
}
}
}
},
// Get remote contexts
pathPrefix("remote-contexts") {
(get & idSegmentRef(id) & pathEndOrSingleSlash & authorizeFor(ref, Read)) { id =>
val remoteContextsIO = resources.fetchState(id, ref, schemaOpt).map(_.remoteContexts)
emit(remoteContextsIO.leftWiden[ResourceRejection])
emit(
resources
.fetchState(id, ref, schemaOpt)
.toCatsIO
.map(_.remoteContexts)
.attemptNarrow[ResourceRejection]
)
}
},
// Tag a resource
pathPrefix("tags") {
concat(
// Fetch a resource tags
(get & idSegmentRef(id) & pathEndOrSingleSlash & authorizeFor(ref, Read)) { id =>
val tagsIO = resources.fetch(id, ref, schemaOpt).map(_.value.tags)
emit(tagsIO.leftWiden[ResourceRejection].rejectWhen(wrongJsonOrNotFound))
emit(
resources
.fetch(id, ref, schemaOpt)
.toCatsIO
.map(_.value.tags)
.attemptNarrow[ResourceRejection]
.rejectWhen(wrongJsonOrNotFound)
)
},
// Tag a resource
(post & parameter("rev".as[Int]) & pathEndOrSingleSlash) { rev =>
Expand All @@ -222,8 +251,10 @@ final class ResourcesRoutes(
Created,
resources
.tag(id, ref, schemaOpt, tag, tagRev, rev)
.tapEval(indexUIO(ref, _, mode))
.toCatsIO
.flatTap(indexUIO(ref, _, mode))
.map(_.void)
.attemptNarrow[ResourceRejection]
.rejectWhen(wrongJsonOrNotFound)
)
}
Expand All @@ -237,8 +268,10 @@ final class ResourcesRoutes(
emit(
resources
.deleteTag(id, ref, schemaOpt, tag, rev)
.tapEval(indexUIO(ref, _, mode))
.toCatsIO
.flatTap(indexUIO(ref, _, mode))
.map(_.void)
.attemptNarrow[ResourceRejection]
.rejectOn[ResourceNotFound]
)
}
Expand Down Expand Up @@ -274,7 +307,6 @@ object ResourcesRoutes {
index: IndexingAction.Execute[Resource]
)(implicit
baseUri: BaseUri,
s: Scheduler,
cr: RemoteContextResolution,
ordering: JsonKeyOrdering,
fusionConfig: FusionConfig,
Expand All @@ -283,7 +315,7 @@ object ResourcesRoutes {

def asSourceWithMetadata(
resource: ResourceF[Resource]
)(implicit baseUri: BaseUri, cr: RemoteContextResolution): IO[ResourceRejection, Json] =
)(implicit baseUri: BaseUri, cr: RemoteContextResolution): IO[Json] =
AnnotatedSource(resource, resource.value.source).mapError(e => InvalidJsonLdFormat(Some(resource.id), e))

}
3 changes: 0 additions & 3 deletions delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ResourcesModule.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import ch.epfl.bluebrain.nexus.delta.sdk.sse.SseEncoder
import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors
import izumi.distage.model.definition.{Id, ModuleDef}
import monix.bio.UIO
import monix.execution.Scheduler

/**
* Resources wiring
Expand Down Expand Up @@ -85,7 +84,6 @@ object ResourcesModule extends ModuleDef {
indexingAction: AggregateIndexingAction,
shift: Resource.Shift,
baseUri: BaseUri,
s: Scheduler,
cr: RemoteContextResolution @Id("aggregate"),
ordering: JsonKeyOrdering,
fusionConfig: FusionConfig,
Expand All @@ -99,7 +97,6 @@ object ResourcesModule extends ModuleDef {
indexingAction(_, _, _)(shift)
)(
baseUri,
s,
cr,
ordering,
fusionConfig,
Expand Down

0 comments on commit 948b85f

Please sign in to comment.