Allow event metrics to have several actions to accomodate tagging during creation/update

delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/model/BlazegraphViewsSerializationSuite.scala

@@ -95,7 +95,7 @@ class BlazegraphViewsSerializationSuite extends SerializationSuite {
           instant,
           subject,
           event.rev,
-          action,
+          Set(action),
           projectRef,
           Label.unsafe("myorg"),
           event.id,

delta/plugins/composite-views/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/model/CompositeViewsSerializationSuite.scala

@@ -59,13 +59,15 @@ class CompositeViewsSerializationSuite extends SerializationSuite with Composite
           Instant.EPOCH,
           subject,
           event.rev,
-          event match {
-            case _: CompositeViewCreated      => Created
-            case _: CompositeViewUpdated      => Updated
-            case _: CompositeViewTagAdded     => Tagged
-            case _: CompositeViewDeprecated   => Deprecated
-            case _: CompositeViewUndeprecated => Undeprecated
-          },
+          Set(
+            event match {
+              case _: CompositeViewCreated      => Created
+              case _: CompositeViewUpdated      => Updated
+              case _: CompositeViewTagAdded     => Tagged
+              case _: CompositeViewDeprecated   => Deprecated
+              case _: CompositeViewUndeprecated => Undeprecated
+            }
+          ),
           projectRef,
           Label.unsafe("myorg"),
           event.id,

delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/metrics/MetricsStream.scala

@@ -25,7 +25,7 @@ object MetricsStream {
     Instant.EPOCH,
     Anonymous,
     1,
-    Created,
+    Set(Created),
     projectRef1,
     org,
     iri"http://bbp.epfl.ch/file1",
@@ -40,7 +40,7 @@ object MetricsStream {
     Instant.EPOCH,
     Anonymous,
     2,
-    Updated,
+    Set(Updated),
     projectRef1,
     org,
     iri"http://bbp.epfl.ch/file1",
@@ -55,7 +55,7 @@ object MetricsStream {
     Instant.EPOCH,
     Anonymous,
     3,
-    Tagged,
+    Set(Tagged),
     projectRef1,
     org,
     iri"http://bbp.epfl.ch/file1",
@@ -68,7 +68,7 @@ object MetricsStream {
     Instant.EPOCH,
     Anonymous,
     4,
-    TagDeleted,
+    Set(TagDeleted),
     projectRef1,
     org,
     iri"http://bbp.epfl.ch/file1",
@@ -81,7 +81,7 @@ object MetricsStream {
     Instant.EPOCH,
     Anonymous,
     1,
-    Created,
+    Set(Created),
     projectRef2,
     org,
     iri"http://bbp.epfl.ch/file2",
@@ -96,7 +96,7 @@ object MetricsStream {
     Instant.EPOCH,
     Anonymous,
     2,
-    Deprecated,
+    Set(Deprecated),
     projectRef2,
     org,
     iri"http://bbp.epfl.ch/file2",

delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/model/ElasticSearchViewSerializationSuite.scala

@@ -103,7 +103,7 @@ class ElasticSearchViewSerializationSuite extends SerializationSuite {
           instant,
           subject,
           event.rev,
-          action,
+          Set(action),
           projectRef,
           Label.unsafe("myorg"),
           event.id,

delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/model/FileEvent.scala

@@ -1,5 +1,6 @@
 package ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model
 
+import cats.syntax.all._
 import akka.http.scaladsl.model.ContentType
 import ch.epfl.bluebrain.nexus.delta.kernel.utils.FileUtils
 import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.FileAttributes.FileAttributesOrigin
@@ -384,15 +385,15 @@ object FileEvent {
         ProjectScopedMetric.from(
           event,
           event match {
-            case _: FileCreated               => Created
-            case _: FileUpdated               => Updated
-            case _: FileAttributesUpdated     => Updated
-            case _: FileCustomMetadataUpdated => Updated
-            case _: FileTagAdded              => Tagged
-            case _: FileTagDeleted            => TagDeleted
-            case _: FileDeprecated            => Deprecated
-            case _: FileUndeprecated          => Undeprecated
-            case _: FileCancelledEvent        => Cancelled
+            case c: FileCreated               => Set(Created) ++ c.tag.as(Tagged)
+            case u: FileUpdated               => Set(Updated) ++ u.tag.as(Tagged)
+            case _: FileAttributesUpdated     => Set(Updated)
+            case _: FileCustomMetadataUpdated => Set(Updated)
+            case _: FileTagAdded              => Set(Tagged)
+            case _: FileTagDeleted            => Set(TagDeleted)
+            case _: FileDeprecated            => Set(Deprecated)
+            case _: FileUndeprecated          => Set(Undeprecated)
+            case _: FileCancelledEvent        => Set(Cancelled)
           },
           event.id,
           Set(nxvFile),

delta/plugins/storage/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/model/FileSerializationSuite.scala

@@ -102,77 +102,77 @@ class FileSerializationSuite extends SerializationSuite with StorageFixtures {
       "FileCreated",
       created,
       loadEvents("files", "file-created.json"),
-      Created,
+      Set(Created),
       expectedExtraFields(created, Some(1), None, None, None, clientOrigin)
     ),
     (
       "FileCreated with metadata",
       createdWithMetadata,
       loadEvents("files", "file-created-with-metadata.json"),
-      Created,
+      Set(Created),
       expectedExtraFields(created, Some(1), None, None, None, clientOrigin)
     ),
     (
       "FileCreated with tags",
       createdTagged,
       loadEvents("files", "file-created-tagged.json"),
-      Created,
+      Set(Created, Tagged),
       expectedExtraFields(createdTagged, Some(1), None, None, None, clientOrigin)
     ),
     (
       "FileCreated with tags and keywords",
       createdTaggedWithMetadata,
       loadEvents("files", "file-created-tagged-with-metadata.json"),
-      Created,
+      Set(Created, Tagged),
       expectedExtraFields(createdTaggedWithMetadata, Some(1), None, None, None, clientOrigin)
     ),
     (
       "FileUpdated",
       updated,
       loadEvents("files", "file-updated.json"),
-      Updated,
+      Set(Updated, Tagged),
       expectedExtraFields(updated, Some(1), Some(12), textContent, Some("txt"), clientOrigin)
     ),
     (
       "FileAttributesUpdated",
       updatedAttr,
       loadEvents("files", "file-attributes-created-updated.json"),
-      Updated,
+      Set(Updated),
       expectedExtraFields(updatedAttr, None, Some(12), textContent, None, storageOrigin)
     ),
     (
       "FileCustomMetadataUpdated",
       updatedMetadata,
       loadEvents("files", "file-custom-metadata-updated.json"),
-      Updated,
+      Set(Updated),
       expectedExtraFields(updatedMetadata, None, None, None, None, None)
     ),
     (
       "FileTagAdded",
       tagged,
       loadEvents("files", "file-tag-added.json"),
-      Tagged,
+      Set(Tagged),
       expectedExtraFields(tagged, None, None, None, None, None)
     ),
     (
       "FileTagDeleted",
       tagDeleted,
       loadEvents("files", "file-tag-deleted.json"),
-      TagDeleted,
+      Set(TagDeleted),
       expectedExtraFields(tagDeleted, None, None, None, None, None)
     ),
     (
       "FileDeprecated",
       deprecated,
       loadEvents("files", "file-deprecated.json"),
-      Deprecated,
+      Set(Deprecated),
       expectedExtraFields(deprecated, None, None, None, None, None)
     ),
     (
       "FileUndeprecated",
       undeprecated,
       loadEvents("files", "file-undeprecated.json"),
-      Undeprecated,
+      Set(Undeprecated),
       expectedExtraFields(undeprecated, None, None, None, None, None)
     )
   )

delta/plugins/storage/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/storages/model/StorageSerializationSuite.scala

@@ -72,7 +72,7 @@ class StorageSerializationSuite extends SerializationSuite with StorageFixtures
           instant,
           subject,
           event.rev,
-          action,
+          Set(action),
           projectRef,
           Label.unsafe("myorg"),
           event.id,

delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/model/metrics/EventMetric.scala

@@ -45,7 +45,7 @@ sealed trait EventMetric extends Product with Serializable {
     * @return
     *   the action performed
     */
-  def action: Label
+  def action: Set[Label]
 
   /**
     * @return
@@ -76,6 +76,7 @@ object EventMetric {
   val Deprecated: Label   = Label.unsafe("Deprecated")
   val Undeprecated: Label = Label.unsafe("Undeprecated")
   val Cancelled: Label    = Label.unsafe("Cancelled")
+  val Deleted: Label      = Label.unsafe("Deleted")
 
   /**
     * Metric extracted from an event independent from an org/project
@@ -84,7 +85,7 @@ object EventMetric {
       instant: Instant,
       subject: Subject,
       rev: Int,
-      action: Label,
+      action: Set[Label],
       resourceId: Iri,
       types: Set[Iri],
       additionalFields: JsonObject
@@ -99,7 +100,7 @@ object EventMetric {
       instant: Instant,
       subject: Subject,
       rev: Int,
-      action: Label,
+      action: Set[Label],
       organization: Label,
       resourceId: Iri,
       types: Set[Iri],
@@ -115,7 +116,7 @@ object EventMetric {
       instant: Instant,
       subject: Subject,
       rev: Int,
-      action: Label,
+      action: Set[Label],
       project: ProjectRef,
       organization: Label,
       resourceId: Iri,
@@ -128,7 +129,7 @@ object EventMetric {
   object ProjectScopedMetric {
     def from[E <: ScopedEvent](
         event: E,
-        action: Label,
+        action: Set[Label],
         id: Iri,
         types: Set[Iri],
         additionalFields: JsonObject
@@ -144,6 +145,25 @@ object EventMetric {
         types,
         additionalFields
       )
+
+    def from[E <: ScopedEvent](
+        event: E,
+        action: Label,
+        id: Iri,
+        types: Set[Iri],
+        additionalFields: JsonObject
+    ): ProjectScopedMetric =
+      ProjectScopedMetric(
+        event.instant,
+        event.subject,
+        event.rev,
+        Set(action),
+        event.project,
+        event.project.organization,
+        id,
+        types,
+        additionalFields
+      )
   }
 
   implicit val eventMetricEncoder: Encoder.AsObject[EventMetric] = {

delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resources/model/ResourceEvent.scala

@@ -1,5 +1,6 @@
 package ch.epfl.bluebrain.nexus.delta.sdk.resources.model
 
+import cats.syntax.all._
 import ch.epfl.bluebrain.nexus.delta.rdf.IriOrBNode.Iri
 import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.{contexts, nxv}
 import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.ContextValue
@@ -437,14 +438,14 @@ object ResourceEvent {
         ProjectScopedMetric.from(
           event,
           event match {
-            case _: ResourceCreated       => Created
-            case _: ResourceUpdated       => Updated
-            case _: ResourceRefreshed     => Refreshed
-            case _: ResourceTagAdded      => Tagged
-            case _: ResourceTagDeleted    => TagDeleted
-            case _: ResourceDeprecated    => Deprecated
-            case _: ResourceUndeprecated  => Undeprecated
-            case _: ResourceSchemaUpdated => Updated
+            case c: ResourceCreated        => Set(Created) ++ c.tag.as(Tagged)
+            case u: ResourceUpdated        => Set(Updated) ++ u.tag.as(Tagged)
+            case _: ResourceRefreshed      => Set(Refreshed)
+            case _: ResourceTagAdded       => Set(Tagged)
+            case _: ResourceTagDeleted     => Set(TagDeleted)
+            case _: ResourceDeprecated     => Set(Deprecated)
+            case _: ResourceUndeprecated   => Set(Undeprecated)
+            case su: ResourceSchemaUpdated => Set(Updated) ++ su.tag.as(Tagged)
           },
           event.id,
           event.types,

delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/model/metrics/EventMetricSpec.scala

@@ -41,7 +41,7 @@ class EventMetricSpec extends BaseSpec with CirceLiteral {
         Instant.EPOCH,
         Anonymous,
         2,
-        EventMetric.Created,
+        Set(EventMetric.Created),
         event.project,
         event.project.organization,
         id,
@@ -54,7 +54,7 @@ class EventMetricSpec extends BaseSpec with CirceLiteral {
                                         "subject" : {
                                           "@type" : "Anonymous"
                                         },
-                                        "action" : "Created",
+                                        "action" : ["Created"],
                                         "@id" : "https://bluebrain.github.io/nexus/vocabulary/id",
                                         "@type" : [
                                           {

delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/model/ProjectSerializationSuite.scala

@@ -114,7 +114,7 @@ class ProjectSerializationSuite extends SerializationSuite {
           instant,
           subject,
           rev,
-          action,
+          Set(action),
           ProjectRef(org, proj),
           org,
           iri"http://localhost/v1/projects/myorg/myproj",

delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/model/ResolverSerializationSuite.scala

@@ -196,7 +196,7 @@ class ResolverSerializationSuite extends SerializationSuite {
           instant,
           subject,
           event.rev,
-          action,
+          Set(action),
           ProjectRef(org, proj),
           org,
           event.id,