Fix this_week filter [SDESK-7264]

server/planning/common.py

@@ -459,7 +459,9 @@ def get_start_of_next_week(date=None, start_of_week=0):
     current_date = (date if date else utcnow()).replace(hour=0, minute=0, second=0, microsecond=0)
     weekday = current_date.isoweekday()
     weekDay = 0 if weekday == 7 else weekday
-    diff = start_of_week - weekDay if weekday < start_of_week else 7 - weekDay + start_of_week
+    diff = (start_of_week - weekDay) % 7
+    if diff == 0:
+        diff = 7
     return current_date + timedelta(days=diff)
 
 

server/planning/search/queries/combined.py

@@ -1,6 +1,7 @@
 from typing import Dict, Any, List, Callable
 
 from planning.search.queries import elastic, events, planning, common
+from flask import current_app as app
 
 
 def construct_combined_view_data_query(
@@ -22,8 +23,12 @@ def construct_combined_view_data_query(
 
     query = elastic.ElasticQuery()
 
-    if len(search_filter["params"]):
-        search_dates(search_filter["params"], query)
+    filter_params = common.get_params_from_search_filter(search_filter)
+    if len(filter_params):
+        filter_params["time_zone"] = params.get("time_zone") or app.config.get("DEFAULT_TIMEZONE")
+        filter_params["start_of_week"] = params.get("start_of_week", app.config.get("START_OF_WEEK", 0))
+
+        search_dates(filter_params, query)
 
     search_dates(params, query)
 

server/planning/search/queries/elastic.py

@@ -120,21 +120,19 @@ def __init__(
 
 
 def start_of_this_week(start_of_week=0, date=None):
-    end = get_start_of_next_week(date, start_of_week) - timedelta(days=7)
-    start = end - timedelta(days=7)
-
-    return start.strftime("%Y-%m-%d") + "||/d"
+    start = get_start_of_next_week(date, start_of_week) - timedelta(days=7)
+    return start.strftime("%Y-%m-%d")
 
 
 def start_of_next_week(start_of_week=0, date=None):
-    return get_start_of_next_week(date, start_of_week).strftime("%Y-%m-%d") + "||/d"
+    return get_start_of_next_week(date, start_of_week).strftime("%Y-%m-%d")
 
 
 def end_of_next_week(start_of_week=0, date=None):
     start = get_start_of_next_week(date, start_of_week)
     end = start + timedelta(days=7)
 
-    return end.strftime("%Y-%m-%d") + "||/d"
+    return end.strftime("%Y-%m-%d")
 
 
 def bool_or(conditions: List[Dict[str, Any]]):

server/planning/tests/utils_tests.py

@@ -35,30 +35,57 @@ def test_dates_same_and_different_time(self):
 
 
 class TestDateRangeFunctions(TestCase):
-    def get_start_date_and_weekday(self, start_date_str):
-        start_date = datetime.strptime(start_date_str.split("||")[0], "%Y-%m-%d")
+    def get_weekday(self, start_date_str):
+        start_date = datetime.strptime(start_date_str, "%Y-%m-%d")
         return start_date.weekday()
 
     def test_start_of_next_week(self):
         # Test with default start_of_week
         start_date_str = elastic.start_of_next_week()
-        expected_weekday = self.get_start_date_and_weekday(start_date_str)
+        expected_weekday = self.get_weekday(start_date_str)
         self.assertEqual(expected_weekday, 6)  # Sunday
 
         # Test with default start_of_week = 1
         start_date_str = elastic.start_of_next_week(start_of_week=1)
-        expected_weekday = self.get_start_date_and_weekday(start_date_str)
+        expected_weekday = self.get_weekday(start_date_str)
         self.assertEqual(expected_weekday, 0)  # Monday
 
     def test_end_of_next_week(self):
         # Test with default start_of_week
         start_date = datetime(2024, 5, 6)  # Assuming today is May 6, 2024 (Sunday)
         end_date_str = elastic.end_of_next_week(date=start_date)
-        expected_weekday = self.get_start_date_and_weekday(end_date_str)
+        expected_weekday = self.get_weekday(end_date_str)
         self.assertEqual(expected_weekday, 6)  # Sunday
 
         # Test with default start_of_week = 1
         start_date = datetime(2024, 5, 6)  # Assuming today is May 6, 2024 (Sunday)
         end_date_str = elastic.end_of_next_week(date=start_date, start_of_week=1)
-        expected_weekday = self.get_start_date_and_weekday(end_date_str)
+        expected_weekday = self.get_weekday(end_date_str)
         self.assertEqual(expected_weekday, 0)  # Monday
+
+    def test_events_within_current_week(self):
+        # Test events that start and end within the current week
+        start_date = datetime(2024, 5, 15)  # Assuming today is May 15, 2024 (Wed)
+        start = elastic.start_of_this_week(date=start_date, start_of_week=1)
+        end = elastic.start_of_next_week(date=start_date, start_of_week=1)
+
+        self.assertEqual(start, "2024-05-13")
+        self.assertEqual(end, "2024-05-20")
+
+    def test_events_within_current_week_monday(self):
+        # Test case for Monday
+        start_date = datetime(2024, 5, 13)  # May 13, 2024 is a Monday
+        start = elastic.start_of_this_week(date=start_date, start_of_week=1)
+        end = elastic.start_of_next_week(date=start_date, start_of_week=1)
+
+        self.assertEqual(start, "2024-05-13")
+        self.assertEqual(end, "2024-05-20")
+
+    def test_events_within_current_week_sunday(self):
+        # Test case for Sunday
+        start_date = datetime(2024, 5, 19)  # May 19, 2024 is a Sunday
+        start = elastic.start_of_this_week(date=start_date, start_of_week=1)
+        end = elastic.start_of_next_week(date=start_date, start_of_week=1)
+
+        self.assertEqual(start, "2024-05-13")
+        self.assertEqual(end, "2024-05-20")