Fix for broken events API (#23)

augustas2 · Sep 19, 2023 · 5292676 · 5292676
1 parent f02be0b
commit 5292676
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/custom_components/eldes_alarm/__init__.py b/custom_components/eldes_alarm/__init__.py
@@ -25,6 +25,8 @@
     DATA_COORDINATOR,
     DATA_DEVICES,
     DEFAULT_SCAN_INTERVAL,
+    DEFAULT_EVENTS_LIST_SIZE,
+    CONF_EVENTS_LIST_SIZE,
     DOMAIN
 )
 from .core.eldes_cloud import EldesCloud
@@ -95,6 +97,7 @@ async def async_update_data():
 
 async def async_get_devices(hass: HomeAssistant, entry: ConfigEntry, eldes_client: EldesCloud):
     """Fetch data from Eldes API."""
+    events_list_size = entry.options.get(CONF_EVENTS_LIST_SIZE, DEFAULT_EVENTS_LIST_SIZE)
 
     await eldes_client.renew_token()
 
@@ -106,7 +109,7 @@ async def async_get_devices(hass: HomeAssistant, entry: ConfigEntry, eldes_clien
         device["partitions"] = await eldes_client.get_device_partitions(device["imei"])
         device["outputs"] = await eldes_client.get_device_outputs(device["imei"])
         device["temp"] = await eldes_client.get_temperatures(device["imei"])
-        device["events"] = await eldes_client.get_events(device["imei"])
+        device["events"] = await eldes_client.get_events(events_list_size)
 
     hass.data[DOMAIN][entry.entry_id][DATA_DEVICES] = devices
 

diff --git a/custom_components/eldes_alarm/config_flow.py b/custom_components/eldes_alarm/config_flow.py
@@ -11,7 +11,7 @@
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, CONF_SCAN_INTERVAL
 
 from .core.eldes_cloud import EldesCloud
-from .const import DOMAIN, DEFAULT_SCAN_INTERVAL
+from .const import DOMAIN, DEFAULT_SCAN_INTERVAL, DEFAULT_EVENTS_LIST_SIZE, CONF_EVENTS_LIST_SIZE
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -101,6 +101,10 @@ async def async_step_init(self, user_input=None):
                         CONF_SCAN_INTERVAL,
                         default=self.config_entry.options.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)
                     ): int,
+                    vol.Required(
+                        CONF_EVENTS_LIST_SIZE,
+                        default=self.config_entry.options.get(CONF_EVENTS_LIST_SIZE, DEFAULT_EVENTS_LIST_SIZE)
+                    ): int,
                 }
             )
         )
diff --git a/custom_components/eldes_alarm/const.py b/custom_components/eldes_alarm/const.py
@@ -7,8 +7,10 @@
 DATA_CLIENT = "eldes_client"
 DATA_COORDINATOR = "coordinator"
 DATA_DEVICES = "devices"
+CONF_EVENTS_LIST_SIZE = "events_list_size"
 
 DEFAULT_SCAN_INTERVAL = 30
+DEFAULT_EVENTS_LIST_SIZE = 10
 
 API_URL = "https://cloud.eldesalarms.com:8083/api/"
 

diff --git a/custom_components/eldes_alarm/core/eldes_cloud.py b/custom_components/eldes_alarm/core/eldes_cloud.py
@@ -245,11 +245,17 @@ async def get_temperatures(self, imei):
 
         return temperatures
 
-    async def get_events(self, imei):
+    async def get_events(self, size):
         """Gets device events."""
-        url = f"{API_URL}{API_PATHS['DEVICE']}event/list?imei={imei}"
+        data = {
+            "": "",
+            "size": size,
+            "start": 0
+        }
 
-        response = await self._api_call(url, "POST", {})
+        url = f"{API_URL}{API_PATHS['DEVICE']}event/list"
+
+        response = await self._api_call(url, "POST", data)
         result = await response.json()
         events = result.get("eventDetails", [])
 

diff --git a/custom_components/eldes_alarm/translations/en.json b/custom_components/eldes_alarm/translations/en.json
@@ -22,7 +22,8 @@
         "title": "Configure Eldes integration",
         "description": "Update the scan interval to poll for data more often.",
         "data": {
-          "scan_interval": "Scan Interval (seconds)"
+          "scan_interval": "Scan Interval (seconds)",
+          "events_list_size": "Events list size"
         }
       }
     }

diff --git a/custom_components/eldes_alarm/translations/lt.json b/custom_components/eldes_alarm/translations/lt.json
@@ -22,7 +22,8 @@
         "title": "Eldes integracijos nustatymai",
         "description": "Pakeiskite atnaujinimo intervalą, norėdami dažniau arba rečiau atnaujinti duomenis.",
         "data": {
-          "scan_interval": "Atnaujinimo intervalas (sekundės)"
+          "scan_interval": "Atnaujinimo intervalas (sekundės)",
+          "events_list_size": "Įvykių sąrašo ilgis"
         }
       }
     }