From b29dd1bd775ab583048a7d5c53daae49d76fc904 Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Sat, 27 Jun 2026 20:21:27 +0200 Subject: [PATCH] refs(models): remove the deprecated ZoneRequest member helpers (refs #511) Delete RemoveMember, ClearMembers and HasMember (deprecated in the previous commit) plus their tests. They had no production callers after the zone remove paths moved to /removeZoneSlave. Co-Authored-By: Claude Opus 4.8 --- pkg/models/zone.go | 36 -------------------------- pkg/models/zone_test.go | 57 ----------------------------------------- 2 files changed, 93 deletions(-) diff --git a/pkg/models/zone.go b/pkg/models/zone.go index 58cd4b4..aa8e9e3 100644 --- a/pkg/models/zone.go +++ b/pkg/models/zone.go @@ -86,42 +86,6 @@ func (zr *ZoneRequest) AddMemberByDeviceID(deviceID string) { zr.Members = append(zr.Members, member) } -// RemoveMember removes a device from the zone configuration. -// -// Deprecated: unused. Zone members are removed with the /removeZoneSlave -// endpoint (client.RemoveZoneSlave), not by rebuilding the zone via /setZone, so -// this helper has no callers. To be removed. See #511. -func (zr *ZoneRequest) RemoveMember(deviceID string) { - for i, member := range zr.Members { - if member.DeviceID == deviceID { - zr.Members = append(zr.Members[:i], zr.Members[i+1:]...) - return - } - } -} - -// ClearMembers removes all members from the zone (creates standalone configuration). -// -// Deprecated: unused. To make a device standalone, dissolve the zone instead -// (client.DissolveZone, i.e. NewZoneRequest(master) with no members). To be -// removed. See #511. -func (zr *ZoneRequest) ClearMembers() { - zr.Members = []MemberEntry{} -} - -// HasMember checks if a device is in the zone configuration. -// -// Deprecated: unused. To be removed. See #511. -func (zr *ZoneRequest) HasMember(deviceID string) bool { - for _, member := range zr.Members { - if member.DeviceID == deviceID { - return true - } - } - - return false -} - // GetMemberCount returns the number of members in the zone func (zr *ZoneRequest) GetMemberCount() int { return len(zr.Members) diff --git a/pkg/models/zone_test.go b/pkg/models/zone_test.go index cab17a5..b5c0aaa 100644 --- a/pkg/models/zone_test.go +++ b/pkg/models/zone_test.go @@ -56,63 +56,6 @@ func TestZoneRequest_AddMemberByDeviceID(t *testing.T) { } } -func TestZoneRequest_RemoveMember(t *testing.T) { - zr := NewZoneRequest("MASTER123") - zr.AddMember("DEVICE456", "192.0.2.10") - zr.AddMember("DEVICE789", "192.0.2.11") - zr.AddMember("DEVICEABC", "192.0.2.12") - - // Remove middle member - zr.RemoveMember("DEVICE789") - - if len(zr.Members) != 2 { - t.Errorf("Expected 2 members after removal, got %d", len(zr.Members)) - } - - // Check that the correct member was removed - for _, member := range zr.Members { - if member.DeviceID == "DEVICE789" { - t.Error("DEVICE789 should have been removed") - } - } - - // Remove non-existent member (should not change anything) - zr.RemoveMember("NONEXISTENT") - - if len(zr.Members) != 2 { - t.Errorf("Expected 2 members after removing non-existent, got %d", len(zr.Members)) - } -} - -func TestZoneRequest_ClearMembers(t *testing.T) { - zr := NewZoneRequest("MASTER123") - zr.AddMember("DEVICE456", "192.0.2.10") - zr.AddMember("DEVICE789", "192.0.2.11") - - zr.ClearMembers() - - if len(zr.Members) != 0 { - t.Errorf("Expected 0 members after clear, got %d", len(zr.Members)) - } -} - -func TestZoneRequest_HasMember(t *testing.T) { - zr := NewZoneRequest("MASTER123") - zr.AddMember("DEVICE456", "192.0.2.10") - - if !zr.HasMember("DEVICE456") { - t.Error("Expected HasMember to return true for DEVICE456") - } - - if zr.HasMember("NONEXISTENT") { - t.Error("Expected HasMember to return false for non-existent device") - } - - if zr.HasMember("MASTER123") { - t.Error("Expected HasMember to return false for master device") - } -} - func TestZoneRequest_GetMemberCount(t *testing.T) { zr := NewZoneRequest("MASTER123")