wip

Author: Andyg79

tests/regression/subjects/test_create_subjects.py

@@ -12,11 +12,10 @@
     create_subject,
 )
 from utils.date_time_utils import DateTimeUtils
-from utils.subject_utils import get_active_invitation_plan
 
-random_offset = DateTimeUtils.random_offset
 from playwright.sync_api import Page
 
+
 @pytest.fixture
 def db_connection():
     """

tests_utils/test_date_time_utils.py

@@ -1,12 +1,10 @@
 import pytest
-import utils.date_time_utils
+from utils.date_time_utils import DateTimeUtils
 from datetime import datetime, timedelta
 
-pytestmark = [pytest.mark.utils]
-
 
 def test_current_datetime():
-    dtu = utils.date_time_utils.DateTimeUtils()
+    dtu = DateTimeUtils()
     current_date = datetime.now()
     assert dtu.current_datetime() == current_date.strftime("%d/%m/%Y %H:%M")
     assert dtu.current_datetime("%Y-%m-%d %H:%M") == current_date.strftime(
@@ -18,15 +16,15 @@ def test_current_datetime():
 
 
 def test_format_date():
-    dtu = utils.date_time_utils.DateTimeUtils()
+    dtu = DateTimeUtils()
     date = datetime(2022, 12, 31)
     assert dtu.format_date(date, "%d/%m/%Y") == "31/12/2022"
     assert dtu.format_date(date, "%Y/%m/%d") == "2022/12/31"
     assert dtu.format_date(date, "%d %B %Y") == "31 December 2022"
 
 
 def test_add_days():
-    dtu = utils.date_time_utils.DateTimeUtils()
+    dtu = DateTimeUtils()
     date = datetime.now()
     new_date = dtu.add_days(date, 5)
     assert new_date == date + timedelta(days=5)
@@ -45,13 +43,23 @@ def test_add_days():
 
 
 def test_get_day_of_week_with_specific_date():
-    dtu = utils.date_time_utils.DateTimeUtils()
+    dtu = DateTimeUtils()
     date = datetime(2023, 11, 8)  # Known Wednesday
     day_of_week = dtu.get_day_of_week(date)
     assert day_of_week in VALID_WEEKDAYS
 
 
 def test_get_day_of_week_with_default_today():
-    dtu = utils.date_time_utils.DateTimeUtils()
+    dtu = DateTimeUtils()
     day_of_week = dtu.get_day_of_week()
     assert day_of_week in VALID_WEEKDAYS
+
+
+def test_random_offset_within_bounds():
+    start_date = datetime(2025, 1, 1)
+    end_date = datetime(2025, 1, 31)
+
+    for _ in range(100):  # Run multiple times to catch edge randomness
+        offset = DateTimeUtils.random_offset(start_date, end_date)
+        assert isinstance(offset, int)
+        assert 0 <= offset <= (end_date - start_date).days

utils/date_time_utils.py

@@ -169,4 +169,6 @@ def random_offset(start_date: datetime, end_date: datetime) -> int:
             int: A random offset in days between start_date and end_date.
         """
         delta_days = (end_date - start_date).days
+        if start_date > end_date:
+            raise ValueError("start_date must be earlier than end_date")
         return random.randint(0, max(delta_days, 0))

utils/subject_utils.py

@@ -1,6 +1,5 @@
 from datetime import datetime, timedelta
 from dataclasses import dataclass
-from datetime import datetime
 
 
 @dataclass
@@ -28,6 +27,7 @@ class InvitationPlan:
 
 
 def get_active_invitation_plan(hub_code, sc_code, db_connection) -> InvitationPlan:
+    #TODO: Replace with real DB logic so that this function accepts real parameters
     """
     Retrieves the currently active invitation plan for a given hub and screening centre.
     Replace with real DB logic using your ORM or SQL execution layer.
@@ -50,15 +50,13 @@ def calculate_subject_shortfall(active_plan: InvitationPlan, daily_target: int)
     """
     invitations_per_day = active_plan.invitations_per_day
     invitations_due = active_plan.invitations_due
-    plan_duration_days = (active_plan.end_date - active_plan.start_date).days
-
     estimated_total = int(
         (daily_target / invitations_per_day) * invitations_due * 1.01 - invitations_due
     )
     return max(0, estimated_total)
 
 
-def create_subject(birth_date, screening_centre, hub, region):
+def create_subject(birth_date: datetime, screening_centre: str, hub: str, region: str) -> None:
     """
     Creates a new subject in the database.
     You’ll likely want to use your existing data generation utilities or raw SQL here.