Add get_earliest_order utility function and update sensors to use it for delivery time calculations.

Author: eMeF1

custom_components/rohlikcz/binary_sensor.py

@@ -14,6 +14,7 @@
     ICON_CALENDAR_REMOVE
 from .entity import BaseEntity
 from .hub import RohlikAccount
+from .utils import get_earliest_order
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -166,8 +167,8 @@ def is_on(self) -> bool | None:
     @property
     def extra_state_attributes(self) -> dict | None:
         next_orders = self._rohlik_account.data.get('next_order', [])
-        if next_orders and len(next_orders) > 0:
-            order = next_orders[0]  # Get the first next order
+        order = get_earliest_order(next_orders)
+        if order:
             return {
                 "order_data": order
             }

custom_components/rohlikcz/sensor.py

@@ -19,7 +19,7 @@
     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
+from .utils import extract_delivery_datetime, calculate_current_month_orders_total, get_earliest_order
 
 SCAN_INTERVAL = timedelta(seconds=600)
 
@@ -598,13 +598,22 @@ class NextOrderSince(BaseEntity, SensorEntity):
 
     @property
     def native_value(self) -> datetime | None:
-        """Returns remaining orders without limit."""
-        if len(self._rohlik_account.data['next_order']) > 0:
-            slot_start = datetime.strptime(self._rohlik_account.data["next_order"][0].get("deliverySlot", {}).get("since", None),
-                                 "%Y-%m-%dT%H:%M:%S.%f%z")
-            return slot_start
-        else:
-            return None
+        """Returns start of delivery window for the earliest order."""
+        earliest_order = get_earliest_order(self._rohlik_account.data.get('next_order', []))
+        if earliest_order:
+            try:
+                slot_start = datetime.strptime(earliest_order.get("deliverySlot", {}).get("since", None),
+                                     "%Y-%m-%dT%H:%M:%S.%f%z")
+                return slot_start
+            except (ValueError, TypeError):
+                # Try without microseconds if the format doesn't match
+                try:
+                    slot_start = datetime.strptime(earliest_order.get("deliverySlot", {}).get("since", None),
+                                         "%Y-%m-%dT%H:%M:%S%z")
+                    return slot_start
+                except (ValueError, TypeError):
+                    return None
+        return None
 
     @property
     def icon(self) -> str:
@@ -625,13 +634,22 @@ class NextOrderTill(BaseEntity, SensorEntity):
 
     @property
     def native_value(self) -> datetime | None:
-        """Returns remaining orders without limit."""
-        if len(self._rohlik_account.data['next_order']) > 0:
-            slot_start = datetime.strptime(self._rohlik_account.data["next_order"][0].get("deliverySlot", {}).get("till", None),
+        """Returns end of delivery window for the earliest order."""
+        earliest_order = get_earliest_order(self._rohlik_account.data.get('next_order', []))
+        if earliest_order:
+            try:
+                slot_end = datetime.strptime(earliest_order.get("deliverySlot", {}).get("till", None),
                                  "%Y-%m-%dT%H:%M:%S.%f%z")
-            return slot_start
-        else:
-            return None
+                return slot_end
+            except (ValueError, TypeError):
+                # Try without microseconds if the format doesn't match
+                try:
+                    slot_end = datetime.strptime(earliest_order.get("deliverySlot", {}).get("till", None),
+                                         "%Y-%m-%dT%H:%M:%S%z")
+                    return slot_end
+                except (ValueError, TypeError):
+                    return None
+        return None
 
     @property
     def icon(self) -> str:

custom_components/rohlikcz/utils.py

@@ -159,4 +159,52 @@ def extract_delivery_datetime(text: str) -> datetime | None:
             pass
 
     # No valid time information found
-    return None
+    return None
+
+
+def get_earliest_order(orders: list) -> dict | None:
+    """
+    Find the order with the earliest delivery time from a list of orders.
+
+    Args:
+        orders (list): List of order dictionaries, each containing a 'deliverySlot' with 'since' field
+
+    Returns:
+        dict: The order with the earliest delivery time, or None if no valid order found
+    """
+    if not orders or len(orders) == 0:
+        return None
+
+    earliest_order = None
+    earliest_time = None
+
+    for order in orders:
+        try:
+            # Extract delivery slot and since time
+            delivery_slot = order.get("deliverySlot", {})
+            since_str = delivery_slot.get("since", None)
+
+            if since_str is None:
+                continue
+
+            # Parse the datetime string (format: "%Y-%m-%dT%H:%M:%S.%f%z")
+            try:
+                delivery_time = datetime.strptime(since_str, "%Y-%m-%dT%H:%M:%S.%f%z")
+            except ValueError:
+                # Try without microseconds if the format doesn't match
+                try:
+                    delivery_time = datetime.strptime(since_str, "%Y-%m-%dT%H:%M:%S%z")
+                except ValueError:
+                    # Skip orders with invalid date format
+                    continue
+
+            # Check if this is the earliest order so far
+            if earliest_time is None or delivery_time < earliest_time:
+                earliest_time = delivery_time
+                earliest_order = order
+
+        except (KeyError, TypeError, AttributeError):
+            # Skip orders with missing or invalid structure
+            continue
+
+    return earliest_order