Addressing PR comments

Author: adrianoaru-nhs

classes/subject.py

@@ -10,6 +10,7 @@
 from classes.sdd_reason_for_change_type import SDDReasonForChangeType
 from classes.ss_reason_for_change_type import SSReasonForChangeType
 from classes.ssdd_reason_for_change_type import SSDDReasonForChangeType
+from utils.date_time_utils import DateTimeUtils
 import pandas as pd
 
 
@@ -1256,100 +1257,48 @@ def from_dataframe_row(row: pd.Series) -> "Subject":
             "nhs_number": row.get("subject_nhs_number"),
             "surname": row.get("person_family_name"),
             "forename": row.get("person_given_name"),
-            "datestamp": Subject.parse_datetime(row.get("datestamp")),
+            "datestamp": DateTimeUtils.parse_datetime(row.get("datestamp")),
             "screening_status_id": row.get("screening_status_id"),
             "screening_status_change_reason_id": row.get("ss_reason_for_change_id"),
-            "screening_status_change_date": Subject.parse_date(
+            "screening_status_change_date": DateTimeUtils.parse_date(
                 row.get("screening_status_change_date")
             ),
-            "screening_due_date": Subject.parse_date(row.get("screening_due_date")),
+            "screening_due_date": DateTimeUtils.parse_date(
+                row.get("screening_due_date")
+            ),
             "screening_due_date_change_reason_id": row.get("sdd_reason_for_change_id"),
-            "screening_due_date_change_date": Subject.parse_date(
+            "screening_due_date_change_date": DateTimeUtils.parse_date(
                 row.get("sdd_change_date")
             ),
-            "calculated_screening_due_date": Subject.parse_date(
+            "calculated_screening_due_date": DateTimeUtils.parse_date(
                 row.get("calculated_sdd")
             ),
-            "surveillance_screening_due_date": Subject.parse_date(
+            "surveillance_screening_due_date": DateTimeUtils.parse_date(
                 row.get("surveillance_screen_due_date")
             ),
-            "calculated_surveillance_due_date": Subject.parse_date(
+            "calculated_surveillance_due_date": DateTimeUtils.parse_date(
                 row.get("calculated_ssdd")
             ),
             "surveillance_due_date_change_reason_id": row.get(
                 "surveillance_sdd_rsn_change_id"
             ),
-            "surveillance_due_date_change_date": Subject.parse_date(
+            "surveillance_due_date_change_date": DateTimeUtils.parse_date(
                 row.get("surveillance_sdd_change_date")
             ),
-            "lynch_due_date": Subject.parse_date(row.get("lynch_screening_due_date")),
+            "lynch_due_date": DateTimeUtils.parse_date(
+                row.get("lynch_screening_due_date")
+            ),
             "lynch_due_date_change_reason_id": row.get(
                 "lynch_sdd_reason_for_change_id"
             ),
-            "lynch_due_date_change_date": Subject.parse_date(
+            "lynch_due_date_change_date": DateTimeUtils.parse_date(
                 row.get("lynch_sdd_change_date")
             ),
-            "calculated_lynch_due_date": Subject.parse_date(
+            "calculated_lynch_due_date": DateTimeUtils.parse_date(
                 row.get("lynch_calculated_sdd")
             ),
-            "date_of_birth": Subject.parse_date(row.get("date_of_birth")),
-            "date_of_death": Subject.parse_date(row.get("date_of_death")),
+            "date_of_birth": DateTimeUtils.parse_date(row.get("date_of_birth")),
+            "date_of_death": DateTimeUtils.parse_date(row.get("date_of_death")),
         }
 
         return Subject(**field_map)
-
-    @staticmethod
-    def parse_date(
-        val: Optional[Union[pd.Timestamp, str, datetime, date]],
-    ) -> Optional[date]:
-        """
-        Converts a value to a Python date object if possible.
-
-        Args:
-            val: The value to convert (can be pandas.Timestamp, string, datetime, date, or None).
-
-        Returns:
-            Optional[date]: The converted date object, or None if conversion fails.
-        """
-        if pd.isnull(val):
-            return None
-        if isinstance(val, pd.Timestamp):
-            return val.to_pydatetime().date()
-        if isinstance(val, str):
-            try:
-                return datetime.strptime(val[:10], "%Y-%m-%d").date()
-            except Exception:
-                return None
-        if isinstance(val, datetime):
-            return val.date()
-        if isinstance(val, date):
-            return val
-        return None
-
-    @staticmethod
-    def parse_datetime(
-        val: Optional[Union[pd.Timestamp, str, datetime, date]],
-    ) -> Optional[datetime]:
-        """
-        Converts a value to a Python datetime object if possible.
-
-        Args:
-            val: The value to convert (can be pandas.Timestamp, string, datetime, or None).
-
-        Returns:
-            Optional[datetime]: The converted datetime object, or None if conversion fails.
-        """
-        if pd.isnull(val):
-            return None
-        if isinstance(val, pd.Timestamp):
-            return val.to_pydatetime()
-        if isinstance(val, str):
-            for fmt in ("%Y-%m-%d %H:%M:%S", "%Y-%m-%dT%H:%M:%S"):
-                try:
-                    return datetime.strptime(val[:19], fmt)
-                except Exception:
-                    continue
-            return None
-        if isinstance(val, datetime):
-            return val
-        return None

docs/utility-guides/SubjectAssertion.md

@@ -36,7 +36,7 @@ If the subject does not match all criteria, the function will iteratively loop t
 ## How It Works
 
 1. The function first checks if the subject with the given NHS number matches all provided criteria.
-2. If not, it removes checks one criterion at a time and retries the assertion.
+2. If not, it checks one criterion at a time and retries the assertion.
 3. This process continues until all criteria have been checked.
 4. If a match is found only after removing criteria, the failed criteria are logged.
 5. The function returns `True` only if all criteria match on the first attempt; otherwise, it returns `False`.

utils/date_time_utils.py

@@ -1,5 +1,6 @@
-from datetime import datetime, timedelta
-from typing import Optional
+from datetime import datetime, timedelta, date
+from typing import Optional, Union
+import pandas as pd
 import random
 
 
@@ -152,3 +153,59 @@ def generate_unique_weekday_date(start_year: int = 2025) -> str:
             base_date += timedelta(days=1)
 
         return base_date.strftime("%d/%m/%Y")
+
+    @staticmethod
+    def parse_date(
+        val: Optional[Union[pd.Timestamp, str, datetime, date]],
+    ) -> Optional[date]:
+        """
+        Converts a value to a Python date object if possible.
+
+        Args:
+            val: The value to convert (can be pandas.Timestamp, string, datetime, date, or None).
+
+        Returns:
+            Optional[date]: The converted date object, or None if conversion fails.
+        """
+        if pd.isnull(val):
+            return None
+        if isinstance(val, pd.Timestamp):
+            return val.to_pydatetime().date()
+        if isinstance(val, str):
+            try:
+                return datetime.strptime(val[:10], "%Y-%m-%d").date()
+            except Exception:
+                return None
+        if isinstance(val, datetime):
+            return val.date()
+        if isinstance(val, date):
+            return val
+        return None
+
+    @staticmethod
+    def parse_datetime(
+        val: Optional[Union[pd.Timestamp, str, datetime, date]],
+    ) -> Optional[datetime]:
+        """
+        Converts a value to a Python datetime object if possible.
+
+        Args:
+            val: The value to convert (can be pandas.Timestamp, string, datetime, or None).
+
+        Returns:
+            Optional[datetime]: The converted datetime object, or None if conversion fails.
+        """
+        if pd.isnull(val):
+            return None
+        if isinstance(val, pd.Timestamp):
+            return val.to_pydatetime()
+        if isinstance(val, str):
+            for fmt in ("%Y-%m-%d %H:%M:%S", "%Y-%m-%dT%H:%M:%S"):
+                try:
+                    return datetime.strptime(val[:19], fmt)
+                except Exception:
+                    continue
+            return None
+        if isinstance(val, datetime):
+            return val
+        return None