date conversion

Author: Akol125

azure/templates/post-deploy.yml

@@ -206,7 +206,7 @@ steps:
 
     displayName: Run full batch test suite
     workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)/e2e_batch"
-    condition: eq(1, 2) # Disable task but make this step visible in the pipeline
+    # condition: eq(1, 2) # Disable task but make this step visible in the pipeline
 
   - task: PublishTestResults@2
     displayName: 'Publish test results'

delta_backend/src/ConversionChecker.py

@@ -121,18 +121,8 @@ def _convertToDate(self, expressionRule, fieldName, fieldValue, summarise, repor
                 if report_unexpected_exception:
                     self._log_error(fieldName, fieldValue, "Value is not a string")
                 return ""
-
-            # 2. Use Expression Rule Format to parse the date, remove dashes and slashes
-            if expressionRule == "%Y%m%d":
-                fieldValue = fieldValue.split("T")[0]
-                fieldValue = fieldValue.replace("-", "").replace("/", "")
-                if not re.match(r"^\d{8}$", fieldValue):
-                    if report_unexpected_exception:
-                        self._log_error(fieldName, fieldValue, "Date must be in YYYYMMDD format")
-                    return ""
             try:
-                # Converts raw fieldvalue without delimiters to a date-time object
-                dt = datetime.strptime(fieldValue, expressionRule)
+                dt = datetime.fromisoformat(fieldValue)
                 return dt.strftime(expressionRule)
             except ValueError as e:
                 # 5. Unexpected parsing errors
@@ -182,8 +172,6 @@ def _convertToDateTime(self, expressionRule, fieldName, fieldValue, summarise, r
 
     # Not Empty Validate - Returns exactly what is in the extracted fields no parsing or logic needed
     def _convertToNotEmpty(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):
-        if not fieldValue:
-            return ""
         try:
             if isinstance(fieldValue, str) and fieldValue.strip():
                 return fieldValue
@@ -193,7 +181,7 @@ def _convertToNotEmpty(self, expressionRule, fieldName, fieldValue, summarise, r
             if report_unexpected_exception:
                 message = ExceptionMessages.MESSAGES[ExceptionMessages.UNEXPECTED_EXCEPTION] % (e.__class__.__name__, e)
                 self._log_error(fieldName, fieldValue, message)
-            return
+            return ""
 
     # NHSNumber Validate
     def _convertToNHSNumber(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):

delta_backend/tests/sample_data/fhir_sample.json

@@ -28,7 +28,7 @@
         }
       ],
       "gender": "other",
-      "birthDate": "2024-03-10",
+      "birthDate": "2026-03-10",
       "address": [
         {
           "use": "home",
@@ -73,7 +73,7 @@
     "reference": "#Pat1"
   },
   "occurrenceDateTime": "2021-02-07T13:28:17+00:00",
-  "recorded": "2029-01-01",
+  "recorded": "2025-02-07",
   "primarySource": "True",
   "manufacturer": {
     "display": "AstraZeneca Ltd"

delta_backend/tests/test_convert_to_flat_json.py

@@ -382,7 +382,7 @@ def test_convert_to_date(self, MockLookUpData):
         self.assertEqual(result, "20220101")
 
         # 2.Full ISO date should be transformed to YYYYMMDD
-        result = checker._convertToDate("%Y%m%d", "fieldName", "2022-01-01T12:00:00+00:0", False, True)
+        result = checker._convertToDate("%Y%m%d", "fieldName", "2022-01-01T12:00:00+00:00", False, True)
         self.assertEqual(result, "20220101")
 
         # 3. Invalid string date format (should trigger "Date must be in YYYYMMDD format")
@@ -405,7 +405,6 @@ def test_convert_to_date(self, MockLookUpData):
         messages = [err["message"] for err in checker.errorRecords]
         print(f"Error Test Case, {messages}")
 
-        self.assertIn("Date must be in YYYYMMDD format", messages)
         self.assertIn("Value is not a string", messages)
 
         # Confirm Total Errors Per conversion