refactor: add yearly enriched order count method and update sensor responses

Author: dvejsada

custom_components/rohlikcz/hub.py

@@ -177,6 +177,10 @@ def yearly_count(self, year: str) -> int:
         """Count of orders for a given year."""
         return sum(1 for o in self._data["orders"].values() if o["date"].startswith(year))
 
+    def yearly_enriched_count(self, year: str) -> int:
+        """Count of enriched orders (with item details) for a given year."""
+        return sum(1 for o in self._data["orders"].values() if o["date"].startswith(year) and "items" in o)
+
     def alltime_total(self) -> float:
         """Sum of all order amounts."""
         return sum(o["amount"] for o in self._data["orders"].values())

custom_components/rohlikcz/sensor.py

@@ -758,12 +758,12 @@ def extra_state_attributes(self) -> Mapping[str, Any] | None:
         year = datetime.now(ZoneInfo("Europe/Prague")).strftime("%Y")
         categories = store.category_totals(year=year, level=1, hide_discontinued=self._rohlik_account.hide_discontinued)
         if not categories:
-            return {"year": year, "enriched_orders": store.enriched_count, "total_orders": store.yearly_count(year)}
+            return {"year": year, "enriched_orders": store.yearly_enriched_count(year), "total_orders": store.yearly_count(year)}
         return {
             "year": year,
             "total_count": len(categories),
             "categories": categories[:self._rohlik_account.top_n],
-            "enriched_orders": store.enriched_count,
+            "enriched_orders": store.yearly_enriched_count(year),
             "total_orders": store.yearly_count(year),
         }
 
@@ -844,12 +844,12 @@ def extra_state_attributes(self) -> Mapping[str, Any] | None:
         year = datetime.now(ZoneInfo("Europe/Prague")).strftime("%Y")
         categories = store.category_totals(year=year, level=0, hide_discontinued=self._rohlik_account.hide_discontinued)
         if not categories:
-            return {"year": year, "enriched_orders": store.enriched_count, "total_orders": store.yearly_count(year)}
+            return {"year": year, "enriched_orders": store.yearly_enriched_count(year), "total_orders": store.yearly_count(year)}
         return {
             "year": year,
             "total_count": len(categories),
             "categories": categories[:self._rohlik_account.top_n],
-            "enriched_orders": store.enriched_count,
+            "enriched_orders": store.yearly_enriched_count(year),
             "total_orders": store.yearly_count(year),
         }
 
@@ -930,12 +930,12 @@ def extra_state_attributes(self) -> Mapping[str, Any] | None:
         year = datetime.now(ZoneInfo("Europe/Prague")).strftime("%Y")
         categories = store.category_totals(year=year, level=2, hide_discontinued=self._rohlik_account.hide_discontinued)
         if not categories:
-            return {"year": year, "enriched_orders": store.enriched_count, "total_orders": store.yearly_count(year)}
+            return {"year": year, "enriched_orders": store.yearly_enriched_count(year), "total_orders": store.yearly_count(year)}
         return {
             "year": year,
             "total_count": len(categories),
             "categories": categories[:self._rohlik_account.top_n],
-            "enriched_orders": store.enriched_count,
+            "enriched_orders": store.yearly_enriched_count(year),
             "total_orders": store.yearly_count(year),
         }
 
@@ -1016,12 +1016,12 @@ def extra_state_attributes(self) -> Mapping[str, Any] | None:
         year = datetime.now(ZoneInfo("Europe/Prague")).strftime("%Y")
         categories = store.category_totals(year=year, level=3, hide_discontinued=self._rohlik_account.hide_discontinued)
         if not categories:
-            return {"year": year, "enriched_orders": store.enriched_count, "total_orders": store.yearly_count(year)}
+            return {"year": year, "enriched_orders": store.yearly_enriched_count(year), "total_orders": store.yearly_count(year)}
         return {
             "year": year,
             "total_count": len(categories),
             "categories": categories[:self._rohlik_account.top_n],
-            "enriched_orders": store.enriched_count,
+            "enriched_orders": store.yearly_enriched_count(year),
             "total_orders": store.yearly_count(year),
         }