working unit tests

Author: Akol125

delta_backend/.coverage

@@ -82,22 +82,4 @@ This script loads sample FHIR data, runs it through the converter, and automatic
 ```bash
 python test_runner.py
 ```
-
-### 📁 Output Location
-When the script runs, it will automatically:
-- Save a **flat JSON file** as `output.json`
-- Save a **CSV file** as `output.csv`
-
-These will be located one level up from the `src/` folder:
-
-```
-/mnt/c/Users/USER/desktop/shn/immunisation-fhir-api/delta_backend/output.json
-/mnt/c/Users/USER/desktop/shn/immunisation-fhir-api/delta_backend/output.csv
-```
-
-### 👀 Visualization
-You can now:
-- Open `output.csv` in Excel or Google Sheets to view cleanly structured records
-- Inspect `output.json` to validate the flat key-value output programmatically
-
----
+--- 

delta_backend/README.md

@@ -11,6 +11,9 @@ boto3 = "~1.26.90"
 mypy-boto3-dynamodb = "^1.26.164"
 moto = "~4.2.11"
 
+[tool.poetry.group.dev.dependencies]
+coverage = "^7.8.0"
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

delta_backend/__init__.py

@@ -87,28 +87,45 @@ def convertData(self, expressionType, expressionRule, fieldName, fieldValue):
     def _convertToDate(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):
         if not fieldValue:
             return ""
+        
+        if not isinstance(fieldValue, str):
+            raise RecordError(
+                ExceptionMessages.RECORD_CHECK_FAILED,
+                f"{fieldName} rejected: not a string.",
+                f"Received: {type(fieldValue)}",
+        )
+        # Reject partial dates like "2024" or "2024-05"
         if re.match(r"^\d{4}(-\d{2})?$", fieldValue):
             raise RecordError(
                 ExceptionMessages.RECORD_CHECK_FAILED,
                 f"{fieldName} rejected: partial date not accepted.",
                 f"Invalid partial date: {fieldValue}",
             )
-        dt = datetime.fromisoformat(fieldValue)
-        format_str = expressionRule.replace("format:", "")
-        return dt.strftime(format_str)
+        try:
+            dt = datetime.fromisoformat(fieldValue)
+            format_str = expressionRule.replace("format:", "")
+            return dt.strftime(format_str)
+        except ValueError:
+            if report_unexpected_exception:
+                return f"Unexpected format: {fieldValue}"
 
     # Convert FHIR datetime into CSV-safe UTC format
     def _convertToDateTime(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):
         if not fieldValue:
             return ""
+ 
+        # Reject partial dates like "2024" or "2024-05"
         if re.match(r"^\d{4}(-\d{2})?$", fieldValue):
             raise RecordError(
                 ExceptionMessages.RECORD_CHECK_FAILED,
                 f"{fieldName} rejected: partial datetime not accepted.",
                 f"Invalid partial datetime: {fieldValue}",
             )
-
-        dt = datetime.fromisoformat(fieldValue)
+        try:
+            dt = datetime.fromisoformat(fieldValue)
+        except ValueError:
+            if report_unexpected_exception:
+                return f"Unexpected format: {fieldValue}"
 
         # Allow only +00:00 or +01:00 offsets (UTC and BST) and reject unsupported timezones
         offset = dt.utcoffset()
