From 9ef00dbf277dc9351e7e23b39f8cfcd8a535bf06 Mon Sep 17 00:00:00 2001 From: jkoberg Date: Tue, 17 Sep 2024 10:07:37 +0200 Subject: [PATCH] feat(activitylog): Add FileUpdated Activity Signed-off-by: jkoberg --- changelog/unreleased/fileupdated-activity.md | 5 +++++ services/activitylog/pkg/service/http.go | 3 +++ services/activitylog/pkg/service/response.go | 1 + .../features/apiActivities/shareActivities.feature | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 changelog/unreleased/fileupdated-activity.md diff --git a/changelog/unreleased/fileupdated-activity.md b/changelog/unreleased/fileupdated-activity.md new file mode 100644 index 0000000000..484922af5f --- /dev/null +++ b/changelog/unreleased/fileupdated-activity.md @@ -0,0 +1,5 @@ +Enhancement: Add an Activity for FileUpdated + +Previously FileUpdated has also triggered a FileAdded Activity + +https://github.com/owncloud/ocis/pull/10072 diff --git a/services/activitylog/pkg/service/http.go b/services/activitylog/pkg/service/http.go index deaebe9465..208e9c9f5b 100644 --- a/services/activitylog/pkg/service/http.go +++ b/services/activitylog/pkg/service/http.go @@ -109,6 +109,9 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h continue case events.UploadReady: message = MessageResourceCreated + if ev.IsVersion { + message = MessageResourceUpdated + } ts = utils.TSToTime(ev.Timestamp) vars, err = s.GetVars(ctx, WithResource(ev.FileRef, true), WithUser(ev.ExecutingUser.GetId(), ev.ExecutingUser.GetDisplayName()), WithSpace(toSpace(ev.FileRef))) case events.FileTouched: diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go index c03dc9f169..4c0b59c7d9 100644 --- a/services/activitylog/pkg/service/response.go +++ b/services/activitylog/pkg/service/response.go @@ -21,6 +21,7 @@ import ( // Translations var ( MessageResourceCreated = l10n.Template("{user} added {resource} to {space}") + MessageResourceUpdated = l10n.Template("{user} updated {resource} in {space}") MessageResourceTrashed = l10n.Template("{user} deleted {resource} from {space}") MessageResourceMoved = l10n.Template("{user} moved {resource} to {space}") MessageResourceRenamed = l10n.Template("{user} renamed {oldResource} to {resource}") diff --git a/tests/acceptance/features/apiActivities/shareActivities.feature b/tests/acceptance/features/apiActivities/shareActivities.feature index 4994330b0e..c92c2dc7c9 100644 --- a/tests/acceptance/features/apiActivities/shareActivities.feature +++ b/tests/acceptance/features/apiActivities/shareActivities.feature @@ -637,7 +637,7 @@ Feature: check share activity "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} updated {resource} in {space}" }, "variables": { "type": "object",