sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-21 01:36:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix group save with removal of all peers

Browse Source
This commit is contained in:
Pascal Fischer
2025-07-03 18:50:17 +02:00
parent 982b9604ee
commit 542dbdb41c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -480,8 +480,9 @@ func (s *SqlStore) SaveGroups(ctx context.Context, lockStrength LockingStrength,
for _, g := range groups {
if len(g.GroupPeers) == 0 {
if err := tx.Model(&g).Association("GroupPeers").Clear(); err != nil {
return status.Errorf(status.Internal, "failed to clear group peers: %s", err)
if err := tx.Where("group_id = ?", g.ID).Delete(&types.GroupPeer{}).Error; err != nil {
log.WithContext(ctx).Errorf("failed to delete group peers for group %s: %s", g.ID, err)
return status.Errorf(status.Internal, "failed to delete group peers")
}
} else {
if err := tx.Model(&g).Association("GroupPeers").Replace(g.GroupPeers); err != nil {
@@ -1838,8 +1839,9 @@ func (s *SqlStore) SaveGroup(ctx context.Context, lockStrength LockingStrength,
}
if len(group.GroupPeers) == 0 {
if err := s.db.Model(&group).Association("GroupPeers").Clear(); err != nil {
return status.Errorf(status.Internal, "failed to clear group peers: %s", err)
if err := s.db.Where("group_id = ?", group.ID).Delete(&types.GroupPeer{}).Error; err != nil {
log.WithContext(ctx).Errorf("failed to delete group peers for group %s: %s", group.ID, err)
return status.Errorf(status.Internal, "failed to delete group peers")
}
} else {
if err := s.db.Model(&group).Association("GroupPeers").Replace(group.GroupPeers); err != nil {