Fix unique_id for Zigbee binary sensors

Author: AlexxIT

custom_components/sonoff/core/devices.py

@@ -126,7 +126,8 @@ def spec(cls, base: str = None, enabled: bool = None, **kwargs) -> type:
     22: [XLightB1, RSSI],  # Sonoff B1 (only cloud)
     # https://github.com/AlexxIT/SonoffLAN/issues/173
     25: [
-        XDiffuserFan, XDiffuserLight, spec(XBinarySensor, param="water"), RSSI,
+        XDiffuserFan, XDiffuserLight, RSSI,
+        spec(XBinarySensor, param="water", uid=""),
     ],  # Diffuser
     28: [XRemote, LED, RSSI],  # Sonoff RF Brigde 433
     29: SPEC_2CH,
@@ -214,9 +215,14 @@ def spec(cls, base: str = None, enabled: bool = None, **kwargs) -> type:
     ],  # ZCL_HA_DEVICEID_TEMPERATURE_SENSOR
     2026: [XZigbeeMotion, Battery],  # ZIGBEE_MOBILE_SENSOR
     # ZIGBEE_DOOR_AND_WINDOW_SENSOR
-    3026: [spec(XBinarySensor, param="lock", default_class="door"), Battery],
+    3026: [
+        # backward compatibility for unique_id
+        spec(XBinarySensor, param="lock", uid="", default_class="door"),
+        Battery,
+    ],
     4026: [
-        spec(XBinarySensor, param="water", default_class="moisture"), Battery,
+        spec(XBinarySensor, param="water", uid="", default_class="moisture"),
+        Battery,
     ],  # https://github.com/AlexxIT/SonoffLAN/issues/852
     4256: [
         spec(XZigbeeSwitches, channel=0, uid="1"),

tests/test_entity.py

@@ -417,7 +417,7 @@ def test_diffuser():
     water = next(e for e in entitites if isinstance(e, XBinarySensor))
     assert water.state == "off"
     assert water.device_class is None
-    assert water.unique_id == "1000123abc_water"
+    assert water.unique_id == DEVICEID
 
 
 def test_sonoff_sc():
@@ -696,7 +696,7 @@ def test_zigbee_door():
     lock: XBinarySensor = entities[0]
     assert lock.state == "off"
     assert lock.device_class.value == "door"
-    assert lock.unique_id == "1000123abc_lock"
+    assert lock.unique_id == DEVICEID
 
 
 def test_zigbee_water():
@@ -711,7 +711,7 @@ def test_zigbee_water():
     water: XBinarySensor = entities[0]
     assert water.state == "on"
     assert water.device_class.value == "moisture"
-    assert water.entity_id.endswith(".sonoff_1000123abc_water")
+    assert water.unique_id == DEVICEID
 
 
 def test_zigbee_cover():