Skip to content

Commit

Permalink
Update Tagger, better test assertions
Browse files Browse the repository at this point in the history
  • Loading branch information
@dantb
dantb committed Oct 10, 2023
1 parent 66dafb1 commit 2d014d1
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 103 deletions.
4 changes: 2 additions & 2 deletions delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesRoutesSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.generators.{ProjectGen, ResourceResolut
import ch.epfl.bluebrain.nexus.delta.sdk.identities.IdentitiesDummy
import ch.epfl.bluebrain.nexus.delta.sdk.identities.model.Caller
import ch.epfl.bluebrain.nexus.delta.sdk.implicits._
import ch.epfl.bluebrain.nexus.delta.sdk.model.{ResourceUris, Tags}
import ch.epfl.bluebrain.nexus.delta.sdk.model.{IdSegmentRef, ResourceUris, Tags}
import ch.epfl.bluebrain.nexus.delta.sdk.permissions.Permissions.{events, resources}
import ch.epfl.bluebrain.nexus.delta.sdk.projects.FetchContextDummy
import ch.epfl.bluebrain.nexus.delta.sdk.projects.model.ApiMappings
Expand Down Expand Up @@ -215,7 +215,7 @@ class ResourcesRoutesSpec extends BaseRouteSpec with IOFromMap {
}

def resourceTags(resources: Resources, id: Iri): Tags =
resources.fetch(ResourceRef(id), projectRef).accepted.value.tags
resources.fetch(IdSegmentRef(id, tag), projectRef, None).accepted.value.tags

"reject the creation of a resource which already exists" in {
Put("/v1/resources/myorg/myproject/_/myid", payload.toEntity) ~> routes ~> check {
Expand Down
1 change: 1 addition & 0 deletions delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resources/Resources.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@ object Resources {
ResourceState.serializer,
Tagger[ResourceEvent](
{
case r: ResourceCreated => r.tag.flatMap(t => Some(t -> r.rev))
case r: ResourceTagAdded => Some(r.tag -> r.targetRev)
case _ => None
},
Expand Down
155 changes: 54 additions & 101 deletions delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/resources/ResourcesImplSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.{contexts, nxv, schema, sche
import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.api.{JsonLdApi, JsonLdJavaApi}
import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.JsonLdContext.keywords
import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.{ContextValue, RemoteContextResolution}
import ch.epfl.bluebrain.nexus.delta.sdk.ConfigFixtures
import ch.epfl.bluebrain.nexus.delta.sdk.generators.{ProjectGen, ResourceGen, ResourceResolutionGen, SchemaGen}
import ch.epfl.bluebrain.nexus.delta.sdk.identities.model.Caller
import ch.epfl.bluebrain.nexus.delta.sdk.model.{IdSegment, IdSegmentRef, Tags}
Expand All @@ -16,9 +15,11 @@ import ch.epfl.bluebrain.nexus.delta.sdk.resolvers.ResolverResolution.{FetchReso
import ch.epfl.bluebrain.nexus.delta.sdk.resolvers.model.ResourceResolutionReport.ResolverReport
import ch.epfl.bluebrain.nexus.delta.sdk.resolvers.model.{ResolverResolutionRejection, ResourceResolutionReport}
import ch.epfl.bluebrain.nexus.delta.sdk.resources.NexusSource.DecodingOption
import ch.epfl.bluebrain.nexus.delta.sdk.resources.model.Resource
import ch.epfl.bluebrain.nexus.delta.sdk.resources.model.ResourceRejection.{BlankResourceId, IncorrectRev, InvalidJsonLdFormat, InvalidResource, InvalidSchemaRejection, ProjectContextRejection, ReservedResourceId, ResourceAlreadyExists, ResourceIsDeprecated, ResourceNotFound, RevisionNotFound, SchemaIsDeprecated, TagNotFound, UnexpectedResourceId, UnexpectedResourceSchema}
import ch.epfl.bluebrain.nexus.delta.sdk.schemas.model.Schema
import ch.epfl.bluebrain.nexus.delta.sdk.syntax._
import ch.epfl.bluebrain.nexus.delta.sdk.{ConfigFixtures, DataResource}
import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.Subject
import ch.epfl.bluebrain.nexus.delta.sourcing.model.ResourceRef.{Latest, Revision}
import ch.epfl.bluebrain.nexus.delta.sourcing.model.Tag.UserTag
Expand Down Expand Up @@ -124,31 +125,31 @@ class ResourcesImplSpec
def sourceWithBlankId = source deepMerge json"""{"@id": ""}"""
val tag = UserTag.unsafe("tag")

def mkResource(res: Resource): DataResource =
ResourceGen.resourceFor(res, types = types, subject = subject)

"creating a resource" should {
"succeed with the id present on the payload" in {
forAll(List(myId -> resourceSchema, myId2 -> Latest(schema1.id))) { case (id, schemaRef) =>
val sourceWithId = source deepMerge json"""{"@id": "$id"}"""
val expectedData = ResourceGen.resource(id, projectRef, sourceWithId, Revision(schemaRef.iri, 1))
val resource = resources.create(projectRef, schemaRef, sourceWithId, None).accepted
resource shouldEqual ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject
)
resource shouldEqual mkResource(expectedData)
}
}

"succeed and tag with the id present on the payload" in {
forAll(List(myId10 -> resourceSchema, myId11 -> Latest(schema1.id))) { case (id, schemaRef) =>
val sourceWithId = source deepMerge json"""{"@id": "$id"}"""
val expectedData =
val sourceWithId = source deepMerge json"""{"@id": "$id"}"""
val expectedData =
ResourceGen.resource(id, projectRef, sourceWithId, Revision(schemaRef.iri, 1), Tags(tag -> 1))
val resource = resources.create(projectRef, schemaRef, sourceWithId, Some(tag)).accepted
resource shouldEqual ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject
)
val expectedResource = mkResource(expectedData)

val resource = resources.create(projectRef, schemaRef, sourceWithId, Some(tag)).accepted

val resourceByTag = resources.fetch(IdSegmentRef(id, tag), projectRef, Some(schemaRef)).accepted
resource shouldEqual expectedResource
resourceByTag shouldEqual expectedResource
}
}

Expand All @@ -162,11 +163,7 @@ class ResourcesImplSpec
val sourceWithId = source deepMerge json"""{"@id": "$id"}"""
val expectedData = ResourceGen.resource(id, projectRef, sourceWithId, Revision(schemaRef.iri, 1))
val resource = resources.create(id, projectRef, schemaSegment, sourceWithId, None).accepted
resource shouldEqual ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject
)
resource shouldEqual mkResource(expectedData)
}
}

Expand All @@ -177,15 +174,16 @@ class ResourcesImplSpec
(myId13, "myschema", Latest(schema1.id))
)
forAll(list) { case (id, schemaSegment, schemaRef) =>
val sourceWithId = source deepMerge json"""{"@id": "$id"}"""
val expectedData =
val sourceWithId = source deepMerge json"""{"@id": "$id"}"""
val expectedData =
ResourceGen.resource(id, projectRef, sourceWithId, Revision(schemaRef.iri, 1), Tags(tag -> 1))
val resource = resources.create(id, projectRef, schemaSegment, sourceWithId, Some(tag)).accepted
resource shouldEqual ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject
)
val expectedResource = mkResource(expectedData)

val resource = resources.create(id, projectRef, schemaSegment, sourceWithId, Some(tag)).accepted

val resourceByTag = resources.fetch(IdSegmentRef(id, tag), projectRef, Some(schemaRef)).accepted
resource shouldEqual expectedResource
resourceByTag shouldEqual expectedResource
}
}

