Skip to content

Commit e1ff871

Browse files
Akol125Akol125
committed
update unit test
1 parent 66edb2b commit e1ff871

File tree

5 files changed

+88
-32
lines changed

5 files changed

+88
-32
lines changed

‎delta_backend/src/ConversionChecker.py‎

Lines changed: 52 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def __init__(self, dataParser, summarise, report_unexpected_exception):
3939
self.dataLookUp = LookUpData() # used for generic look up
4040
self.summarise = summarise # instance attribute
4141
self.report_unexpected_exception = report_unexpected_exception # instance attribute
42+
self.errorRecords = [] # Store all errors here
4243

4344
# Main entry point called by converter.py
4445
def convertData(self, expressionType, expressionRule, fieldName, fieldValue):
@@ -55,6 +56,10 @@ def convertData(self, expressionType, expressionRule, fieldName, fieldValue):
5556
return self._convertToNotEmpty(
5657
expressionRule, fieldName, fieldValue, self.summarise, self.report_unexpected_exception
5758
)
59+
case "DOSESEQUENCE":
60+
return self._convertToDose(
61+
expressionRule, fieldName, fieldValue, self.summarise, self.report_unexpected_exception
62+
)
5863
case "GENDER":
5964
return self._convertToGender(
6065
expressionRule, fieldName, fieldValue, self.summarise, self.report_unexpected_exception
@@ -88,18 +93,10 @@ def _convertToDate(self, expressionRule, fieldName, fieldValue, summarise, repor
8893
return ""
8994

9095
if not isinstance(fieldValue, str):
91-
raise RecordError(
92-
ExceptionMessages.RECORD_CHECK_FAILED,
93-
f"{fieldName} rejected: not a string.",
94-
f"Received: {type(fieldValue)}",
95-
)
96+
return ""
9697
# Reject partial dates like "2024" or "2024-05"
9798
if re.match(r"^\d{4}(-\d{2})?$", fieldValue):
98-
raise RecordError(
99-
ExceptionMessages.RECORD_CHECK_FAILED,
100-
f"{fieldName} rejected: partial date not accepted.",
101-
f"Invalid partial date: {fieldValue}",
102-
)
99+
return ""
103100
try:
104101
dt = datetime.fromisoformat(fieldValue)
105102
format_str = expressionRule.replace("format:", "")
@@ -161,30 +158,56 @@ def _convertToNotEmpty(self, expressionRule, fieldName, fieldValue, summarise, r
161158

162159
# NHSNumber Validate
163160
def _convertToNHSNumber(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):
161+
"""
162+
Validates that the NHS Number is exactly 10 digits.
163+
"""
164+
# If it is outright empty, return back an empty string
165+
if not fieldValue:
166+
return ""
167+
164168
try:
165-
regexRule = "^6[0-9]{10}$"
166-
result = re.search(regexRule, fieldValue)
167-
if not result:
168-
raise RecordError(
169-
ExceptionMessages.RECORD_CHECK_FAILED,
170-
"NHS Number check failed",
171-
"NHS Number does not meet regex rules, data- " + fieldValue,
172-
)
169+
regexRule = r"^\d{10}$"
170+
if isinstance(fieldValue, str) and re.fullmatch(regexRule, fieldValue):
171+
return fieldValue
172+
raise ValueError(f"NHS Number must be exactly 10 digits: {fieldValue}")
173173
except Exception as e:
174174
if report_unexpected_exception:
175175
message = ExceptionMessages.MESSAGES[ExceptionMessages.UNEXPECTED_EXCEPTION] % (e.__class__.__name__, e)
176-
return message
176+
self.errorRecords.append({
177+
"field": fieldName,
178+
"value": fieldValue,
179+
"message": message
180+
})
181+
return ""
177182

178183
# Gender Validate
179184
def _convertToGender(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):
185+
"""
186+
Converts gender string to numeric representation.
187+
Mapping:
188+
- "male" → "1"
189+
- "female" → "2"
190+
- "other" → "9"
191+
- "unknown" → "0"
192+
"""
180193
try:
181-
genderlist = {"male": "1", "female": "2", "other": "9", "unknown": "0"}
182-
genderNumber = genderlist[fieldValue]
183-
return genderNumber
194+
gender_map = {
195+
"male": "1",
196+
"female": "2",
197+
"other": "9",
198+
"unknown": "0"
199+
}
200+
201+
# Normalize input
202+
normalized_gender = str(fieldValue).lower()
203+
204+
if normalized_gender not in gender_map:
205+
return ""
206+
return gender_map[normalized_gender]
207+
184208
except Exception as e:
185209
if report_unexpected_exception:
186-
message = ExceptionMessages.MESSAGES[ExceptionMessages.UNEXPECTED_EXCEPTION] % (e.__class__.__name__, e)
187-
return message
210+
return f"Unexpected exception [{e.__class__.__name__}]: {str(e)}"
188211

189212
# Code for converting Action Flag
190213
def _convertToChangeTo(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):
@@ -194,6 +217,11 @@ def _convertToChangeTo(self, expressionRule, fieldName, fieldValue, summarise, r
194217
if report_unexpected_exception:
195218
message = ExceptionMessages.MESSAGES[ExceptionMessages.UNEXPECTED_EXCEPTION] % (e.__class__.__name__, e)
196219
return message
220+
# Code for converting Dose Sequence
221+
def _convertToDose(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):
222+
if isinstance(fieldValue, (int, float)) and 1 <= fieldValue <= 9:
223+
return fieldValue
224+
return ""
197225

198226
# Change to Lookup
199227
def _convertToLookUp(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):

‎delta_backend/src/ConversionLayout.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"fieldNameFHIR": "contained|#:Patient|identifier|#:https://fhir.nhs.uk/Id/nhs-number|value",
1313
"fieldNameFlat": "NHS_NUMBER",
1414
"expression": {
15-
"expressionName": "Not Empty",
16-
"expressionType": "NOTEMPTY",
15+
"expressionName": "NHS NUMBER",
16+
"expressionType": "NHSNUMBER",
1717
"expressionRule": ""
1818
}
1919
},
@@ -175,7 +175,7 @@
175175
"fieldNameFlat": "DOSE_SEQUENCE",
176176
"expression": {
177177
"expressionName": "Not Empty",
178-
"expressionType": "NOTEMPTY",
178+
"expressionType": "DOSESEQUENCE",
179179
"expressionRule": ""
180180
}
181181
},

‎delta_backend/tests/check_conversion.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# Sample FHIR Immunization resource (minimal test data)
1010
fhir_sample = os.path.join(os.path.dirname(__file__),"sample_data", "fhir_sample.json")
1111

12+
1213
with open(fhir_sample, "r", encoding="utf-8") as f:
1314
json_data = json.load(f)
1415

‎delta_backend/tests/sample_data/fhir_sample.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
]
151151
}
152152
],
153-
"doseNumberPositiveInt": 1
153+
"doseNumberPositiveInt": 2
154154
}
155155
]
156156
}

