Breaking Change: Change event data structure

raman325 · Nov 26, 2021 · db8b7ef · db8b7ef
1 parent 63faef3
commit db8b7ef
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-    "python.pythonPath": "/Users/raman.gupta/projects/personal/ha-zoom-automation/venv/bin/python3",
+    "python.pythonPath": "/Users/raman/projects/ha-zoom-automation/venv/bin/python",
     "files.associations": {
         "*.yaml": "home-assistant"
     }

diff --git a/README.md b/README.md
@@ -208,8 +208,7 @@ trigger:
   platform: event
   event_type: zoom_webhook
   event_data:
-    status:
-      event: <ZOOM_EVENT_NAME>
+    event: <ZOOM_EVENT_NAME>
 ```
 
 ### Conditions and Actions

diff --git a/custom_components/zoom/binary_sensor.py b/custom_components/zoom/binary_sensor.py
@@ -284,8 +284,8 @@ class ZoomAuthenticatedUserBinarySensor(ZoomBaseBinarySensor):
 
     async def async_event_received(self, event: Event) -> None:
         """Update status if event received for this entity."""
-        status = event.data["status"]
-        token = event.data["token"]
+        status = event.data
+        token = status.pop("token")
         if (
             token == self._config_entry.data[CONF_VERIFICATION_TOKEN]
             and status[ATTR_EVENT] == CONNECTIVITY_EVENT

diff --git a/custom_components/zoom/common.py b/custom_components/zoom/common.py
@@ -115,9 +115,7 @@ async def post(self, request: Request) -> Response:
                     data = await request.json()
                     status = WEBHOOK_RESPONSE_SCHEMA(data)
                     _LOGGER.debug("Received event: %s", status)
-                    hass.bus.async_fire(
-                        f"{HA_ZOOM_EVENT}", {"status": status, "token": token}
-                    )
+                    hass.bus.async_fire(f"{HA_ZOOM_EVENT}", {**status, "token": token})
                 except Exception as err:
                     _LOGGER.warning(
                         "Received authorized event but unable to parse: %s (%s)",

diff --git a/tests/test_api.py b/tests/test_api.py
@@ -41,7 +41,10 @@ async def test_api(hass):
     with patch(
         "homeassistant.helpers.config_entry_oauth2_flow.OAuth2Session.async_request",
         return_value=AiohttpClientMockResponse(
-            "get", "zoom_url", status=HTTPStatus.OK, json={"id": "test", "first_name": "test"}
+            "get",
+            "zoom_url",
+            status=HTTPStatus.OK,
+            json={"id": "test", "first_name": "test"},
         ),
     ):
         await api.async_get_contact_user_profile("test")
@@ -63,7 +66,10 @@ async def test_api(hass):
     with patch(
         "homeassistant.helpers.config_entry_oauth2_flow.OAuth2Session.async_request",
         return_value=AiohttpClientMockResponse(
-            "get", "zoom_url", status=HTTPStatus.OK, json={"id": "test", "first_name": "test"}
+            "get",
+            "zoom_url",
+            status=HTTPStatus.OK,
+            json={"id": "test", "first_name": "test"},
         ),
     ):
         await api.async_get_my_user_profile()