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

Pass down custom metadata for file creation and update events #4953

Merged
merged 2 commits into from
May 14, 2024
Merged

Pass down custom metadata for file creation and update events #4953

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1c0c67
Pass down custom metadata for file creation and update events
May 8, 2024
13aff61
Merge branch 'master' into add-back-custom-metadata-create-update
dantb May 13, 2024
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
49 changes: 31 additions & 18 deletions ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/files/FileProcessor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.Files
import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.Files.definition
import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.FileEvent._
import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.FileRejection.{IncorrectRev, ResourceAlreadyExists}
import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.{FileEvent, FileId}
import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.{FileAttributes, FileCustomMetadata, FileEvent, FileId}
import ch.epfl.bluebrain.nexus.delta.plugins.storage.storages.operations.s3.client.S3StorageClient
import ch.epfl.bluebrain.nexus.delta.plugins.storage.storages.{FetchStorage, StorageResource}
import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.api.JsonLdApi
Expand Down Expand Up @@ -49,31 +49,44 @@ class FileProcessor private (
val cRev = event.rev - 1
val project = projectMapper.map(event.project)

def getCustomMetadata(attributes: FileAttributes) = {
val keywords = attributes.keywords
FileCustomMetadata(
attributes.name,
attributes.description,
Option.unless(keywords.isEmpty)(keywords)
)
}

val fileId = FileId(event.id, project)

// TODO: Remove the 5_000_000_000L limit when the multipart works correctly
event match {
case e: FileCreated =>
if (e.attributes.bytes < 5_000_000_000L) {
fileCopier.copyFile(e.project, e.attributes) >>
files.registerFile(FileId(e.id, project), None, None, e.attributes.path, e.tag, e.attributes.mediaType)
} else IO.unit
val attrs = e.attributes
val customMetadata = Some(getCustomMetadata(attrs))
IO.whenA(attrs.bytes < 5_000_000_000L) {
fileCopier.copyFile(e.project, attrs) >>
files.registerFile(fileId, None, customMetadata, attrs.path, e.tag, attrs.mediaType).void
}
case e: FileUpdated =>
if (e.attributes.bytes < 5_000_000_000L) {
fileCopier.copyFile(e.project, e.attributes) >>
// format: off
files.updateRegisteredFile(FileId(e.id, project), None, None, cRev, e.attributes.path, e.tag, e.attributes.mediaType)
// format: on
} else IO.unit
val attrs = e.attributes
val customMetadata = Some(getCustomMetadata(attrs))
IO.whenA(attrs.bytes < 5_000_000_000L) {
fileCopier.copyFile(e.project, attrs) >>
files.updateRegisteredFile(fileId, None, customMetadata, cRev, attrs.path, e.tag, attrs.mediaType).void
}
case e: FileCustomMetadataUpdated =>
files.updateMetadata(FileId(e.id, project), cRev, e.metadata, e.tag)
files.updateMetadata(fileId, cRev, e.metadata, e.tag)
case _: FileAttributesUpdated => IO.unit
case e: FileTagAdded =>
files.tag(FileId(e.id, project), e.tag, e.targetRev, cRev)
files.tag(fileId, e.tag, e.targetRev, cRev)
case e: FileTagDeleted =>
files.deleteTag(FileId(e.id, project), e.tag, cRev)
case e: FileDeprecated =>
files.deprecate(FileId(e.id, project), cRev)
case e: FileUndeprecated =>
files.undeprecate(FileId(e.id, project), cRev)
files.deleteTag(fileId, e.tag, cRev)
case _: FileDeprecated =>
files.deprecate(fileId, cRev)
case _: FileUndeprecated =>
files.undeprecate(fileId, cRev)
}
}.redeemWith(
{
Expand Down