From 7b9290771341d9278252ad58336c6fb9fd4a7362 Mon Sep 17 00:00:00 2001 From: kobergj Date: Tue, 12 Mar 2024 10:59:03 +0100 Subject: [PATCH] enhancement: add spaceid to sse (#8620) Signed-off-by: jkoberg --- changelog/unreleased/add-spaceid-to-sse.md | 5 +++++ services/clientlog/pkg/service/events.go | 1 + services/clientlog/pkg/service/service.go | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 changelog/unreleased/add-spaceid-to-sse.md diff --git a/changelog/unreleased/add-spaceid-to-sse.md b/changelog/unreleased/add-spaceid-to-sse.md new file mode 100644 index 000000000..fbeabb07a --- /dev/null +++ b/changelog/unreleased/add-spaceid-to-sse.md @@ -0,0 +1,5 @@ + Enhancement: Add the spaceID to sse + + Adds the spaceID to all clientlog sse messages + + https://github.com/owncloud/ocis/pull/8614 diff --git a/services/clientlog/pkg/service/events.go b/services/clientlog/pkg/service/events.go index 16d4a278b..48a3831d0 100644 --- a/services/clientlog/pkg/service/events.go +++ b/services/clientlog/pkg/service/events.go @@ -4,4 +4,5 @@ package service type FileEvent struct { ParentItemID string `json:"parentitemid"` ItemID string `json:"itemid"` + SpaceID string `json:"spaceid"` } diff --git a/services/clientlog/pkg/service/service.go b/services/clientlog/pkg/service/service.go index c3842d79d..e481b4845 100644 --- a/services/clientlog/pkg/service/service.go +++ b/services/clientlog/pkg/service/service.go @@ -120,6 +120,7 @@ func (cl *ClientlogService) processEvent(event events.Event) { ItemID: storagespace.FormatResourceID(*e.ID), // TODO: check with web if parentID is needed // ParentItemID: storagespace.FormatResourceID(*item.GetRef().GetResourceId()), + SpaceID: e.ID.GetSpaceId(), } users, err = utils.GetSpaceMembers(ctx, e.ID.GetSpaceId(), gwc, utils.ViewerRole) @@ -181,6 +182,7 @@ func processFileEvent(ctx context.Context, ref *provider.Reference, gwc gateway. data := FileEvent{ ParentItemID: storagespace.FormatResourceID(*info.GetParentId()), ItemID: storagespace.FormatResourceID(*info.GetId()), + SpaceID: info.GetSpace().GetId().GetOpaqueId(), } users, err := utils.GetSpaceMembers(ctx, info.GetSpace().GetId().GetOpaqueId(), gwc, utils.ViewerRole)