‎delta_backend/tests/test_convert_to_flat_json.py‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,21 @@ def test_convert_to_nhs_number(self, MockLookUpData):
312312
dataParser = Mock()
313313

314314
checker = ConversionChecker(dataParser, summarise=False, report_unexpected_exception=True)
315+
316+
# Test empty NHS number
317+
empty_nhs_number = ""
318+
result = checker._convertToNHSNumber(None, "fieldName", empty_nhs_number, False, True)
319+
self.assertEqual(result, "", "Expected empty string for empty NHS number input")
315320

321+
# Test valid NHS number
316322
valid_nhs_number = "6000000000"
317-
result = checker._convertToNHSNumber(None, "fieldName", valid_nhs_number, False, True)
318-
self.assertTrue("NHS Number does not meet regex " in result)
323+
result = checker._convertToNHSNumber("NHSNUMBER", "fieldName", valid_nhs_number, False, True)
324+
self.assertEqual(result, "6000000000", "Valid NHS number should be returned as-is")
319325

320-
invalid_nhs_number = "1234567890"
321-
result = checker._convertToNHSNumber(None, "fieldName", invalid_nhs_number, False, True)
326+
# Test invalid NHS number
327+
invalid_nhs_number = "1234567890243"
328+
result = checker._convertToNHSNumber("NHSNUMBER","fieldName", invalid_nhs_number, False, True)
329+
self.assertEqual(result, "", "Invalid NHS number should return empty string")
322330

323331
@patch("ConversionChecker.LookUpData")
324332
def test_convert_to_date(self, MockLookUpData):
@@ -360,6 +368,25 @@ def test_convert_to_date_time(self, MockLookUpData):
360368
result = checker._convertToDateTime("format:%Y%m%dT%H%M%S", "fieldName", "", False, True)
361369
self.assertEqual(result, "")
362370

371+
#check for dose sequence
372+
@patch("ConversionChecker.LookUpData")
373+
def test_convert_to_dose(self, MockLookUpData):
374+
dataParser = Mock()
375+
376+
checker = ConversionChecker(dataParser, summarise=False, report_unexpected_exception=True)
377+
# Valid dose
378+
for dose in [1, 4, 9]:
379+
with self.subTest(dose=dose):
380+
result = checker._convertToDose("DOSESEQUENCE", "DOSE_AMOUNT", dose, False, True)
381+
self.assertEqual(result, dose)
382+
383+
# Invalid dose
384+
invalid_doses = [10, 10.1, 100, 9.0001]
385+
for dose in invalid_doses:
386+
with self.subTest(dose=dose):
387+
result = checker._convertToDose("DOSESEQUENCE", "DOSE_AMOUNT", dose, False, True)
388+
self.assertEqual(result, "", f"Expected empty string for invalid dose {dose}")
389+
363390
def clear_table(self):
364391
scan = self.table.scan()
365392
with self.table.batch_writer() as batch:

0 commit comments

Comments
 (0)