Added support for floors and labels to the ServiceTarget class (#1084)

* Added support for floors and labels to the ServiceTarget class

* Added tests

* Removed all Focus attributes from debug project

* Removed the focus attribute for registry app as well

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/Targets.cs

@@ -22,4 +22,16 @@ public record HassTarget
     /// </summary>
     [JsonPropertyName("area_id")]
     public IReadOnlyCollection<string>? AreaIds { get; init; }
-}
+
+    /// <summary>
+    ///     Zero or more floor ids to target with the service call
+    /// </summary>
+    [JsonPropertyName("floor_id")]
+    public IReadOnlyCollection<string>? FloorIds { get; init; }
+
+    /// <summary>
+    ///     Zero or more floor ids to target with the service call
+    /// </summary>
+    [JsonPropertyName("label_id")]
+    public IReadOnlyCollection<string>? LabelIds { get; init; }
+}

src/HassModel/NetDaemon.HassModel.Tests/Internal/AppScopedHaContextProviderTest.cs

@@ -47,6 +47,54 @@ public async void TestCallService()
                 It.IsAny<CancellationToken>()), Times.Once);
     }
 
+    [Fact]
+    public async void TestCallServiceWithFloor()
+    {
+        var haContext = await CreateTargetAsync();
+
+        var target = new ServiceTarget { FloorIds = ["floor1", "floor2"] };
+        var data = new { Name = "value" };
+        haContext.CallService("domain", "service", target, data);
+
+        var expectedCommand = new CallServiceCommand
+        {
+            Domain = "domain",
+            Service = "service",
+            ServiceData = data,
+            Target = new HassTarget
+            {
+                FloorIds = target.FloorIds
+            }
+        };
+        _hassConnectionMock.Verify(
+            c => c.SendCommandAsync<CallServiceCommand>(expectedCommand,
+                It.IsAny<CancellationToken>()), Times.Once);
+    }
+
+    [Fact]
+    public async void TestCallServiceWithLabel()
+    {
+        var haContext = await CreateTargetAsync();
+
+        var target = new ServiceTarget { LabelIds = ["label1", "label2"] };
+        var data = new { Name = "value" };
+        haContext.CallService("domain", "service", target, data);
+
+        var expectedCommand = new CallServiceCommand
+        {
+            Domain = "domain",
+            Service = "service",
+            ServiceData = data,
+            Target = new HassTarget
+            {
+                LabelIds = target.LabelIds
+            }
+        };
+        _hassConnectionMock.Verify(
+            c => c.SendCommandAsync<CallServiceCommand>(expectedCommand,
+                It.IsAny<CancellationToken>()), Times.Once);
+    }
+
     [Fact]
     public async Task TestCallServiceWithResponseAsync()
     {
@@ -266,7 +314,7 @@ private async Task<ServiceProvider> CreateServiceProvider()
         serviceCollection.AddScopedHaContext();
 
         var backgroundTaskTrackerMock = new Mock<IBackgroundTaskTracker>();
-        serviceCollection.AddScoped<Mock<IBackgroundTaskTracker>>(_=> backgroundTaskTrackerMock);
+        serviceCollection.AddScoped<Mock<IBackgroundTaskTracker>>(_ => backgroundTaskTrackerMock);
         serviceCollection.AddScoped(_ => backgroundTaskTrackerMock.Object);
 
         var provider = serviceCollection.BuildServiceProvider();
@@ -280,7 +328,7 @@ public record TestEventData(string command, int endpoint_id, string otherField);
 
     public void Dispose()
     {
-       _hassEventSubjectMock.Dispose();
-       GC.SuppressFinalize(this);
+        _hassEventSubjectMock.Dispose();
+        GC.SuppressFinalize(this);
     }
 }

src/HassModel/NetDeamon.HassModel/Internal/HassObjectMapper.cs

