mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-07-18 19:44:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not retrieve resources twice

Browse Source
This commit is contained in:
André Duffeck
2025-05-15 11:56:49 +02:00
parent 4b5c45254e
commit daa650123c
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/activitylog/pkg/service/service.go
View File

@@ -387,6 +387,7 @@ func (a *ActivitylogService) activities(rid *provider.ResourceId) ([]RawActivity
// note: getResource is abstracted to allow unit testing, in general this will just be utils.GetResource
func (a *ActivitylogService) addActivity(ctx context.Context, initRef *provider.Reference, parentId *provider.ResourceId, eventID string, timestamp time.Time, getResource func(*provider.Reference) (*provider.ResourceInfo, error)) error {
var (
err error
info *provider.ResourceInfo
depth int
ref = initRef
@@ -395,7 +396,7 @@ func (a *ActivitylogService) addActivity(ctx context.Context, initRef *provider.
id := ref.GetResourceId()
if ref.Path != "" {
// Path based reference, we need to resolve the resource id
info, err := getResource(ref)
info, err = getResource(ref)
if err != nil {
return fmt.Errorf("could not get resource info: %w", err)
}
@@ -424,11 +425,13 @@ func (a *ActivitylogService) addActivity(ctx context.Context, initRef *provider.
// if it is not cached, get the resource info and cache it
if parentId == nil {
if v, err := a.parentIdCache.Get(key); err != nil {
_, span = a.tracer.Start(ctx, "getResource")
info, err = getResource(ref)
span.End()
if err != nil || info.GetParentId() == nil || info.GetParentId().GetOpaqueId() == "" {
return fmt.Errorf("could not get parent id: %w", err)
if info == nil {
_, span = a.tracer.Start(ctx, "getResource")
info, err = getResource(ref)
span.End()
if err != nil || info.GetParentId() == nil || info.GetParentId().GetOpaqueId() == "" {
return fmt.Errorf("could not get parent id: %w", err)
}
}
parentId = info.GetParentId()
a.parentIdCache.Set(key, parentId)