Skip to content

Remove MAC settings profile reference on end device delete #7601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 30, 2025
Merged

Remove MAC settings profile reference on end device delete #7601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d2a9e9
ns: Remove MAC settings profile reference on end device delete
halimi Apr 24, 2025
b14a57b
ns: Remove MAC settings profile reference on batch end device delete
halimi Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions pkg/networkserver/grpc_deviceregistry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,10 +1613,25 @@ func (ns *NetworkServer) Delete(ctx context.Context, req *ttnpb.EndDeviceIdentif
return nil, err
}
var evt events.Event
_, _, err := ns.devices.SetByID(ctx, req.ApplicationIds, req.DeviceId, nil, func(ctx context.Context, dev *ttnpb.EndDevice) (*ttnpb.EndDevice, []string, error) {
_, _, err := ns.devices.SetByID(ctx, req.ApplicationIds, req.DeviceId, []string{"mac_settings_profile_ids"}, func(ctx context.Context, dev *ttnpb.EndDevice) (*ttnpb.EndDevice, []string, error) { // nolint: lll
if dev == nil {
return nil, nil, errDeviceNotFound.New()
}
if dev.MacSettingsProfileIds != nil {
_, err := ns.macSettingsProfiles.Set(
ctx,
dev.MacSettingsProfileIds,
[]string{"ids", "mac_settings", "end_devices_count"},
func(_ context.Context, existing *ttnpb.MACSettingsProfile) (*ttnpb.MACSettingsProfile, []string, error) {
if existing.EndDevicesCount > 0 {
existing.EndDevicesCount--
}
return existing, []string{"ids", "mac_settings", "end_devices_count"}, nil
})
if err != nil {
return nil, nil, err
}
}
evt = evtDeleteEndDevice.NewWithIdentifiersAndData(ctx, req, nil)
return nil, nil, nil
})
Expand Down Expand Up @@ -1651,7 +1666,27 @@ func (srv *nsEndDeviceBatchRegistry) Delete(
); err != nil {
return nil, err
}
deleted, err := srv.devices.BatchDelete(ctx, req.ApplicationIds, req.DeviceIds)
deleted, err := srv.devices.BatchDelete(ctx, req.ApplicationIds, req.DeviceIds, func(dev *ttnpb.EndDevice) error {
if dev == nil {
return errDeviceNotFound.New()
}
if dev.MacSettingsProfileIds != nil {
_, err := srv.macSettingsProfiles.Set(
ctx,
dev.MacSettingsProfileIds,
[]string{"ids", "mac_settings", "end_devices_count"},
func(_ context.Context, existing *ttnpb.MACSettingsProfile) (*ttnpb.MACSettingsProfile, []string, error) {
if existing.EndDevicesCount > 0 {
existing.EndDevicesCount--
}
return existing, []string{"ids", "mac_settings", "end_devices_count"}, nil
})
if err != nil {
return err
}
}
return nil
})
if err != nil {
logRegistryRPCError(ctx, err, "Failed to delete device from registry")
return nil, err
Expand Down
Loading
Loading