From 871500c5cc0523cfb5a0032a2a56bfd10366edf3 Mon Sep 17 00:00:00 2001 From: bcmmbaga Date: Sat, 9 Nov 2024 01:52:09 +0300 Subject: [PATCH] fix merge Signed-off-by: bcmmbaga --- management/server/setupkey.go | 4 ++-- management/server/store.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/management/server/setupkey.go b/management/server/setupkey.go index 160e93448..d6e92fe3a 100644 --- a/management/server/setupkey.go +++ b/management/server/setupkey.go @@ -433,7 +433,7 @@ func (am *DefaultAccountManager) prepareSetupKeyEvents(ctx context.Context, tran var eventsToStore []func() for _, g := range removedGroups { - group, err := transaction.GetGroupByID(ctx, LockingStrengthShare, g, accountID) + group, err := transaction.GetGroupByID(ctx, LockingStrengthShare, accountID, g) if err != nil { log.WithContext(ctx).Debugf("skipped adding group: %s GroupRemovedFromSetupKey activity: %v", g, err) continue @@ -444,7 +444,7 @@ func (am *DefaultAccountManager) prepareSetupKeyEvents(ctx context.Context, tran } for _, g := range addedGroups { - group, err := transaction.GetGroupByID(ctx, LockingStrengthShare, g, accountID) + group, err := transaction.GetGroupByID(ctx, LockingStrengthShare, accountID, g) if err != nil { log.WithContext(ctx).Debugf("skipped adding group: %s GroupAddedToSetupKey activity: %v", g, err) continue diff --git a/management/server/store.go b/management/server/store.go index cb3c533dd..68b57204b 100644 --- a/management/server/store.go +++ b/management/server/store.go @@ -71,7 +71,7 @@ type Store interface { DeleteTokenID2UserIDIndex(tokenID string) error GetAccountGroups(ctx context.Context, lockStrength LockingStrength, accountID string) ([]*nbgroup.Group, error) - GetGroupByID(ctx context.Context, lockStrength LockingStrength, groupID, accountID string) (*nbgroup.Group, error) + GetGroupByID(ctx context.Context, lockStrength LockingStrength, accountID, groupID string) (*nbgroup.Group, error) GetGroupByName(ctx context.Context, lockStrength LockingStrength, groupName, accountID string) (*nbgroup.Group, error) SaveGroups(ctx context.Context, lockStrength LockingStrength, groups []*nbgroup.Group) error SaveGroup(ctx context.Context, lockStrength LockingStrength, group *nbgroup.Group) error