Merge pull request #3807 from bramstroker/feat/analytics-install-date

Improve install_date calculation for analytics

Author: bramstroker

custom_components/powercalc/__init__.py

@@ -232,7 +232,7 @@ def start_schedule(_event: Event) -> None:
         """Start the send schedule after the started event."""
         async_call_later(
             hass,
-            900,
+            10,
             HassJob(
                 analytics.send_analytics,
                 name="powercalc analytics startup",

custom_components/powercalc/analytics/analytics.py

@@ -4,7 +4,8 @@
 from collections import Counter
 from collections.abc import Hashable
 from dataclasses import asdict, dataclass
-from datetime import datetime, timedelta
+from datetime import UTC, datetime, timedelta
+from itertools import chain
 import logging
 from typing import Any, Literal, TypedDict
 import uuid
@@ -13,6 +14,7 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import __version__ as HA_VERSION  # noqa
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.storage import Store
 from homeassistant.loader import async_get_integration
@@ -156,7 +158,7 @@ async def _prepare_payload(self) -> dict:
             DOMAIN,
             ENTRY_GLOBAL_CONFIG_UNIQUE_ID,
         )
-        payload: dict = {
+        return {
             "install_id": self.install_id,
             "install_date": await self._get_install_date(),
             "powercalc_version": powercalc_integration.version,
@@ -179,18 +181,21 @@ async def _prepare_payload(self) -> dict:
             },
         }
 
-        return payload
-
     async def _get_install_date(self) -> str | None:
-        min_date = None
-        for entry in self.hass.config_entries.async_entries(DOMAIN):
-            if min_date is None or entry.created_at < min_date:
-                min_date = entry.created_at
-
-        if min_date:
-            return min_date.isoformat()
+        """
+        Get the install date based on the earliest created_at date of config entries and entities.
+        """
+        cutoff = datetime(2000, 1, 1, tzinfo=UTC)
+        dates = chain(
+            (e.created_at for e in self.hass.config_entries.async_entries(DOMAIN) if e.created_at > cutoff),
+            (e.created_at for e in entity_registry.async_get(self.hass).entities.values() if e.domain != DOMAIN and e.created_at > cutoff),
+        )
 
-        return None
+        try:
+            install_date = min(dates)
+            return install_date.isoformat(timespec="seconds").replace("+00:00", "Z")
+        except ValueError:
+            return None
 
     async def _get_custom_profile_count(self) -> int:
         loader = ProfileLibrary.create_loader(self.hass, True)

tests/analytics/test_analytics.py

@@ -317,7 +317,7 @@ async def test_install_date(hass: HomeAssistant) -> None:
     analytics = Analytics(hass)
     payload = await analytics._prepare_payload()  # noqa: SLF001
 
-    assert payload["install_date"] == "2023-01-15T00:00:00+00:00"
+    assert payload["install_date"] == "2023-01-15T00:00:00Z"
 
 
 async def test_standby_group_sensor_is_not_marked_as_yaml(hass: HomeAssistant) -> None: