sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-20 09:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tests and group copy

Browse Source
This commit is contained in:
Pascal Fischer
2025-07-03 16:04:33 +02:00
parent fee36b0663
commit a8cba921e1
4 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
management/server/store/sql_store.go
View File

@@ -1443,13 +1443,13 @@ func (s *SqlStore) RemoveResourceFromGroup(ctx context.Context, accountId string
// GetPeerGroups retrieves all groups assigned to a specific peer in a given account.
func (s *SqlStore) GetPeerGroups(ctx context.Context, lockStrength LockingStrength, accountId string, peerId string) ([]*types.Group, error) {
tx := s.db.Debug()
tx := s.db
if lockStrength != LockingStrengthNone {
tx = tx.Clauses(clause.Locking{Strength: string(lockStrength)})
}
var groupIDs []string
err := s.db.
err := tx.
Table("group_peers").
Where("peer_id = ?", peerId).
Pluck("group_id", &groupIDs).Error
@@ -1461,7 +1461,7 @@ func (s *SqlStore) GetPeerGroups(ctx context.Context, lockStrength LockingStreng
}
var groups []*types.Group
err = s.db.
err = tx.
Where("id IN ?", groupIDs).
Preload("GroupPeers").
Find(&groups).Error
@@ -1825,6 +1825,7 @@ func (s *SqlStore) SaveGroup(ctx context.Context, lockStrength LockingStrength,
return status.Errorf(status.InvalidArgument, "group is nil")
}
group = group.Copy()
group.StoreGroupPeers()
if err := s.db.Save(group).Error; err != nil {