move event store outside of transaction

Signed-off-by: bcmmbaga <[email protected]>
netbirdio · Oct 3, 2024 · 37021fc · 37021fc
1 parent 19177fe
commit 37021fc
Showing 1 changed file with 32 additions and 31 deletions.
diff --git a/management/server/account.go b/management/server/account.go
@@ -1855,15 +1855,15 @@ func (am *DefaultAccountManager) syncJWTGroups(ctx context.Context, accountID st
  return fmt.Errorf("error saving groups: %w", err)
  }
 
- err = am.Store.ExecuteInTransaction(ctx, func(transaction Store) error {
- user, err := transaction.GetUserByUserID(ctx, LockingStrengthUpdate, claims.UserId)
- if err != nil {
- return fmt.Errorf("error getting user: %w", err)
- }
+ user, err := am.Store.GetUserByUserID(ctx, LockingStrengthShare, claims.UserId)
+ if err != nil {
+ return fmt.Errorf("error getting user: %w", err)
+ }
 
-  addNewGroups := difference(updatedAutoGroups, user.AutoGroups)
-  removeOldGroups := difference(user.AutoGroups, updatedAutoGroups)
+ addNewGroups := difference(updatedAutoGroups, user.AutoGroups)
+ removeOldGroups := difference(user.AutoGroups, updatedAutoGroups)
 
+ err = am.Store.ExecuteInTransaction(ctx, func(transaction Store) error {
  user.AutoGroups = updatedAutoGroups
  if err = transaction.SaveUser(ctx, LockingStrengthUpdate, user); err != nil {
  return fmt.Errorf("error saving user: %w", err)
@@ -1887,35 +1887,36 @@ func (am *DefaultAccountManager) syncJWTGroups(ctx context.Context, accountID st
  unlockPeer()
  unlockPeer = nil
 
- for _, g := range addNewGroups {
- group, err := transaction.GetGroupByID(ctx, LockingStrengthShare, g, accountID)
- if err != nil {
- log.WithContext(ctx).Debugf("group %s not found while saving user activity event of account %s", g, accountID)
- } else {
- meta := map[string]any{
- "group": group.Name, "group_id": group.ID,
- "is_service_user": user.IsServiceUser, "user_name": user.ServiceUserName,
- }
- am.StoreEvent(ctx, user.Id, user.Id, accountID, activity.GroupAddedToUser, meta)
+ return nil
+ })
+ if err != nil {
+ return err
+ }
+
+ for _, g := range addNewGroups {
+ group, err := am.Store.GetGroupByID(ctx, LockingStrengthShare, g, accountID)
+ if err != nil {
+ log.WithContext(ctx).Debugf("group %s not found while saving user activity event of account %s", g, accountID)
+ } else {
+ meta := map[string]any{
+ "group": group.Name, "group_id": group.ID,
+ "is_service_user": user.IsServiceUser, "user_name": user.ServiceUserName,
  }
+ am.StoreEvent(ctx, user.Id, user.Id, accountID, activity.GroupAddedToUser, meta)
  }
+ }
 
- for _, g := range removeOldGroups {
- group, err := transaction.GetGroupByID(ctx, LockingStrengthShare, g, accountID)
- if err != nil {
- log.WithContext(ctx).Debugf("group %s not found while saving user activity event of account %s", g, accountID)
- } else {
- meta := map[string]any{
- "group": group.Name, "group_id": group.ID,
- "is_service_user": user.IsServiceUser, "user_name": user.ServiceUserName,
- }
- am.StoreEvent(ctx, user.Id, user.Id, accountID, activity.GroupRemovedFromUser, meta)
+ for _, g := range removeOldGroups {
+ group, err := am.Store.GetGroupByID(ctx, LockingStrengthShare, g, accountID)
+ if err != nil {
+ log.WithContext(ctx).Debugf("group %s not found while saving user activity event of account %s", g, accountID)
+ } else {
+ meta := map[string]any{
+ "group": group.Name, "group_id": group.ID,
+ "is_service_user": user.IsServiceUser, "user_name": user.ServiceUserName,
  }
+ am.StoreEvent(ctx, user.Id, user.Id, accountID, activity.GroupRemovedFromUser, meta)
  }
- return nil
- })
- if err != nil {
- return err
  }
 
  if settings.GroupsPropagationEnabled {