MQTT: Use default_entity_id instead of object_id (#1351)

* MQTT: Use default_entity_id instead of object_id

* Resolve copilot suggestion

Author: brechtvhb

src/Client/NetDaemon.HassClient.Tests/ExtensionsTest/MqttEntityManagerTests/MqttEntityManagerTester.cs

@@ -27,7 +27,7 @@ public async Task CreateWithNoOptionsSetsBaseConfig()
         payload?.Count.Should().Be(6);
         payload?["name"].ToString().Should().Be("sensor");
         payload?["unique_id"].ToString().Should().Be("homeassistant_domain_sensor_config");
-        payload?["object_id"].ToString().Should().Be("sensor");
+        payload?["default_entity_id"].ToString().Should().Be("domain.sensor");
         payload?["command_topic"].ToString().Should().Be("homeassistant/domain/sensor/set");
         payload?["state_topic"].ToString().Should().Be("homeassistant/domain/sensor/state");
         payload?["json_attributes_topic"].ToString().Should().Be("homeassistant/domain/sensor/attributes");
@@ -45,7 +45,7 @@ public async Task CreateWithDefaultOptionsSetsBaseConfig()
         payload?.Count.Should().Be(6);
         payload?["name"].ToString().Should().Be("sensor");
         payload?["unique_id"].ToString().Should().Be("homeassistant_domain_sensor_config");
-        payload?["object_id"].ToString().Should().Be("sensor");
+        payload?["default_entity_id"].ToString().Should().Be("domain.sensor");
         payload?["command_topic"].ToString().Should().Be("homeassistant/domain/sensor/set");
         payload?["state_topic"].ToString().Should().Be("homeassistant/domain/sensor/state");
         payload?["json_attributes_topic"].ToString().Should().Be("homeassistant/domain/sensor/attributes");
@@ -64,15 +64,15 @@ public async Task CreateCanSetUniqueId()
     }
 
     [Fact]
-    public async Task CreateSetsObjectId()
+    public async Task CreateSetsDefaultEntityId()
     {
         var mqttSetup = new MockMqttMessageSenderSetup();
         var entityManager = new MqttEntityManager(mqttSetup.MessageSender, null!, GetOptions());
 
         await entityManager.CreateAsync("domain.the_id");
         var payload = PayloadToDictionary(mqttSetup.LastPublishedMessage.PayloadSegment.Array ?? []);
 
-        payload?["object_id"].ToString().Should().Be("the_id");
+        payload?["default_entity_id"].ToString().Should().Be("domain.the_id");
     }
 
     [Fact]

src/Extensions/NetDaemon.Extensions.MqttEntityManager/Models/EntityCreationPayload.cs

@@ -18,14 +18,14 @@ internal class EntityCreationPayload
     [JsonPropertyName("unique_id")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? UniqueId { get; set; }
-    
-    [JsonPropertyName("object_id")]
-    public string? ObjectId { get; set; }
+
+    [JsonPropertyName("default_entity_id")]
+    public string? DefaultEntityId { get; set; }
 
     [JsonPropertyName("command_topic")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? CommandTopic { get; set; }
-    
+
     [JsonPropertyName("state_topic")]
     public string? StateTopic { get; set; }
 
@@ -35,7 +35,7 @@ internal class EntityCreationPayload
     [JsonPropertyName("availability_topic")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? AvailabilityTopic { get; set; }
-    
+
     [JsonPropertyName("payload_available")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? PayloadAvailable { get; set; }
@@ -52,4 +52,4 @@ internal class EntityCreationPayload
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? PayloadOff { get; set; }
 
-}
+}

src/Extensions/NetDaemon.Extensions.MqttEntityManager/MqttEntityManager.cs

@@ -138,7 +138,7 @@ private string BuildCreationPayload(string domain, string identifier, string con
             Name = options?.Name ?? identifier,
             DeviceClass = options?.DeviceClass,
             UniqueId = options?.UniqueId ?? configPath.Replace('/', '_'),
-            ObjectId = identifier,
+            DefaultEntityId = DefaultEntityId(domain, identifier),
             CommandTopic = CommandPath(domain, identifier),
             StateTopic = StatePath(domain, identifier),
             PayloadAvailable = options?.PayloadAvailable,
@@ -158,6 +158,7 @@ private static bool IsAvailabilityTopicRequired(EntityCreationOptions? options)
                                    !string.IsNullOrWhiteSpace(options.PayloadNotAvailable));
     }
 
+    private static string DefaultEntityId(string domain, string identifier) => $"{domain}.{identifier}";
     private string AttrsPath(string domain, string identifier) => $"{RootPath(domain, identifier)}/attributes";
 
     private string ConfigPath(string domain, string identifier) => $"{RootPath(domain, identifier)}/config";