Merge pull request #48 from dvejsada/bug-logout

Bug logout

Author: dvejsada

custom_components/rohlikcz/const.py

@@ -33,6 +33,8 @@
 ICON_CALENDAR_CHECK = "mdi:calendar-check"
 ICON_CALENDAR_REMOVE = "mdi:calendar-remove"
 ICON_INFO = "mdi:information-outline"
+ICON_DELIVERY_TIME = "mdi:timer-sand"
+ICON_MONTHLY_SPENT = "mdi:cash-register"
 
 """ Service attributes """
 ATTR_CONFIG_ENTRY_ID = "config_entry_id"
@@ -49,3 +51,4 @@
 SERVICE_GET_SHOPPING_LIST = "get_shopping_list"
 SERVICE_GET_CART_CONTENT = "get_cart_content"
 SERVICE_SEARCH_AND_ADD_PRODUCT = "search_and_add_to_cart"
+SERVICE_UPDATE_DATA = "update_data"

custom_components/rohlikcz/hub.py

@@ -43,6 +43,10 @@ def unique_id(self) -> str:
         """Return the unique ID for this account."""
         return self.data["login"]["data"]["user"]["id"]
 
+    @property
+    def is_ordered(self) -> bool:
+        return len(self.data.get('next_order', [])) > 0
+
     async def async_update(self) -> None:
         """ Updates the data from API."""
 

custom_components/rohlikcz/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/dvejsada/HA-RohlikCZ/issues",
   "requirements": [],
-  "version": "0.3.0"
+  "version": "0.3.1"
 }

custom_components/rohlikcz/rohlik_api.py

@@ -51,13 +51,7 @@ def mask_data(input_dict):
 
 
 class Product(TypedDict):
-    """
-    TypedDict representing a Rohlik product to be added to cart.
 
-    Attributes:
-        product_id (int): The unique identifier of the product
-        quantity (int): The quantity of the product to add
-    """
     product_id: int
     quantity: int
 
@@ -153,6 +147,30 @@ async def login(self, session):
         except RequestException as err:
             raise APIRequestFailedError(f"Cannot connect to website! Check your internet connection and try again: {err}")
 
