back to mapping thermometry to motion event and test for notification

maciej-or · Nov 14, 2024 · f6d28ed · f6d28ed
1 parent e081136
commit f6d28ed
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 17 deletions.
diff --git a/custom_components/hikvision_next/const.py b/custom_components/hikvision_next/const.py
@@ -64,8 +64,4 @@
         **ISAPI_EVENTS["pir"],
         "device_class": BinarySensorDeviceClass.MOTION,
     },
-    "thermometry": {
-        **ISAPI_EVENTS["thermometry"],
-        "device_class": BinarySensorDeviceClass.MOTION,
-    }
 }
diff --git a/custom_components/hikvision_next/isapi/const.py b/custom_components/hikvision_next/isapi/const.py
@@ -69,11 +69,6 @@
         "slug": "WLAlarm/PIR",
         "direct_node": "PIRAlarm",
     },
-    "thermometry": {
-        "type": EVENT_BASIC,
-        "label": "Thermometry",
-        "slug": "thermometry",
-    },
 }
 
 STREAM_TYPE = {
@@ -86,6 +81,7 @@
 
 EVENTS_ALTERNATE_ID = {
     "vmd": "motiondetection",
+    "thermometry": "motiondetection",
     "shelteralarm": "tamperdetection",
     "VMDHumanVehicle": "motiondetection",
 }

diff --git a/custom_components/hikvision_next/translations/en.json b/custom_components/hikvision_next/translations/en.json
@@ -53,9 +53,6 @@
       },
       "io": {
         "name": "Alarm Input {io_port_id}"
-      },
-      "thermometry": {
-        "name": "Temperature"
       }
     },
     "switch": {
@@ -91,9 +88,6 @@
       },
       "io": {
         "name": "Alarm Input {io_port_id}"
-      },
-      "thermometry": {
-        "name": "Temperature detection"
       }
     },
     "camera": {

diff --git a/tests/fixtures/ISAPI/EventNotificationAlert/ipc_thermometry_motiondetection.xml b/tests/fixtures/ISAPI/EventNotificationAlert/ipc_thermometry_motiondetection.xml
@@ -0,0 +1,14 @@
+<EventNotificationAlert>
+  <ipAddress>1.0.0.255</ipAddress>
+  <portNo>8123</portNo>
+  <protocol>HTTP</protocol>
+  <macAddress>a6:60:9e:f8:01:09</macAddress>
+  <dynChannelID>2</dynChannelID>
+  <channelID>2</channelID>
+  <dateTime>2024-11-13T20:20:52+01:00</dateTime>
+  <activePostCount>1</activePostCount>
+  <eventType>VMD</eventType>
+  <eventState>active</eventState>
+  <eventDescription>Motion alarm</eventDescription>
+  <channelName>Camera 02</channelName>
+</EventNotificationAlert>
diff --git a/tests/fixtures/devices/DS-2TD1228-2-QA.json b/tests/fixtures/devices/DS-2TD1228-2-QA.json
@@ -13,8 +13,8 @@
             "deviceLocation": "hangzhou",
             "systemContact": "Hikvision.China",
             "model": "DS-2TD1228-2-QA",
-            "serialNumber": "xxxxxxxxxxxxxxxxxxx",
-            "macAddress": "xxxxxxxxxxxxxxxxxxx",
+            "serialNumber": "DS-2TD1228-2/QA/xxxxxxxxxxxxxxxxxx",
+            "macAddress": "a6:60:9e:f8:01:09",
             "firmwareVersion": "V5.5.98",
             "firmwareReleasedDate": "build 240726",
             "encoderVersion": "V7.3",

diff --git a/tests/test_notifications.py b/tests/test_notifications.py
@@ -80,6 +80,26 @@ async def test_ipc_intrusion_detection_alert(
     assert sensor.state == STATE_ON
 
 
+@pytest.mark.parametrize("init_integration", ["DS-2TD1228-2-QA"], indirect=True)
+async def test_ipc_motion_detection_on_thermometry_channel_alert(
+    hass: HomeAssistant, init_integration: MockConfigEntry,
+) -> None:
+    """Test incoming motion detection event alert on thermometry channel from ip multi channel camera."""
+
+    entity_id = "binary_sensor.ds_2td1228_2_qa_xxxxxxxxxxxxxxxxxx_2_motiondetection"
+
+    assert (sensor := hass.states.get(entity_id))
+    assert sensor.state == STATE_OFF
+
+    view = EventNotificationsView(hass)
+    mock_request = mock_event_notification("ipc_thermometry_motiondetection")
+    response = await view.post(mock_request)
+
+    assert response.status == HTTPStatus.OK
+    assert (sensor := hass.states.get(entity_id))
+    assert sensor.state == STATE_ON
+
+
 @pytest.mark.parametrize("init_integration", ["DS-2CD2146G2-ISU"], indirect=True)
 async def test_field_detection_alert(
     hass: HomeAssistant, init_integration: MockConfigEntry,