review comments

Author: mrm9084

featuremanagement/_time_window_filter/_recurrence_validator.py

@@ -156,9 +156,9 @@ def _sort_days_of_week(days_of_week: List[int], first_day_of_week: int) -> List[
     sorted_days = sorted(days_of_week)
     if first_day_of_week in sorted_days:
         return sorted_days[sorted_days.index(first_day_of_week) :] + sorted_days[: sorted_days.index(first_day_of_week)]
-    next_closet_day = first_day_of_week
-    for day in sorted_days:
-        if day > first_day_of_week:
-            next_closet_day = day
+    next_closest_day = first_day_of_week
+    for i in range(7):
+        if (first_day_of_week + i) % 7 in sorted_days:
+            next_closest_day = (first_day_of_week + i) % 7
             break
-    return sorted_days[sorted_days.index(next_closet_day) :] + sorted_days[: sorted_days.index(next_closet_day)]
+    return sorted_days[sorted_days.index(next_closest_day) :] + sorted_days[: sorted_days.index(next_closest_day)]

tests/time_window_filter/test_recurrence_evaluator.py

@@ -12,7 +12,7 @@
 def test_is_match_within_time_window():
     start = datetime(2025, 4, 7, 9, 0, 0)
     end = datetime(2025, 4, 7, 17, 0, 0)
-    now = datetime(2025, 4, 7, 10, 0, 0)
+    now = datetime(2025, 4, 8, 10, 0, 0)
 
     recurrence = Recurrence(
         {

tests/time_window_filter/test_recurrence_validator.py

@@ -6,7 +6,7 @@
 from datetime import timedelta, datetime
 import pytest
 from featuremanagement._time_window_filter._models import Recurrence
-from featuremanagement._time_window_filter._recurrence_validator import validate_settings
+from featuremanagement._time_window_filter._recurrence_validator import validate_settings, _sort_days_of_week
 
 DATE_FORMAT = "%a, %d %b %Y %H:%M:%S"
 
@@ -187,3 +187,8 @@ def test_is_duration_compliant_with_days_of_week_false():
     end = datetime(2025, 4, 10, 9, 0, 0)  # Wednesday (48 hours duration)
     with pytest.raises(ValueError, match="Recurrence.Pattern.DaysOfWeek"):
         validate_settings(Recurrence({"Pattern": pattern, "Range": valid_no_end_range()}), start, end)
+
+def test_sort_days_of_week():
+    days_of_week = [0, 3, 5] # Monday, Thursday, Saturday
+    sorted_days = _sort_days_of_week(days_of_week, 6)
+    assert sorted_days == [0, 3, 5]