From e7157f216409a6536661e091e8d29b39b1bfa72c Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 1 May 2020 00:36:01 -0500
Subject: [PATCH] Fix restoring isy994 brightness with no previous state
 (#34972)

---
 CODEOWNERS                                    |  1 +
 homeassistant/components/isy994/light.py      | 29 +++++++++++++++++--
 homeassistant/components/isy994/manifest.json |  2 +-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 43959f67c30..4dbd9f87d4a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -196,6 +196,7 @@ homeassistant/components/ipp/* @ctalkington
 homeassistant/components/iqvia/* @bachya
 homeassistant/components/irish_rail_transport/* @ttroy50
 homeassistant/components/islamic_prayer_times/* @engrbm87
+homeassistant/components/isy994/* @bdraco
 homeassistant/components/izone/* @Swamp-Ig
 homeassistant/components/jewish_calendar/* @tsvi
 homeassistant/components/juicenet/* @jesserockz
diff --git a/homeassistant/components/isy994/light.py b/homeassistant/components/isy994/light.py
index 0d66a73571d..7ae8d1c76f8 100644
--- a/homeassistant/components/isy994/light.py
+++ b/homeassistant/components/isy994/light.py
@@ -3,12 +3,15 @@ import logging
 from typing import Callable
 
 from homeassistant.components.light import DOMAIN, SUPPORT_BRIGHTNESS, LightEntity
+from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
 
 from . import ISY994_NODES, ISYDevice
 
 _LOGGER = logging.getLogger(__name__)
 
+ATTR_LAST_BRIGHTNESS = "last_brightness"
+
 
 def setup_platform(
     hass, config: ConfigType, add_entities: Callable[[list], None], discovery_info=None
@@ -21,13 +24,13 @@ def setup_platform(
     add_entities(devices)
 
 
-class ISYLightDevice(ISYDevice, LightEntity):
+class ISYLightDevice(ISYDevice, LightEntity, RestoreEntity):
     """Representation of an ISY994 light device."""
 
     def __init__(self, node) -> None:
         """Initialize the ISY994 light device."""
         super().__init__(node)
-        self._last_brightness = self.brightness
+        self._last_brightness = None
 
     @property
     def is_on(self) -> bool:
@@ -56,7 +59,7 @@ class ISYLightDevice(ISYDevice, LightEntity):
     # pylint: disable=arguments-differ
     def turn_on(self, brightness=None, **kwargs) -> None:
         """Send the turn on command to the ISY994 light device."""
-        if brightness is None and self._last_brightness is not None:
+        if brightness is None and self._last_brightness:
             brightness = self._last_brightness
         if not self._node.on(val=brightness):
             _LOGGER.debug("Unable to turn on light")
@@ -65,3 +68,23 @@ class ISYLightDevice(ISYDevice, LightEntity):
     def supported_features(self):
         """Flag supported features."""
         return SUPPORT_BRIGHTNESS
+
+    @property
+    def device_state_attributes(self):
+        """Return the light attributes."""
+        return {ATTR_LAST_BRIGHTNESS: self._last_brightness}
+
+    async def async_added_to_hass(self) -> None:
+        """Restore last_brightness on restart."""
+        await super().async_added_to_hass()
+
+        self._last_brightness = self.brightness or 255
+        last_state = await self.async_get_last_state()
+        if not last_state:
+            return
+
+        if (
+            ATTR_LAST_BRIGHTNESS in last_state.attributes
+            and last_state.attributes[ATTR_LAST_BRIGHTNESS]
+        ):
+            self._last_brightness = last_state.attributes[ATTR_LAST_BRIGHTNESS]
diff --git a/homeassistant/components/isy994/manifest.json b/homeassistant/components/isy994/manifest.json
index 0b48528335d..083f25808fb 100644
--- a/homeassistant/components/isy994/manifest.json
+++ b/homeassistant/components/isy994/manifest.json
@@ -3,5 +3,5 @@
   "name": "Universal Devices ISY994",
   "documentation": "https://www.home-assistant.io/integrations/isy994",
   "requirements": ["PyISY==1.1.2"],
-  "codeowners": []
+  "codeowners": ["@bdraco"]
 }