feat: add more sse events

Signed-off-by: jkoberg <jkoberg@owncloud.com>

changelog/unreleased/more-sse-events.md

@@ -0,0 +1,5 @@
+Enhancement: Send more sse events
+
+We added sse events for `ItemTrashed`, `ItemRestored`,`ContainerCreated` and `FileRenamed`
+
+https://github.com/owncloud/ocis/pull/8587

services/clientlog/pkg/command/server.go

@@ -26,6 +26,10 @@ import (
 // all events we care about
 var _registeredEvents = []events.Unmarshaller{
 	events.UploadReady{},
+	events.ItemTrashed{},
+	events.ItemRestored{},
+	events.ItemMoved{},
+	events.ContainerCreated{},
 }
 
 // Server is the entrypoint for the server command.

services/clientlog/pkg/service/events.go

@@ -1,7 +1,7 @@
 package service
 
-// FileReadyEvent is emitted when the postprocessing of a file is finished
+// FileEvent is emitted when a file is uploaded/renamed/deleted/...
-type FileReadyEvent struct {
+type FileEvent struct {
 	ParentItemID string `json:"parentitemid"`
 	ItemID       string `json:"itemid"`
 }

services/clientlog/pkg/service/service.go

@@ -8,6 +8,7 @@ import (
 	"reflect"
 
 	gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
+	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 	"go.opentelemetry.io/otel/trace"
 
 	"github.com/cs3org/reva/v2/pkg/events"
@@ -97,19 +98,24 @@ func (cl *ClientlogService) processEvent(event events.Event) {
 	default:
 		err = errors.New("unhandled event")
 	case events.UploadReady:
-		info, err := utils.GetResource(ctx, e.FileRef, gwc)
+		evType = "postprocessing-finished"
-		if err != nil {
+		users, data, err = processFileEvent(ctx, e.FileRef, gwc)
-			cl.log.Error().Err(err).Interface("event", event).Msg("error getting resource")
+	case events.ItemTrashed:
+		evType = "item-trashed"
+		users, data, err = processFileEvent(ctx, e.Ref, gwc)
+	case events.ItemRestored:
+		evType = "item-restored"
+		users, data, err = processFileEvent(ctx, e.Ref, gwc)
+	case events.ContainerCreated:
+		evType = "folder-created"
+		users, data, err = processFileEvent(ctx, e.Ref, gwc)
+	case events.ItemMoved:
+		// we are only interested in the rename case
+		if !utils.ResourceIDEqual(e.OldReference.GetResourceId(), e.Ref.GetResourceId()) || e.Ref.GetPath() == e.OldReference.GetPath() {
 			return
 		}
-
+		evType = "item-renamed"
-		evType = "postprocessing-finished"
+		users, data, err = processFileEvent(ctx, e.Ref, gwc)
-		data = FileReadyEvent{
-			ParentItemID: storagespace.FormatResourceID(*info.GetParentId()),
-			ItemID:       storagespace.FormatResourceID(*info.GetId()),
-		}
-
-		users, err = utils.GetSpaceMembers(ctx, info.GetSpace().GetId().GetOpaqueId(), gwc, utils.ViewerRole)
 	}
 
 	if err != nil {
@@ -136,3 +142,18 @@ func (cl *ClientlogService) sendSSE(userIDs []string, evType string, data interf
 		Message: b,
 	})
 }
+
+func processFileEvent(ctx context.Context, ref *provider.Reference, gwc gateway.GatewayAPIClient) ([]string, FileEvent, error) {
+	info, err := utils.GetResource(ctx, ref, gwc)
+	if err != nil {
+		return nil, FileEvent{}, err
+	}
+
+	data := FileEvent{
+		ParentItemID: storagespace.FormatResourceID(*info.GetParentId()),
+		ItemID:       storagespace.FormatResourceID(*info.GetId()),
+	}
+
+	users, err := utils.GetSpaceMembers(ctx, info.GetSpace().GetId().GetOpaqueId(), gwc, utils.ViewerRole)
+	return users, data, err
+}