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

Jump to bottom

fix(Resource): return sensible CreationDate for DeletedResource (DEV-375) #1979

Merged
merged 4 commits into from Jan 17, 2022
Merged

fix(Resource): return sensible CreationDate for DeletedResource (DEV-375) #1979

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
794d0ae
fix(Resource): return sensible CreationDate for DeletedResource
BalduinLandolt Jan 13, 2022
8caaa20
Merge branch 'main' into wip/DEV-375-creation-date-of-deleted-resource
BalduinLandolt Jan 13, 2022
125421c
Merge branch 'main' into wip/DEV-375-creation-date-of-deleted-resource
BalduinLandolt Jan 17, 2022
824e721
Merge branch 'main' into wip/DEV-375-creation-date-of-deleted-resource
BalduinLandolt Jan 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...in/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala
View file
Open in desktop
Expand Up @@ -556,8 +556,8 @@ case class ReadResourceV2(
permissions = this.permissions,
userPermission = this.userPermission,
values = Map.empty,
creationDate = Instant.now(),
lastModificationDate = None,
creationDate = this.creationDate,
lastModificationDate = this.lastModificationDate,
versionDate = None,
deletionInfo = this.deletionInfo
)
Expand Down
3 changes: 3 additions & 0 deletions webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala
View file
Open in desktop
Expand Up @@ -53,6 +53,7 @@ object ResourcesResponderV2Spec {

private val aThingIri = "http://rdfh.ch/0001/a-thing"
private var aThingLastModificationDate = Instant.now
private val aThingCreationDate = Instant.parse("2016-03-02T15:05:10Z")

private val resourceIriToErase = new MutableTestIri
private val firstValueIriToErase = new MutableTestIri
Expand Down Expand Up @@ -1971,6 +1972,8 @@ class ResourcesResponderV2Spec extends CoreSpec() with ImplicitSender {
val resource = response.resources.head
resource.resourceClassIri should equal(OntologyConstants.KnoraBase.DeletedResource.toSmartIri)
resource.deletionInfo should not be (None)
resource.lastModificationDate should not be (None)
resource.creationDate should equal(aThingCreationDate)
println(resource)
}
}
Expand Down