Only update sensor if data is valid

Author: toringer

custom_components/sbanken/sbanken_entities.py

@@ -119,27 +119,53 @@ async def async_update(self):
             self.api.get_standing_orders, self._account_id
         )
 
-        if "items" in transactions:
-            self._transactions = transactions["items"]
-        if "items" in payments:
-            self._payments = payments["items"]
-        if "items" in standing_orders:
-            self._standing_orders = standing_orders["items"]
-        if "available" in account:
+        if (
+            "available" in account
+            and "balance" in account
+            and "name" in account
+            and "accountNumber" in account
+            and "accountType" in account
+            and "creditLimit" in account
+        ):
+            self.credit_limit = account["creditLimit"]
             self._available = float(account["available"])
-        if "balance" in account:
             self._balance = float(account["balance"])
-        if "name" in account:
             self._account_name = account["name"]
-        if "accountNumber" in account:
             self._account_number = account["accountNumber"]
-        if "accountType" in account:
             self._account_type = account["accountType"]
-        if "creditLimit" in account:
-            self.credit_limit = account["creditLimit"]
-        self._last_updated = datetime.now()
+            self._last_updated = datetime.now()
+            _LOGGER.debug(f"Updating account information: {self._attr_name}")
+        else:
+            _LOGGER.warn(
+                f"Error updating account information {self._attr_name}. Account: {str(account)}"
+            )
 
-        _LOGGER.debug(f"Updating Sbanken Sensors: {self._attr_name}")
+        if "items" in transactions:
+            self._transactions = transactions["items"]
+            self._last_updated = datetime.now()
+            _LOGGER.debug(f"Updating transactions: {self._attr_name}")
+        else:
+            _LOGGER.warn(
+                f"Error updating transactions {self._attr_name}. Transactions: {str(transactions)}"
+            )
+
+        if "items" in payments:
+            self._payments = payments["items"]
+            self._last_updated = datetime.now()
+            _LOGGER.debug(f"Updating payments: {self._attr_name}")
+        else:
+            _LOGGER.warn(
+                f"Error updating payments {self._attr_name}. Payments: {str(payments)}"
+            )
+
+        if "items" in standing_orders:
+            self._standing_orders = standing_orders["items"]
+            self._last_updated = datetime.now()
+            _LOGGER.debug(f"Updating standing orders: {self._attr_name}")
+        else:
+            _LOGGER.warn(
+                f"Error updating standing orders {self._attr_name}. Standing orders: {str(standing_orders)}"
+            )
 
 
 class CustomerInformationSensor(Entity):
@@ -165,6 +191,7 @@ def __init__(
         self._phone_numbers = None
         self._first_name = ""
         self._last_name = ""
+        self._last_updated = datetime.now()
 
     @property
     def device_info(self):
@@ -194,6 +221,7 @@ def extra_state_attributes(self):
             "postalAddress": self._postal_address,
             "streetAddress": self._street_address,
             "phoneNumbers": self._phone_numbers,
+            ATTR_LAST_UPDATE: self._last_updated,
         }
 
     async def async_update(self):
@@ -204,21 +232,28 @@ async def async_update(self):
         customer_info = await self.hass.async_add_executor_job(
             self.api.get_customer_information
         )
-        if "customerId" in customer_info:
+
+        if (
+            "customerId" in customer_info
+            and "emailAddress" in customer_info
+            and "dateOfBirth" in customer_info
+            and "postalAddress" in customer_info
+            and "streetAddress" in customer_info
+            and "phoneNumbers" in customer_info
+            and "firstName" in customer_info
+            and "lastName" in customer_info
+        ):
             self._customer_id = customer_info["customerId"]
-        if "emailAddress" in customer_info:
             self._email_address = customer_info["emailAddress"]
-        if "dateOfBirth" in customer_info:
             self._date_of_birth = customer_info["dateOfBirth"]
-        if "postalAddress" in customer_info:
             self._postal_address = customer_info["postalAddress"]
-        if "streetAddress" in customer_info:
             self._street_address = customer_info["streetAddress"]
-        if "phoneNumbers" in customer_info:
             self._phone_numbers = customer_info["phoneNumbers"]
-        if "firstName" in customer_info:
             self._first_name = customer_info["firstName"]
-        if "lastName" in customer_info:
             self._last_name = customer_info["lastName"]
-
-        _LOGGER.debug(f"Updating Sbanken Sensors: {self._attr_name}")
+            self._last_updated = datetime.now()
+            _LOGGER.debug(f"Updating customer information: {self._attr_name}")
+        else:
+            _LOGGER.warn(
+                f"Error updating customer information: {self._attr_name}. Data{str(customer_info)}"
+            )