fix and test most recent week

Author: apie

subscribe_util.py

@@ -6,6 +6,8 @@
 from itsdangerous import URLSafeTimedSerializer
 from itsdangerous.exc import BadSignature
 
+from typing import Dict
+
 from util import get_period_stats
 from config import SECRET_KEY, FROM_ADDRESS
 
@@ -75,18 +77,17 @@ def save_confirmed_subscription(username, email):
         print('Added subscription', subscription_details)
 
 
-def get_most_recent_period(period_name):
+def get_most_recent_period(period_name: str) -> Dict[str, int]:
     today = datetime.date.today()
     if period_name == 'year':
         return dict(year=today.year - 1)
     if period_name == 'month':
         d = today - relativedelta(months=1)
         return dict(year=d.year, month=d.month)
     if period_name == 'week':
-        # Get date of monday of the requested weeknumber. (ISO 8601)
-        monday_this_week = datetime.datetime.strptime(f"{today.year} {today.strftime('%W')} 1", "%G %V %w")
-        monday_last_week = monday_this_week - relativedelta(weeks=1)
-        return dict(year=monday_last_week.year, week=monday_last_week.strftime("%W"))
+        today_last_week = today - relativedelta(weeks=1)
+        return dict(year=int(today_last_week.strftime("%G")), week=int(today_last_week.strftime("%V")))
+    raise NotImplementedError(f'Unknown {period_name=}')
 
 
 def get_period_str(period_dict):

tests.py

@@ -1,7 +1,10 @@
 import unittest
 import re
 
+from freezegun import freeze_time
+
 from scrape import username_regex
+from subscribe_util import get_most_recent_period
 
 
 class TestUserName(unittest.TestCase):
@@ -22,5 +25,35 @@ def test_username_regex(self):
                 self.assertEqual(re.match(username_regex, username) is not None, valid)
 
 
-if __name__ == '__main__':
+class TestMostRecentWeeknumber(unittest.TestCase):
+    @freeze_time('2024-12-24')
+    def test_weeknumber_51(self):
+        period = get_most_recent_period("week")
+        year, week = period['year'], period['week']
+        assert year == 2024, year
+        assert week == 51, week
+
+    @freeze_time('2024-12-31')
+    def test_weeknumber_52(self):
+        period = get_most_recent_period("week")
+        year, week = period['year'], period['week']
+        assert year == 2024, year
+        assert week == 52, week
+
+    @freeze_time('2025-01-07')
+    def test_weeknumber_1(self):
+        period = get_most_recent_period("week")
+        year, week = period['year'], period['week']
+        assert year == 2025, year
+        assert week == 1, week
+
+    @freeze_time('2025-01-14')
+    def test_weeknumber_2(self):
+        period = get_most_recent_period("week")
+        year, week = period['year'], period['week']
+        assert year == 2025, year
+        assert week == 2, week
+
+
+if __name__ == "__main__":
     unittest.main()