Fix mandatory entry data/options

gjohansson-ST · Nov 13, 2024 · de3115b · de3115b
1 parent 805e67c
commit de3115b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/custom_components/sector/alarm_control_panel.py b/custom_components/sector/alarm_control_panel.py
@@ -102,5 +102,5 @@ async def async_alarm_disarm(self, code: str | None = None) -> None:
             await self.coordinator.async_request_refresh()
 
     def _is_valid_code(self, code: str) -> bool:
-        code_format = self.coordinator.config_entry.options.get(CONF_CODE_FORMAT, 6)
+        code_format = self.coordinator.config_entry.options[CONF_CODE_FORMAT]
         return bool(code and len(code) == code_format)
diff --git a/custom_components/sector/binary_sensor.py b/custom_components/sector/binary_sensor.py
@@ -13,6 +13,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from .const import CONF_PANEL_ID
 from .coordinator import SectorAlarmConfigEntry, SectorDataUpdateCoordinator
 from .entity import SectorAlarmBaseEntity
 
@@ -63,7 +64,7 @@ async def async_setup_entry(
     ] = []
 
     panel_status = coordinator.data.get("panel_status", {})
-    panel_id = entry.data.get("panel_id")
+    panel_id = entry.data[CONF_PANEL_ID]
     serial_no = panel_status.get("SerialNo") or panel_id
 
     for device in devices.values():

diff --git a/custom_components/sector/lock.py b/custom_components/sector/lock.py
@@ -22,7 +22,7 @@ async def async_setup_entry(
 ) -> None:
     """Set up Sector Alarm locks."""
     coordinator = entry.runtime_data
-    code_format = entry.options.get(CONF_CODE_FORMAT, 6)
+    code_format = entry.options[CONF_CODE_FORMAT]
     devices: dict[str, dict[str, Any]] = coordinator.data.get("devices", {})
     entities = []