Include warehouse name in sensor

krasnoukhov · Oct 20, 2023 · cfe4747 · cfe4747
1 parent 6bd788a
commit cfe4747
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/custom_components/nova_poshta/coordinator.py b/custom_components/nova_poshta/coordinator.py
@@ -11,6 +11,7 @@
 
 import httpx
 from novaposhta.client import NovaPoshtaApi, InvalidAPIKeyError, APIRequestError
+from transliterate import translit
 
 from .const import (
     API_KEY,
@@ -82,12 +83,23 @@ def parcels(self) -> list[dict]:
         return self.data["data"][0]["result"]
 
     @property
-    def warehouses(self) -> list[str]:
-        """Retrieve unique warehouse ids."""
+    def warehouses(self) -> list[dict]:
+        """Retrieve unique warehouses."""
         return list(
             set(
                 map(
-                    lambda x: x["SettlmentAddressData"]["RecipientWarehouseNumber"],
+                    lambda x: frozenset(
+                        {
+                            "id": x["SettlmentAddressData"]["RecipientWarehouseNumber"],
+                            "name": translit(
+                                x["SettlmentAddressData"][
+                                    "RecipientSettlementDescription"
+                                ],
+                                "uk",
+                                reversed=True,
+                            ).replace("Kyyiv", "Kyiv"),
+                        }.items()
+                    ),
                     self.parcels,
                 )
             )

diff --git a/custom_components/nova_poshta/manifest.json b/custom_components/nova_poshta/manifest.json
@@ -8,6 +8,6 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/krasnoukhov/homeassistant-nova-poshta/issues",
-  "requirements": ["git+https://github.com/krasnoukhov/novaposhta-python-client.git@errors#novaposhta-python-client==0.1.2"],
-  "version": "1.0.0-beta.0"
+  "requirements": ["transliterate==1.10.2", "git+https://github.com/krasnoukhov/novaposhta-python-client.git@errors#novaposhta-python-client==0.1.2"],
+  "version": "1.0.0-beta.1"
 }
diff --git a/custom_components/nova_poshta/sensor.py b/custom_components/nova_poshta/sensor.py
@@ -6,6 +6,7 @@
 
 import logging
 from typing import cast
+from stringcase import snakecase
 
 from homeassistant.components.sensor import (
     SensorEntity,
@@ -35,8 +36,8 @@ async def async_setup_entry(
 
     async_add_entities(
         [
-            NovaPoshtaSensor(coordinator, entry, warehouse_id)
-            for warehouse_id in coordinator.warehouses
+            NovaPoshtaSensor(coordinator, entry, warehouse)
+            for warehouse in coordinator.warehouses
         ]
     )
 
@@ -50,16 +51,17 @@ def __init__(
         self,
         coordinator: NovaPoshtaCoordinator,
         entry: ConfigEntry,
-        warehouse_id: str,
+        warehouse: frozenset,
     ) -> None:
         """Initialize a Nova Poshta entity."""
         super().__init__(coordinator)
 
-        self._parcels = self.coordinator.delivered_by_warehouse(warehouse_id)
+        warehouse_info = dict(warehouse)
+        self._parcels = self.coordinator.delivered_by_warehouse(warehouse_info["id"])
 
         self.entity_description = SensorEntityDescription(
-            key=f"delivered_parcels_{warehouse_id}",
-            name=f"Delivered parcels in {warehouse_id}",
+            key=f"delivered_parcels_{snakecase(warehouse_info['name'])}_{warehouse_info['id']}",
+            name=f"Delivered parcels in {warehouse_info['name']}@{warehouse_info['id']}",
             state_class=SensorStateClass.TOTAL,
         )
         self._attr_unique_id = self.entity_description.key