use key to get specific trash item

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
owncloud · Aug 21, 2024 · 78584ed · 78584ed
1 parent ff0ac7e
commit 78584ed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/changelog/unreleased/use-key-to-get-specific-trash-item.md b/changelog/unreleased/use-key-to-get-specific-trash-item.md
@@ -0,0 +1,5 @@
+Bugfix: Use key to get specific trash item
+
+The activitylog and clientlog services now only fetch the specific trash item instead of getting all items in trash and filtering them on their side. This reduces the load on the storage users service because it no longer has to assemble a full trash listing.
+
+https://github.com/owncloud/ocis/pull/9879
diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go
@@ -99,6 +99,7 @@ func WithTrashedResource(ref *provider.Reference, rid *provider.ResourceId) Acti
 
 		resp, err := gwc.ListRecycle(ctx, &provider.ListRecycleRequest{
 			Ref: ref,
+			Key: rid.GetOpaqueId(),
 		})
 		if err != nil {
 			return err

diff --git a/services/clientlog/pkg/service/service.go b/services/clientlog/pkg/service/service.go
@@ -221,6 +221,7 @@ func processShareEvent(ctx context.Context, ref *provider.Reference, gwc gateway
 func processItemTrashedEvent(ctx context.Context, ref *provider.Reference, gwc gateway.GatewayAPIClient, initiatorid string, itemID *provider.ResourceId) ([]string, FileEvent, error) {
 	resp, err := gwc.ListRecycle(ctx, &provider.ListRecycleRequest{
 		Ref: ref,
+		Key: itemID.GetOpaqueId(),
 	})
 	if err != nil {
 		return nil, FileEvent{}, err