Fix year overrides (#123)

* better handle overrides between years * update changelog * Update CHANGES.rst --------- Co-authored-by: Mauro Amico <[email protected]>
RedTurtle · Nov 20, 2023 · da7d692 · da7d692
1 parent 9178b7f
commit da7d692
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -29,6 +29,9 @@ Changelog
 - Add booking_refuse_message to Prenotazione stringinterp variables.
   [folix-01]
 
+- Better handle overrides between years.
+  [cekk]
+
 
 2.1.5 (2023-11-10)
 ------------------

diff --git a/src/redturtle/prenotazioni/browser/prenotazioni_context_state.py b/src/redturtle/prenotazioni/browser/prenotazioni_context_state.py
@@ -185,13 +185,21 @@ def get_week_overrides(self, day):
                 to_date = date(to_year, to_month, to_day)
             else:
                 # ends next year (i.e. from "20 dec" to "7 jan")
-                today_year = date.today().year
-                if today_year < to_year:
-                    from_date = date(today_year, from_month, from_day)
+                if day.month < from_month:
+                    # i.e day is 03 jan
+                    from_date = date(to_year - 1, from_month, from_day)
                     to_date = date(to_year, to_month, to_day)
                 else:
+                    # i.e day is 28 dec
                     from_date = date(to_year, from_month, from_day)
                     to_date = date(to_year + 1, to_month, to_day)
+                # today_year = date.today().year
+                # if today_year < to_year:
+                #     from_date = date(today_year, from_month, from_day)
+                #     to_date = date(to_year, to_month, to_day)
+                # else:
+                #     from_date = date(to_year, from_month, from_day)
+                #     to_date = date(to_year + 1, to_month, to_day)
 
             if isinstance(day, datetime):
                 if from_date <= day.date() <= to_date:

diff --git a/src/redturtle/prenotazioni/tests/test_week_table_overrides.py b/src/redturtle/prenotazioni/tests/test_week_table_overrides.py
@@ -129,6 +129,12 @@ def test_override_between_year(self):
             json.loads(self.folder_prenotazioni.week_table_overrides)[0]["week_table"],
         )
 
+        # if in range and next year +1, return table overrides
+        self.assertEqual(
+            self.view.get_week_table(date(now.year + 1, 12, 25)),
+            json.loads(self.folder_prenotazioni.week_table_overrides)[0]["week_table"],
+        )
+
         # if out of range, return base table
         self.assertEqual(
             self.view.get_week_table(date(now.year, 10, 10)),