@@ -126,10 +143,12 @@ def _convertToDateTime(self, expressionRule, fieldName, fieldValue, summarise, r
         format_str = expressionRule.replace("format:", "")
 
         if format_str == "csv-utc":
-            formatted = dt_utc.strftime("%Y-%m-%dT%H:%M:%S %z")
-            return formatted
-
+            formatted = dt_utc.strftime("%Y%m%dT%H%M%S%z")
+            return formatted.replace("+0000", "00").replace("+0100", "01")
+        
         return dt_utc.strftime(format_str)
+        
+
 
     # Not Empty Validate
     def _convertToNotEmpty(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):

delta_backend/poetry.lock

@@ -41,7 +41,7 @@
       "expression": {
         "expressionName": "Date Convert",
         "expressionType": "DATECONVERT",
-        "expressionRule": "%Y-%m-%d"
+        "expressionRule": "%Y%m%d"
       }
     },
     {
@@ -221,7 +221,7 @@
       "expression": {
         "expressionName": "Date Convert",
         "expressionType": "DATECONVERT",
-        "expressionRule": "format:%Y-%m-%d"
+        "expressionRule": "format:%Y%m%d"
       }
     },
     {

delta_backend/pyproject.toml

@@ -1,7 +1,12 @@
-from Converter import Converter
+
 import json
 import csv
 import os
+import sys
+
+sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
+from Converter import Converter
+
 
 # Sample FHIR Immunization resource (minimal test data)
 fhir_sample = {
@@ -178,5 +183,5 @@
         writer.writeheader()
         writer.writerows(result)
 
-print("✅ CSV saved to:", csv_path)
-print("✅ JSON saved to:", json_path)
+print("CSV saved to:", csv_path)
+print("JSON saved to:", json_path)

delta_backend/src/ConversionChecker.py

@@ -31,7 +31,7 @@
 @mock_dynamodb
 @mock_sqs
 class TestConvertToFlatJson(unittest.TestCase):
-
+    maxDiff = None
     def setUp(self):
         """Set up mock DynamoDB table."""
         self.dynamodb_resource = boto3_resource("dynamodb", "eu-west-2")
@@ -327,16 +327,38 @@ def test_convert_to_date(self, MockLookUpData):
         checker = ConversionChecker(dataParser, summarise=False, report_unexpected_exception=True)
 
         valid_date = "2022-01-01"
-        result = checker._convertToDate("%Y-%m-%d", "fieldName", valid_date, False, True)
-        self.assertEqual(result, "2022-01-01")
-
+        result = checker._convertToDate("%Y%m%d", "fieldName", valid_date, False, True)
+        self.assertEqual(result, "20220101")
+        
         invalid_date = "invalid_date"
-        result = checker._convertToDate("%Y-%m-%d", "fieldName", invalid_date, False, True)
-        self.assertTrue("Unexpected exception" in result)
+        result = checker._convertToDate("format:%Y%m%d", "fieldName", invalid_date, False, True)
+        self.assertEqual(result, "Unexpected format: invalid_date")
 
         # Test for error case with exception
-        result = checker._convertToDate("%Y-%m-%d", "fieldName", None, False, True)
-        self.assertTrue("Unexpected exception" in result)
+        result = checker._convertToDate("%Y%m%d", "fieldName", None, False, True)
+        self.assertEqual(result, "")
+  
+    @patch("ConversionChecker.LookUpData")
+    def test_convert_to_date_time(self, MockLookUpData):
+        dataParser = Mock()
+
+        checker = ConversionChecker(dataParser, summarise=False, report_unexpected_exception=True)
+
+        valid_date_time = "2022-01-01T12:00:00+00:00"
+        result = checker._convertToDateTime("%Y%m%dT%H%M%S", "fieldName", valid_date_time, False, True)
+        self.assertEqual(result, "20220101T120000")
+
+        valid_csv_utc = "2022-01-01T13:28:17+00:00"
+        result = checker._convertToDateTime("format:csv-utc", "fieldName", valid_csv_utc, False, True)
+        self.assertEqual(result, "20220101T13281700")
+
+        invalid_date_time = "invalid_date_time"
+        result = checker._convertToDateTime("format:%Y%m%dT%H%M%S", "fieldName", invalid_date_time, False, True)
+        self.assertEqual(result, "Unexpected format: invalid_date_time")
+        
+        # Empty input returns blank
+        result = checker._convertToDateTime("format:%Y%m%dT%H%M%S", "fieldName", "", False, True)
+        self.assertEqual(result, "")
 
     def clear_table(self):
         scan = self.table.scan()