Expand All @@ -202,11 +200,7 @@ class ResourcesImplSpec
.resource(iri, projectRef, sourceWithId, Revision(schemaRef.iri, 1))
.copy(source = sourceWithoutId)
val resource = resources.create(segment, projectRef, schemaRef, sourceWithoutId, None).accepted
resource shouldEqual ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject
)
resource shouldEqual mkResource(expectedData)
}
}

Expand All @@ -229,11 +223,7 @@ class ResourcesImplSpec
val expectedData =
ResourceGen.resource(myId8, projectRef, sourceMyId8, schemaRev)(resolverContextResolution(projectRef))
val resource = resources.create(projectRef, resourceSchema, sourceMyId8, None).accepted
resource shouldEqual ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject
)
resource shouldEqual mkResource(expectedData)
}

"succeed when pointing to another resource which itself points to other resources in its context" in {
Expand All @@ -242,11 +232,7 @@ class ResourcesImplSpec
val expectedData =
ResourceGen.resource(myId9, projectRef, sourceMyId9, schemaRev)(resolverContextResolution(projectRef))
val resource = resources.create(projectRef, resourceSchema, sourceMyId9, None).accepted
resource shouldEqual ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject
)
resource shouldEqual mkResource(expectedData)
}

"reject with different ids on the payload and passed" in {
Expand Down Expand Up @@ -349,24 +335,14 @@ class ResourcesImplSpec
val updated = source.removeKeys(keywords.id) deepMerge json"""{"number": 60}"""
val expectedData = ResourceGen.resource(myId2, projectRef, updated, Revision(schema1.id, 1))
resources.update(myId2, projectRef, Some(schema1.id), 1, updated).accepted shouldEqual
ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject,
rev = 2
)
mkResource(expectedData).copy(rev = 2)
}

