add future date check for birth date

Author: Akol125

backend/src/models/fhir_immunization_pre_validators.py

@@ -729,7 +729,7 @@ def pre_validate_expiration_date(self, values: dict) -> dict:
         """
         try:
             field_value = values["expirationDate"]
-            PreValidation.for_date(field_value, "expirationDate")
+            PreValidation.for_date(field_value, "expirationDate", future_date_allowed=True)
         except KeyError:
             pass
 

backend/src/models/utils/pre_validator_utils.py

@@ -83,7 +83,7 @@ def for_list(
                     raise ValueError(f"{field_location} must be an array of non-empty objects")
 
     @staticmethod
-    def for_date(field_value: str, field_location: str):
+    def for_date(field_value: str, field_location: str, future_date_allowed: bool = False):
         """
         Apply pre-validation to a date field to ensure that it is a string (JSON dates must be
         written as strings) containing a valid date in the format "YYYY-MM-DD"
@@ -98,8 +98,9 @@ def for_date(field_value: str, field_location: str):
                 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)
+        # Enforce not-in-the-future rule using central checker (after successful parse)
+        if not future_date_allowed and PreValidation.check_if_future_date(parsed_date):
+            raise ValueError(f"{field_location} must not be in the future")
 
     @staticmethod
     def for_date_time(field_value: str, field_location: str, strict_timezone: bool = True):
@@ -139,13 +140,15 @@ def for_date_time(field_value: str, field_location: str, strict_timezone: bool =
         for fmt in formats:
             try:
                 fhir_date = datetime.strptime(field_value, fmt)
-                
+                # After successful parse, enforce timezone and future-date rules
                 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
+                    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 (after successful parse)
+                if PreValidation.check_if_future_date(fhir_date):
+                    raise ValueError(f"{field_location} must not be in the future")
+
                 return fhir_date.isoformat()
             except ValueError:
                 continue

backend/tests/test_immunization_pre_validator.py

@@ -1104,7 +1104,7 @@ def test_pre_validate_lot_number(self):
 
     def test_pre_validate_expiration_date(self):
         """Test pre_validate_expiration_date accepts valid values and rejects invalid values"""
-        ValidatorModelTests.test_date_value(self, field_location="expirationDate")
+        ValidatorModelTests.test_date_value(self, field_location="expirationDate", is_future_date_allowed=True)
 
     def test_pre_validate_site_coding(self):
         """Test pre_validate_site_coding accepts valid values and rejects invalid values"""

backend/tests/utils/pre_validation_test_utils.py

@@ -282,6 +282,7 @@ def test_unique_list(
     def test_date_value(
         test_instance: unittest.TestCase,
         field_location: str,
+        is_future_date_allowed: bool = False,
     ):
         """
         Test that a FHIR model accepts valid date values and rejects the following invalid values:
@@ -314,6 +315,15 @@ def test_date_value(
                 invalid_value=invalid_date_format,
                 expected_error_message=f"{field_location} must be a valid date string in the " + 'format "YYYY-MM-DD"',
             )
+        if not is_future_date_allowed:
+            for invalid_date_format in InvalidValues.for_future_dates:
+                test_invalid_values_rejected(
+                    test_instance,
+                    valid_json_data,
+                    field_location=field_location,
+                    invalid_value=invalid_date_format,
+                expected_error_message=f"{field_location} must not be in the future",
+            )
 
     @staticmethod
     def test_date_time_value(

backend/tests/utils/values_for_tests.py

@@ -291,6 +291,12 @@ class InvalidValues:
         "2000-02-30",  # Invalid combination of month and day
     ]
 
+    for_future_dates = [
+        "2100-01-01",  # Year in future
+        "2050-12-31",  # Year in future
+        "2029-06-15",  # Year in future
+    ]
+
     # Strings which are not in acceptable date time format
     for_date_time_string_formats_for_relaxed_timezone = [
         "",  # Empty string