Datetime must not be in the future

Author: Akol125

backend/src/models/utils/pre_validator_utils.py

@@ -2,6 +2,7 @@
 from datetime import datetime, timedelta
 from decimal import Decimal
 from typing import Union
+from datetime import datetime, date
 
 from .generic_utils import nhs_number_mod11_check, is_valid_simple_snomed
 
@@ -91,12 +92,15 @@ def for_date(field_value: str, field_location: str):
             raise TypeError(f"{field_location} must be a string")
 
         try:
-            datetime.strptime(field_value, "%Y-%m-%d").date()
+            parsed_date = datetime.strptime(field_value, "%Y-%m-%d").date()
         except ValueError as value_error:
             raise ValueError(
                 f'{field_location} must be a valid date string in the format "YYYY-MM-DD"'
             ) from value_error
 
+        # Enforce not-in-the-future rule using central checker
+        PreValidation.check_if_future_date(parsed_date)
+
     @staticmethod
     def for_date_time(field_value: str, field_location: str, strict_timezone: bool = True):
         """
@@ -117,10 +121,12 @@ def for_date_time(field_value: str, field_location: str, strict_timezone: bool =
             "- 'YYYY-MM-DDThh:mm:ss%z' — Full date and time with timezone (e.g. +00:00 or +01:00)"
             "- 'YYYY-MM-DDThh:mm:ss.f%z' — Full date and time with milliseconds and timezone"
         )
-         
         if strict_timezone:
-            error_message += "Only '+00:00' and '+01:00' are accepted as valid timezone offsets.\n"
-            error_message += f"Note that partial dates are not allowed for {field_location} in this service."
+            error_message += (
+                "Only '+00:00' and '+01:00' are accepted as valid timezone offsets.\n"
+                f"Note that partial dates are not allowed for {field_location} in this service.\n"
+                "Date must not be in the future."
+                )
 
         allowed_suffixes = {"+00:00", "+01:00", "+0000", "+0100",}
 
@@ -135,8 +141,11 @@ def for_date_time(field_value: str, field_location: str, strict_timezone: bool =
                 fhir_date = datetime.strptime(field_value, fmt)
 
                 if strict_timezone and fhir_date.tzinfo is not None:
+                   if PreValidation.check_if_future_date(fhir_date):
+                       raise ValueError(error_message)
                    if not any(field_value.endswith(suffix) for suffix in allowed_suffixes):
                        raise ValueError(error_message)
+                # Enforce not-in-the-future rule using central checker
                 return fhir_date.isoformat()
             except ValueError:
                 continue
@@ -234,3 +243,15 @@ def for_nhs_number(nhs_number: str, field_location: str):
         """
         if not nhs_number_mod11_check(nhs_number):
             raise ValueError(f"{field_location} is not a valid NHS number")
+
+    @staticmethod
+    def check_if_future_date(parsed_value: date | datetime):
+        """
+        Ensure a parsed date or datetime object is not in the future.
+        """
+        if isinstance(parsed_value, datetime):
+            now = datetime.now(parsed_value.tzinfo) if parsed_value.tzinfo else datetime.now()
+        elif isinstance(parsed_value, date):
+            now = datetime.now().date()
+        if parsed_value > now:
+            return True

backend/tests/utils/pre_validation_test_utils.py

@@ -336,8 +336,11 @@ def test_date_time_value(
         )
 
         if is_occurrence_date_time:
-             expected_error_message += "Only '+00:00' and '+01:00' are accepted as valid timezone offsets.\n"
-             expected_error_message += f"Note that partial dates are not allowed for {field_location} in this service."
+             expected_error_message += (
+                 "Only '+00:00' and '+01:00' are accepted as valid timezone offsets.\n"
+                 f"Note that partial dates are not allowed for {field_location} in this service.\n"
+                 "Date must not be in the future."
+                 )
              valid_datetime_formats = ValidValues.for_date_times_strict_timezones
              invalid_datetime_formats = InvalidValues.for_date_time_string_formats_for_strict_timezone
         else: