From e9e195789d367fccb7ae005774ba640475e56f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Fri, 24 Apr 2026 11:46:53 +0200 Subject: [PATCH] Adapt to changes in reva/cs3apis --- services/graph/pkg/service/v0/follow.go | 32 ++++++++++++-------- services/search/pkg/service/event/service.go | 8 ++--- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/services/graph/pkg/service/v0/follow.go b/services/graph/pkg/service/v0/follow.go index 4ccf20c171..6ab6447b82 100644 --- a/services/graph/pkg/service/v0/follow.go +++ b/services/graph/pkg/service/v0/follow.go @@ -12,6 +12,8 @@ import ( "github.com/opencloud-eu/reva/v2/pkg/events" ) +const _favoriteLabel = "favorite" + // FollowDriveItem marks a drive item as favorite. func (g Graph) FollowDriveItem(w http.ResponseWriter, r *http.Request) { ctx := r.Context() @@ -59,34 +61,36 @@ func (g Graph) FollowDriveItem(w http.ResponseWriter, r *http.Request) { return } - req := &provider.AddFavoriteRequest{ + req := &provider.AddLabelRequest{ Ref: ref, UserId: u.Id, + Label: _favoriteLabel, } - res, err := gatewayClient.AddFavorite(ctx, req) + res, err := gatewayClient.AddLabel(ctx, req) if err != nil { - g.logger.Error().Err(err).Msg("could not add favorite") - errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "could not add favorite") + g.logger.Error().Err(err).Msg("could not add label") + errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "could not add label") return } if res.Status.Code != rpc.Code_CODE_OK { - errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "could not add favorite") + errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "could not add label") return } if g.eventsPublisher != nil { - ev := events.FavoriteAdded{ + ev := events.LabelAdded{ Ref: &provider.Reference{ ResourceId: &itemID, Path: ".", }, + Label: _favoriteLabel, UserID: u.Id, Executant: revaCtx.ContextMustGetUser(r.Context()).Id, } if err := events.Publish(r.Context(), g.eventsPublisher, ev); err != nil { - g.logger.Error().Err(err).Msg("Failed to publish FavoriteAdded event") + g.logger.Error().Err(err).Msg("Failed to publish LabelAdded event") } } @@ -126,15 +130,16 @@ func (g Graph) UnfollowDriveItem(w http.ResponseWriter, r *http.Request) { return } - req := &provider.RemoveFavoriteRequest{ + req := &provider.RemoveLabelRequest{ Ref: ref, UserId: u.Id, + Label: _favoriteLabel, } - res, err := gatewayClient.RemoveFavorite(ctx, req) + res, err := gatewayClient.RemoveLabel(ctx, req) if err != nil { - g.logger.Error().Err(err).Msg("could not remove favorite") - errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "could not remove favorite") + g.logger.Error().Err(err).Msg("could not remove label") + errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "could not remove label") return } @@ -150,16 +155,17 @@ func (g Graph) UnfollowDriveItem(w http.ResponseWriter, r *http.Request) { } if g.eventsPublisher != nil { - ev := events.FavoriteRemoved{ + ev := events.LabelRemoved{ Ref: &provider.Reference{ ResourceId: &itemID, Path: ".", }, + Label: _favoriteLabel, UserID: u.Id, Executant: revaCtx.ContextMustGetUser(r.Context()).Id, } if err := events.Publish(r.Context(), g.eventsPublisher, ev); err != nil { - g.logger.Error().Err(err).Msg("Failed to publish FavoriteRemoved event") + g.logger.Error().Err(err).Msg("Failed to publish LabelRemoved event") } } diff --git a/services/search/pkg/service/event/service.go b/services/search/pkg/service/event/service.go index e5713d4173..adbbd70aa5 100644 --- a/services/search/pkg/service/event/service.go +++ b/services/search/pkg/service/event/service.go @@ -61,8 +61,8 @@ func New(ctx context.Context, stream raw.Stream, logger log.Logger, tp trace.Tra events.TagsAdded{}, events.TagsRemoved{}, events.SpaceRenamed{}, - events.FavoriteAdded{}, - events.FavoriteRemoved{}, + events.LabelAdded{}, + events.LabelRemoved{}, }, numConsumers: numConsumers, } @@ -200,9 +200,9 @@ func (s Service) processEvent(e raw.Event) error { s.indexSpaceDebouncer.Debounce(getSpaceID(ev.FileRef), e.Ack) case events.SpaceRenamed: s.indexSpaceDebouncer.Debounce(ev.ID, e.Ack) - case events.FavoriteAdded: + case events.LabelAdded: s.index.UpsertItem(ev.Ref) - case events.FavoriteRemoved: + case events.LabelRemoved: s.index.UpsertItem(ev.Ref) } return nil