@@ -40,7 +40,9 @@ public static StateChange Map(this HassStateChangedEventData source, IHaContext
         {
             AreaIds = target.AreaIds,
             DeviceIds = target.DeviceIds,
-            EntityIds = target.EntityIds
+            EntityIds = target.EntityIds,
+            FloorIds = target.FloorIds,
+            LabelIds = target.LabelIds
         };
     }
 

src/HassModel/NetDeamon.HassModel/ServiceTarget.cs

@@ -49,4 +49,14 @@ public ServiceTarget()
     /// Ids of Areas to invoke a service on
     /// </summary>
     public IReadOnlyCollection<string>? AreaIds { get; init; }
-}
+
+    /// <summary>
+    /// Ids of floors to invoke a service on
+    /// </summary>
+    public IReadOnlyCollection<string>? FloorIds { get; init; }
+
+    /// <summary>
+    /// Ids of labels to invoke a service on
+    /// </summary>
+    public IReadOnlyCollection<string>? LabelIds { get; init; }
+}

src/debug/DebugHost/apps/Client/ClientDebug.cs

@@ -5,7 +5,6 @@
 namespace Apps;
 
 [NetDaemonApp]
-// [Focus]
 public sealed class ClientApp : IAsyncDisposable
 {
     private readonly ILogger<ClientApp> _logger;

src/debug/DebugHost/apps/Client/LabelDebug.cs

@@ -8,7 +8,6 @@
 namespace Apps;
 
 [NetDaemonApp]
-[Focus]
 public sealed class LabelApp : IAsyncInitializable
 {
     private readonly ILogger<LabelApp> _logger;

src/debug/DebugHost/apps/Config/ConfigApp.cs

@@ -3,7 +3,6 @@
 namespace Apps;
 
 [NetDaemonApp]
-// [Focus]
 public class ConfigApp
 {
     public ConfigApp(IAppConfig<AppConfig> config)

src/debug/DebugHost/apps/HaRegistry/RegistryApp.cs

@@ -0,0 +1,22 @@
+using System.Reactive.Linq;
+using Microsoft.Extensions.Logging;
+using NetDaemon.AppModel;
+using NetDaemon.HassModel;
+using NetDaemon.HassModel.Entities;
+namespace Apps;
+
+[NetDaemonApp]
+public sealed class RegistryApp
+{
+    public RegistryApp(IHaRegistry haRegistry, IHaContext ha)
+    {
+        // var floor = haRegistry.GetFloor("upstairs");
+        // var upstairsAreas = floor.Areas;
+        // var upstairsBooleans = upstairsAreas
+        //     .SelectMany(n => n.Entities
+        //         .Where(x => x.EntityId.StartsWith("input_boolean.")));
+        //
+        // upstairsBooleans.ToList().ForEach(x => x.CallService("toggle"));
+        ha.CallService("input_boolean", "toggle", new ServiceTarget{ FloorIds = ["upstairs"] });
+    }
+}

src/debug/DebugHost/apps/HelloApp/HelloApp.cs

@@ -6,7 +6,6 @@
 namespace Apps;
 
 [NetDaemonApp]
-[Focus]
 public sealed class HelloApp : IAsyncDisposable
 {
     private readonly ILogger<HelloApp> _logger;

src/debug/DebugHost/apps_src/hellow.cs

@@ -6,7 +6,6 @@
 namespace Apps;
 
 [NetDaemonApp]
-[Focus]
 public sealed class HelloAppSrc : IAsyncDisposable
 {
     private readonly ILogger<HelloAppSrc> _logger;

src/debug/MyNDApp/apps/HassModel/MyInterfaceAutomation/InterfaceUsage.cs

@@ -11,7 +11,7 @@
 namespace Debug.apps.HassModel.MyInterfaceAutomation;
 
 [NetDaemonApp]
-[Focus]
+//[Focus]
 public class InterfaceUsage
 {
     public InterfaceUsage(IHaContext haContext, ILogger<InterfaceUsage> logger, IScheduler scheduler)