From c30b4aeb54eb38280f1ffbdd42dba6160e73fa3b Mon Sep 17 00:00:00 2001
From: Roman Perekhod <rperekhod@owncloud.com>
Date: Thu, 26 Sep 2024 12:26:03 +0200
Subject: [PATCH] the code duplication was reduced

---
 services/activitylog/pkg/service/response.go | 33 +++++++++-----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go
index 587b1ff7d..2dfdd67d3 100644
--- a/services/activitylog/pkg/service/response.go
+++ b/services/activitylog/pkg/service/response.go
@@ -80,15 +80,7 @@ func WithResource(ref *provider.Reference, addSpace bool) ActivityOption {
 			vars["resource"] = Resource{
 				Name: filepath.Base(ref.GetPath()),
 			}
-			n := filepath.Base(filepath.Dir(ref.GetPath()))
-			if n == "." || n == "/" {
-				s, err := utils.GetSpace(ctx, toSpace(ref).GetOpaqueId(), gwc)
-				if err == nil {
-					n = s.GetName()
-				} else {
-					n = "root"
-				}
-			}
+			n := getFolderName(ctx, gwc, ref)
 			vars["folder"] = Resource{
 				Name: n,
 			}
@@ -137,15 +129,7 @@ func WithTrashedResource(ref *provider.Reference, rid *provider.ResourceId) Acti
 		vars["resource"] = Resource{
 			Name: filepath.Base(ref.GetPath()),
 		}
-		n := filepath.Base(filepath.Dir(ref.GetPath()))
-		if n == "." || n == "/" {
-			s, err := utils.GetSpace(ctx, toSpace(ref).GetOpaqueId(), gwc)
-			if err == nil {
-				n = s.GetName()
-			} else {
-				n = "root"
-			}
-		}
+		n := getFolderName(ctx, gwc, ref)
 		vars["folder"] = Resource{
 			Name: n,
 		}
@@ -334,6 +318,19 @@ func (s *ActivitylogService) GetVars(ctx context.Context, opts ...ActivityOption
 	return vars, nil
 }
 
+func getFolderName(ctx context.Context, gwc gateway.GatewayAPIClient, ref *provider.Reference) string {
+	n := filepath.Base(filepath.Dir(ref.GetPath()))
+	if n == "." || n == "/" {
+		s, err := utils.GetSpace(ctx, toSpace(ref).GetOpaqueId(), gwc)
+		if err == nil {
+			n = s.GetName()
+		} else {
+			n = "root"
+		}
+	}
+	return n
+}
+
 func mapField(val string) string {
 	switch val {
 	case "TYPE_PERMISSIONS", "permission":