"succeed without specifying the schema" in {
val updated = source.removeKeys(keywords.id) deepMerge json"""{"number": 65}"""
val expectedData = ResourceGen.resource(myId2, projectRef, updated, Revision(schema1.id, 1))
resources.update("nxv:myid2", projectRef, None, 2, updated).accepted shouldEqual
ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject,
rev = 3
)
mkResource(expectedData).copy(rev = 3)
}

"reject if it doesn't exists" in {
Expand Down Expand Up @@ -418,12 +394,7 @@ class ResourcesImplSpec
val expectedData =
ResourceGen.resource(myId6, projectRef, source.removeKeys(keywords.id), Revision(schema1.id, 1))
resources.refresh(myId6, projectRef, Some(schema1.id)).accepted shouldEqual
ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject,
rev = 2
)
mkResource(expectedData).copy(rev = 2)
}

"succeed without specifying the schema" in {
Expand Down Expand Up @@ -474,17 +445,25 @@ class ResourcesImplSpec
"tagging a resource" should {

"succeed" in {
val schemaRev = Revision(resourceSchema.iri, 1)
val expectedData = ResourceGen.resource(myId, projectRef, source, schemaRev, tags = Tags(tag -> 1))
val resource =
val schemaRev = Revision(resourceSchema.iri, 1)
val expectedData = ResourceGen.resource(myId, projectRef, source, schemaRev, tags = Tags(tag -> 1))
val expectedLatestRev = mkResource(expectedData).copy(rev = 2)
val expectedTaggedData = expectedData.copy(tags = Tags.empty)
val expectedTaggedRev = mkResource(expectedTaggedData).copy(rev = 1)

val resource =
resources.tag(myId, projectRef, Some(schemas.resources), tag, 1, 1).accepted
resource shouldEqual
ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject,
rev = 2
)

// Lookup by tag should return the tagged rev but have no tags in the data
val taggedRevision =
resources.fetch(IdSegmentRef(myId, tag), projectRef, Some(schemas.resources)).accepted
// Lookup by latest revision should return rev 2 with tags in the data
val latestRevision =
resources.fetch(ResourceRef(myId), projectRef).accepted

resource shouldEqual expectedLatestRev
latestRevision shouldEqual expectedLatestRev
taggedRevision shouldEqual expectedTaggedRev
}

"reject if it doesn't exists" in {
Expand Down Expand Up @@ -530,14 +509,7 @@ class ResourcesImplSpec
val sourceWithId = source deepMerge json"""{"@id": "$myId4"}"""
val expectedData = ResourceGen.resource(myId4, projectRef, sourceWithId, Revision(schema1.id, 1))
val resource = resources.deprecate(myId4, projectRef, Some(schema1.id), 1).accepted
resource shouldEqual
ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject,
rev = 2,
deprecated = true
)
resource shouldEqual mkResource(expectedData).copy(rev = 2, deprecated = true)
}

"reject if it doesn't exists" in {
Expand Down Expand Up @@ -578,34 +550,21 @@ class ResourcesImplSpec
"succeed" in {
forAll(List[Option[IdSegment]](None, Some(schemas.resources))) { schema =>
resources.fetch(myId, projectRef, schema).accepted shouldEqual
ResourceGen.resourceFor(
expectedDataLatest,
types = types,
subject = subject,
rev = 2
)
mkResource(expectedDataLatest).copy(rev = 2)
}
}

"succeed by tag" in {
forAll(List[Option[IdSegment]](None, Some(schemas.resources))) { schema =>
resources.fetch(IdSegmentRef("nxv:myid", tag), projectRef, schema).accepted shouldEqual
ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject
)
mkResource(expectedData)
}
}

"succeed by rev" in {
forAll(List[Option[IdSegment]](None, Some(schemas.resources))) { schema =>
resources.fetch(IdSegmentRef(myId, 1), projectRef, schema).accepted shouldEqual
ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject
)
mkResource(expectedData)
}
}

Expand Down Expand Up @@ -653,13 +612,7 @@ class ResourcesImplSpec
val expectedData = ResourceGen.resource(myId, projectRef, source, schemaRev)
val resource =
resources.deleteTag(myId, projectRef, Some(schemas.resources), tag, 2).accepted
resource shouldEqual
ResourceGen.resourceFor(
expectedData,
types = types,
subject = subject,
rev = 3
)
resource shouldEqual mkResource(expectedData).copy(rev = 3)
}

"reject if the resource doesn't exists" in {
Expand Down

0 comments on commit 2d014d1

Please sign in to comment.