+    async def logout(self, session) -> None:
+        """
+        Log out from the Rohlik.cz service.
+        :param session:
+        :return:
+        """
+        logout_url = f"{BASE_URL}/services/frontend-service/logout"
+
+        try:
+            logout_response: Response = await self._run_in_executor(
+                session.post,
+                logout_url
+            )
+
+            logout_response: dict = logout_response.json()
+
+            if logout_response["status"] != 200:
+                raise RohlikczError(f"Unknown error occurred during logout: {logout_response}")
+            else:
+                _LOGGER.error("Successfully logged out from Rohlik.cz")
+
+
+        except RequestException as err:
+            raise APIRequestFailedError(f"Cannot connect to website! Check your internet connection and try again: {err}")
 
     async def get_data(self):
         """
@@ -173,7 +191,8 @@ async def get_data(self):
             "last_order": "/api/v3/orders/delivered?offset=0&limit=1",
             "premium_profile": "/services/frontend-service/premium/profile",
             "next_delivery_slot": "/services/frontend-service/timeslots-api/",
-            "delivery_announcements": "/services/frontend-service/announcements/delivery"
+            "delivery_announcements": "/services/frontend-service/announcements/delivery",
+            "delivered_orders": "/api/v3/orders/delivered?offset=0&limit=50"
         }
 
         result["login"] = await self.login(session)
@@ -211,6 +230,7 @@ async def get_data(self):
             raise APIRequestFailedError(f"Cannot connect to website! Check your internet connection and try again: {err}")
         finally:
             # Step 3: Close the session
+            await self.logout(session)
             await self._run_in_executor(session.close)
 
     async def add_to_cart(self, product_list: list[dict]) -> dict:
@@ -255,6 +275,7 @@ async def add_to_cart(self, product_list: list[dict]) -> dict:
             _LOGGER.error(f"Request failed: {err}")
             raise ValueError("Request failed")
         finally:
+            await self.logout(session)
             await self._run_in_executor(session.close)
 
     async def search_product(self, product_name: str, limit: int = 10, favourite: bool = False):
@@ -328,6 +349,7 @@ async def search_product(self, product_name: str, limit: int = 10, favourite: bo
             _LOGGER.error(f"Request failed: {err}")
             return None
         finally:
+            await self.logout(session)
             await self._run_in_executor(session.close)
 
     async def get_shopping_list(self, shopping_list_id=None) -> dict:
@@ -362,6 +384,7 @@ async def get_shopping_list(self, shopping_list_id=None) -> dict:
             _LOGGER.error(f"Request failed: {err}")
             raise ValueError("Request failed")
         finally:
+            await self.logout(session)
             await self._run_in_executor(session.close)
 
     async def get_cart_content(self, logged_in: bool = False, session = None) -> Dict:
@@ -389,6 +412,7 @@ async def get_cart_content(self, logged_in: bool = False, session = None) -> Dic
             raise ValueError("Request failed")
         finally:
             if not logged_in:
+                await self.logout(session)
                 await self._run_in_executor(session.close)
 
         data = cart_content.get("data", {})
@@ -451,4 +475,5 @@ async def delete_from_cart(self, order_field_id: str) -> dict:
             _LOGGER.error(f"Error deleting item with orderFieldId {order_field_id}: {err}")
             raise APIRequestFailedError(f"Failed to delete item from cart: {err}")
         finally:
+            await self.logout(session)
             await self._run_in_executor(session.close)

custom_components/rohlikcz/sensor.py

@@ -16,9 +16,10 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from .const import DOMAIN, ICON_UPDATE, ICON_CREDIT, ICON_NO_LIMIT, ICON_FREE_EXPRESS, ICON_DELIVERY, ICON_BAGS, \
     ICON_CART, ICON_ACCOUNT, ICON_EMAIL, ICON_PHONE, ICON_PREMIUM_DAYS, ICON_LAST_ORDER, ICON_NEXT_ORDER_SINCE, \
-    ICON_NEXT_ORDER_TILL, ICON_INFO
+    ICON_NEXT_ORDER_TILL, ICON_INFO, ICON_DELIVERY_TIME, ICON_MONTHLY_SPENT
 from .entity import BaseEntity
 from .hub import RohlikAccount
+from .utils import extract_delivery_datetime, calculate_current_month_orders_total
 
 SCAN_INTERVAL = timedelta(seconds=600)
 
@@ -46,7 +47,9 @@ async def async_setup_entry(
         LastOrder(rohlik_hub),
         NextOrderTill(rohlik_hub),
         NextOrderSince(rohlik_hub),
-        DeliveryInfo(rohlik_hub)
+        DeliveryInfo(rohlik_hub),
+        DeliveryTime(rohlik_hub),
+        MonthlySpent(rohlik_hub)
     ]
 
     if rohlik_hub.has_address:
@@ -78,135 +81,13 @@ def native_value(self) -> str | None:
             return None
 
 
-    @staticmethod
-    def extract_delivery_datetime(text: str) -> datetime | None:
-        """
-        Extract delivery time information from various formatted strings and return a datetime object.
-
-        Handles three types of delivery messages:
-        1. Time only (HH:MM): "delivery at 17:23"
-        2. Date and time: "delivery on 26.4. at 08:00"
-        3. Minutes until delivery: "delivery in approximately 3 minutes"
-
-        Args:
-            text: HTML text containing delivery time information
-
-        Returns:
-            A timezone-aware datetime object representing the delivery time, or None if no valid time found
-        """
-
-        # Replace Unicode escape sequences
-        clean_text: str = text.encode('utf-8').decode('unicode_escape')
-
-        # Get plain text without HTML tags for pattern detection
-        plain_text: str = re.sub(r'<[^>]+>', '', clean_text)
-
-        prague_tz = ZoneInfo('Europe/Prague')
-        now = datetime.now(tz=prague_tz)
-        current_year: int = now.year
-
-        # Check for Type 3: Minutes until delivery
-        if re.search(r'(přibližně za|za)\s*.*\s*(minut|minuty|min)', plain_text, re.IGNORECASE):
-            # Extract number of minutes from highlighted span
-            minutes_pattern: re.Pattern = re.compile(r'<span[^>]*color:[^>]*>([0-9]+)</span>')
-
-            matches = re.finditer(minutes_pattern, clean_text)
-            minutes_matches: list[str] = [match.group(1) for match in matches]
-
-            if minutes_matches:
-                try:
-                    minutes: int = int(minutes_matches[0])
-                    # Calculate the estimated delivery time
-                    return now + timedelta(minutes=minutes)
-                except ValueError:
-                    pass
-
-        # Check for Type 2: Date and time
-        date_pattern = re.compile(r'<span[^>]*color:[^>]*>([0-9]{1,2}\.[0-9]{1,2}\.)</span>')
-        time_pattern= re.compile(r'<span[^>]*color:[^>]*>([0-9]{1,2}:[0-9]{2})</span>')
-
-        matches_date = re.finditer(date_pattern, clean_text)
-        date_matches= [match.group(1) for match in matches_date]
-
-        matches_time = re.finditer(time_pattern, clean_text)
-        time_matches = [match.group(1) for match in matches_time]
-
-        if date_matches and time_matches:
-            # We have both date and time
-            try:
-                date_str: str = date_matches[0]  # e.g., "26.4."
-                day, month = map(int, date_str.replace('.', ' ').split())
-
-                time_str: str = time_matches[0]  # e.g., "08:00"
-                hour, minute = map(int, time_str.split(':'))
-
-                # Create full delivery datetime
-                delivery_dt = datetime(
-                    current_year, month, day, hour, minute,
-                    tzinfo=prague_tz
-                )
-
-                return delivery_dt
-            except (ValueError, IndexError):
-                pass
-
-        # Check for Type 1: Time only
-        if time_matches:
-            try:
-                time_str: str = time_matches[0]  # e.g., "17:23"
-                hour, minute = map(int, time_str.split(':'))
-
-                # Use today's date with the specified time
-                today = now.date()
-
-                # If the time has already passed today, it might refer to tomorrow
-                delivery_dt = datetime.combine(today, time(hour, minute))
-                delivery_dt = delivery_dt.replace(tzinfo=prague_tz)
-
-                if delivery_dt < now:
-                    # Time already passed today, assume it's for tomorrow
-                    tomorrow = today + timedelta(days=1)
-                    delivery_dt = datetime.combine(tomorrow, time(hour, minute))
-                    delivery_dt = delivery_dt.replace(tzinfo=prague_tz)
-
-                return delivery_dt
-            except (ValueError, IndexError):
-                pass
-
-        # If no structured time information was found, try to extract any time mention
-        # Generic time pattern search in the plain text
-        plain_time_matches = re.findall(r'\b([0-9]{1,2}:[0-9]{2})\b', plain_text)
-        if plain_time_matches:
-            try:
-                time_str: str = plain_time_matches[0]
-                hour, minute = map(int, time_str.split(':'))
-
-                # Use today's date with the specified time
-                today = now.date()
-
-                delivery_dt = datetime.combine(today, time(hour, minute))
-                delivery_dt = delivery_dt.replace(tzinfo=prague_tz)
-
-                # If the time has already passed today, it might refer to tomorrow
-                if delivery_dt < now:
-                    tomorrow = today + timedelta(days=1)
-                    delivery_dt = datetime.combine(tomorrow, time(hour, minute))
-                    delivery_dt = delivery_dt.replace(tzinfo=prague_tz)
-
-                return delivery_dt
-            except (ValueError, IndexError):
-                pass
-
-        # No valid time information found
-        return None
-
     @property
     def extra_state_attributes(self) -> Mapping[str, Any] | None:
         """ Get extra state attributes. """
         delivery_info: list = self._rohlik_account.data["delivery_announcements"]["data"]["announcements"]
         if len(delivery_info) > 0:
 
-            delivery_time = self.extract_delivery_datetime(delivery_info[0].get("content", ""))
+            delivery_time = extract_delivery_datetime(delivery_info[0].get("content", ""))
 
             if delivery_info[0].get("additionalContent", None):
                 clean_text = delivery_info[0]["additionalContent"]
@@ -215,7 +96,7 @@ def extra_state_attributes(self) -> Mapping[str, Any] | None:
                 additional_info = None
 
             return {
-                "Delivery time - experimental": delivery_time,
+                "Delivery time (deprecated, use new entity)": delivery_time,
                 "Order Id": str(delivery_info[0].get("id")),
                 "Updated At": datetime.fromisoformat(delivery_info[0].get("updatedAt")),
                 "Title": delivery_info[0].get("title"),
@@ -235,6 +116,37 @@ async def async_added_to_hass(self) -> None:
     async def async_will_remove_from_hass(self) -> None:
         self._rohlik_account.remove_callback(self.async_write_ha_state)
 
+class DeliveryTime(BaseEntity, SensorEntity):
+    """Sensor for showing delivery time."""
+
+    _attr_translation_key = "delivery_time"
+    _attr_should_poll = False
+    _attr_device_class = SensorDeviceClass.TIMESTAMP
+
+    @property
+    def native_value(self) -> str | None:
+        """Returns time of delivery."""
+        delivery_info: list = self._rohlik_account.data["delivery_announcements"]["data"]["announcements"]
+        if len(delivery_info) > 0:
+
+           return extract_delivery_datetime(delivery_info[0].get("content", ""))
+
+        else:
+            if self._rohlik_account.is_ordered:
+                return self.native_value
+            else:
+                return None
+
+
+    @property
+    def icon(self) -> str:
+        return ICON_DELIVERY_TIME
+
+    async def async_added_to_hass(self) -> None:
+        self._rohlik_account.register_callback(self.async_write_ha_state)
+
+    async def async_will_remove_from_hass(self) -> None:
+        self._rohlik_account.remove_callback(self.async_write_ha_state)
 
 class FirstExpressSlot(BaseEntity, SensorEntity):
     """Sensor for first available delivery."""
@@ -512,6 +424,29 @@ async def async_will_remove_from_hass(self) -> None:
         self._rohlik_account.remove_callback(self.async_write_ha_state)
 
 
+class MonthlySpent(BaseEntity, SensorEntity):
+    """Sensor for amount spent in current month."""
+
+    _attr_translation_key = "monthly_spent"
+    _attr_should_poll = False
+
+    @property
+    def native_value(self) -> float | None:
+        """Returns amount spend within last month."""
+        _LOGGER.error(self._rohlik_account.data.get('delivered_orders', "[]"))
+        return calculate_current_month_orders_total(self._rohlik_account.data.get('delivered_orders', []))
+
+    @property
+    def icon(self) -> str:
+        return ICON_MONTHLY_SPENT
+
+    async def async_added_to_hass(self) -> None:
+        self._rohlik_account.register_callback(self.async_write_ha_state)
+
+    async def async_will_remove_from_hass(self) -> None:
+        self._rohlik_account.remove_callback(self.async_write_ha_state)
+
+
 class NoLimitOrders(BaseEntity, SensorEntity):
     """Sensor for remaining no limit orders."""
 
@@ -753,11 +688,16 @@ class UpdateSensor(BaseEntity, SensorEntity):
     _attr_icon = ICON_UPDATE
     _attr_device_class = SensorDeviceClass.TIMESTAMP
 
-    def __init__(self, rohlik_account: RohlikAccount) -> None:
-        super().__init__(rohlik_account)
-        self._attr_native_value = datetime.now(tz=ZoneInfo("Europe/Prague"))
+    @property
+    def native_value(self) -> datetime:
+        return datetime.now(tz=ZoneInfo("Europe/Prague"))
 
     async def async_update(self) -> None:
         """Calls regular update of data from API."""
         await self._rohlik_account.async_update()
-        self._attr_native_value = datetime.now(tz=ZoneInfo("Europe/Prague"))
+
+    async def async_added_to_hass(self) -> None:
+        self._rohlik_account.register_callback(self.async_write_ha_state)
+
+    async def async_will_remove_from_hass(self) -> None:
+        self._rohlik_account.remove_callback(self.async_write_ha_state)