Fix duplicate SensorEntities registration in AddHomeAssistantGenerated (#1316)

* Fix duplicate SensorEntities registration in AddHomeAssistantGenerated

Co-authored-by: FrankBakkerNl <[email protected]>

* Update src/HassModel/NetDaemon.HassModel.Tests/CodeGenerator/HelpersGeneratorTest.cs

Co-authored-by: Copilot <[email protected]>

* Add missing using System.Text.RegularExpressions in HelpersGeneratorTest

Co-authored-by: Rick-van-Dam <[email protected]>

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: FrankBakkerNl <[email protected]>
Co-authored-by: Rick van Dam <[email protected]>
Co-authored-by: Copilot <[email protected]>

Author: 4 people

src/HassModel/NetDaemon.HassModel.CodeGenerator/CodeGeneration/HelpersGenerator.cs

@@ -65,8 +65,8 @@ private static MethodDeclarationSyntax BuildAddHomeAssistantGenerated(IEnumerabl
     private static IEnumerable<string> GetInjectableTypes(IEnumerable<EntityDomainMetadata> domains, IEnumerable<HassServiceDomain> orderedServiceDomains) =>
         [
             EntitiesClassName,
-            .. domains.Select(d => d.EntitiesForDomainClassName),
+            .. domains.Select(d => d.EntitiesForDomainClassName).Distinct(),
             ServicesClassName,
-            ..orderedServiceDomains.Select(d => GetServicesTypeName(d.Domain))
+            ..orderedServiceDomains.Select(d => GetServicesTypeName(d.Domain)).Distinct()
         ];
 }

src/HassModel/NetDaemon.HassModel.Tests/CodeGenerator/HelpersGeneratorTest.cs

@@ -0,0 +1,75 @@
+using System.Text.RegularExpressions;
+using NetDaemon.Client.HomeAssistant.Model;
+using NetDaemon.HassModel.CodeGenerator;
+using NetDaemon.HassModel.CodeGenerator.CodeGeneration;
+
+namespace NetDaemon.HassModel.Tests.CodeGenerator;
+
+public class HelpersGeneratorTest
+{
+    [Fact]
+    public void AddHomeAssistantGenerated_ShouldNotRegisterDuplicateEntityClasses()
+    {
+        // Arrange: Create test data that would lead to duplicate SensorEntities registrations
+        var states = new HassState[]
+        {
+            // Non-numeric sensor (no unit_of_measurement)
+            new() { EntityId = "sensor.simple_text", Attributes = new Dictionary<string, object>() },
+            
+            // Numeric sensor (has unit_of_measurement)  
+            new() { EntityId = "sensor.temperature", Attributes = new Dictionary<string, object> { ["unit_of_measurement"] = "°C" } }
+        };
+        
+        // Act: Generate metadata which creates both numeric and non-numeric sensor domains
+        var metaData = EntityMetaDataGenerator.GetEntityDomainMetaData(states);
+        
+        // Both should have the same EntitiesForDomainClassName
+        var sensorDomains = metaData.Domains.Where(d => d.Domain == "sensor").ToList();
+        sensorDomains.Should().HaveCount(2, "there should be both numeric and non-numeric sensor domains");
+        sensorDomains.Should().AllSatisfy(d => d.EntitiesForDomainClassName.Should().Be("SensorEntities"));
+        
+        // Generate the extension method code
+        var generatedMembers = HelpersGenerator.Generate(metaData.Domains, []).ToList();
+        var generatedCode = generatedMembers.First().ToString();
+        
+        // Assert: The generated code should not contain duplicate SensorEntities registrations
+        var sensorEntitiesMatches = Regex.Matches(
+            generatedCode, 
+            @"serviceCollection\.AddTransient<SensorEntities>\(\);");
+            
+        sensorEntitiesMatches.Should().HaveCount(1, "SensorEntities should only be registered once, not duplicated");
+    }
+    
+    [Fact]
+    public void AddHomeAssistantGenerated_ShouldRegisterAllUniqueEntityClasses()
+    {
+        // Arrange: Create test data with different domains
+        var states = new HassState[]
+        {
+            new() { EntityId = "sensor.temperature", Attributes = new Dictionary<string, object> { ["unit_of_measurement"] = "°C" } },
+            new() { EntityId = "light.living_room", Attributes = new Dictionary<string, object>() },
+            new() { EntityId = "switch.kitchen", Attributes = new Dictionary<string, object>() }
+        };
+        
+        // Act: Generate metadata
+        var metaData = EntityMetaDataGenerator.GetEntityDomainMetaData(states);
+        
+        // Generate the extension method code
+        var generatedMembers = HelpersGenerator.Generate(metaData.Domains, []).ToList();
+        var generatedCode = generatedMembers.First().ToString();
+        
+        // Assert: Each domain should be registered exactly once
+        generatedCode.Should().Contain("serviceCollection.AddTransient<SensorEntities>();");
+        generatedCode.Should().Contain("serviceCollection.AddTransient<LightEntities>();");
+        generatedCode.Should().Contain("serviceCollection.AddTransient<SwitchEntities>();");
+        
+        // Verify no duplicates
+        var sensorMatches = Regex.Matches(generatedCode, @"serviceCollection\.AddTransient<SensorEntities>\(\);");
+        var lightMatches = Regex.Matches(generatedCode, @"serviceCollection\.AddTransient<LightEntities>\(\);");
+        var switchMatches = Regex.Matches(generatedCode, @"serviceCollection\.AddTransient<SwitchEntities>\(\);");
+        
+        sensorMatches.Should().HaveCount(1);
+        lightMatches.Should().HaveCount(1); 
+        switchMatches.Should().HaveCount(1);
+    }
+}