VED-352: Add last time of day to end date (#583)

make end period have the end time of day

Author: Akol125

delta_backend/src/extractor.py

@@ -77,19 +77,22 @@ def _get_practitioner_names(self):
 
         return performing_professional_forename, performing_professional_surname
 
-
     def _is_current_period(self, name, occurrence_time):
         period = name.get("period")
         if not isinstance(period, dict):
             return True  # If no period is specified, assume it's valid
 
         start = datetime.fromisoformat(period.get("start")) if period.get("start") else None
-        end = datetime.fromisoformat(period.get("end")) if period.get("end") else None
-
+        end_str = period.get("end")
+        end = datetime.fromisoformat(period.get("end")) if end_str else None
         # Ensure all datetime objects are timezone-aware
         if start and start.tzinfo is None:
             start = start.replace(tzinfo=timezone.utc)
+        if end and "T" not in end_str:
+            # If end is a date-only string like "2025-06-12", upgrade to full end-of-day
+            end = end.replace(hour=23, minute=59, second=59, microsecond=999999)
         if end and end.tzinfo is None:
+            # If end still has no timezone info, assign UTC
             end = end.replace(tzinfo=timezone.utc)
 
         return (not start or start <= occurrence_time) and (not end or occurrence_time <= end)

delta_backend/tests/test_current_period.py

@@ -0,0 +1,37 @@
+import unittest
+from datetime import datetime, timezone
+from src.extractor import Extractor 
+
+
+class TestIsCurrentPeriod(unittest.TestCase):
+    def setUp(self):
+        self.extractor = Extractor(fhir_json_data={})
+        self.occurrence = datetime(2025, 6, 12, 13, 0, 0, tzinfo=timezone.utc)
+
+    def test_valid_period_in_range(self):
+        name = {"period": {"start": "2025-06-01", "end": "2025-06-12"}}
+        result = self.extractor._is_current_period(name, self.occurrence)
+        self.assertTrue(result)
+
+    def test_occurrence_after_end(self):
+        name = {"period": {"start": "2025-06-01", "end": "2025-06-11"}}
+        result = self.extractor._is_current_period(name, self.occurrence)
+        self.assertFalse(result)
+
+    def test_occurrence_before_start(self):
+        name = {"period": {"start": "2025-06-13", "end": "2025-06-20"}}
+        result = self.extractor._is_current_period(name, self.occurrence)
+        self.assertFalse(result)
+
+    def test_date_only_end(self):
+        name = {"period": {"end": "2025-06-12"}}
+        result = self.extractor._is_current_period(name, self.occurrence)
+        self.assertTrue(result)  # because end-of-day logic applies
+
+    def test_no_period(self):
+        name = {}
+        result = self.extractor._is_current_period(name, self.occurrence)
+        self.assertTrue(result)
+
+if __name__ == '__main__':
+    unittest.main()