Skip to content

Commit 1bc8edc

Browse files
Akol125Akol125
committed
resolve code smell
1 parent 81ac131 commit 1bc8edc

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

‎lambdas/shared/src/common/validator/expression_checker.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def _validate_integer(self, expression_rule, field_name, field_value, row) -> Er
174174
raise RecordError(
175175
ExceptionMessages.RECORD_CHECK_FAILED,
176176
"Value integer check failed",
177-
"Value does not equal expected value, "
177+
MessageLabel.VALUE_MISMATCH_MSG
178178
+ MessageLabel.EXPECTED_LABEL
179179
+ expression_rule
180180
+ " "
@@ -271,7 +271,7 @@ def _validate_equal(self, expression_rule, field_name, field_value, row) -> Erro
271271
raise RecordError(
272272
ExceptionMessages.RECORD_CHECK_FAILED,
273273
"Value equals check failed",
274-
"Value does not equal expected value, "
274+
MessageLabel.VALUE_MISMATCH_MSG
275275
+ MessageLabel.EXPECTED_LABEL
276276
+ expression_rule
277277
+ " "
@@ -586,8 +586,8 @@ def _validate_positive(self, _expression_rule, field_name, field_value, row) ->
586586
# NHSNumber Validate
587587
def _validate_nhs_number(self, _expression_rule, field_name, field_value, row) -> ErrorReport:
588588
try:
589-
regexRule = "^6[0-9]{10}$"
590-
result = re.search(regexRule, field_value)
589+
regex_rule = "^6[0-9]{10}$"
590+
result = re.search(regex_rule, field_value)
591591
if not result:
592592
raise RecordError(
593593
ExceptionMessages.RECORD_CHECK_FAILED,
@@ -612,9 +612,9 @@ def _validate_nhs_number(self, _expression_rule, field_name, field_value, row) -
612612
# Gender Validate
613613
def _validate_gender(self, _expression_rule, field_name, field_value, row) -> ErrorReport:
614614
try:
615-
ruleList = ["0", "1", "2", "9"]
615+
rule_list = ["0", "1", "2", "9"]
616616

617-
if field_value not in ruleList:
617+
if field_value not in rule_list:
618618
raise RecordError(
619619
ExceptionMessages.RECORD_CHECK_FAILED,
620620
"Gender check failed",
@@ -639,8 +639,8 @@ def _validate_gender(self, _expression_rule, field_name, field_value, row) -> Er
639639
def _validate_post_code(self, _expression_rule, field_name, field_value, row) -> ErrorReport:
640640
try:
641641
# UK postcode regex (allows optional space)
642-
regexRule = r"^(GIR\s?0AA|(?:(?:[A-PR-UWYZ][0-9]{1,2})|(?:[A-PR-UWYZ][A-HK-Y][0-9]{1,2})|(?:[A-PR-UWYZ][0-9][A-HJKS-UW])|(?:[A-PR-UWYZ][A-HK-Y][0-9][ABEHMNPRV-Y]))\s?[0-9][ABD-HJLNP-UW-Z]{2})$"
643-
result = re.search(regexRule, field_value)
642+
regex_rule = r"^[A-Z]{1,2}\d[A-Z\d]?\s?\d[A-Z]{2}$"
643+
result = re.search(regex_rule, field_value)
644644
if not result:
645645
raise RecordError(
646646
ExceptionMessages.RECORD_CHECK_FAILED, "Postcode check failed", "Postcode does not meet regex rules"
@@ -661,10 +661,10 @@ def _validate_post_code(self, _expression_rule, field_name, field_value, row) ->
661661
return ErrorReport(ExceptionMessages.UNEXPECTED_EXCEPTION, message, row, field_name, "", self.summarise)
662662

663663
# Max Objects Validate
664-
def _validate_max_objects(self, expressionRule, field_name, field_value, row) -> ErrorReport:
664+
def _validate_max_objects(self, expression_rule, field_name, field_value, row) -> ErrorReport:
665665
try:
666666
value = len(field_value)
667-
if value > int(expressionRule):
667+
if value > int(expression_rule):
668668
raise RecordError(
669669
ExceptionMessages.RECORD_CHECK_FAILED,
670670
"Max Objects failure",
@@ -686,14 +686,14 @@ def _validate_max_objects(self, expressionRule, field_name, field_value, row) ->
686686
return ErrorReport(ExceptionMessages.UNEXPECTED_EXCEPTION, message, row, field_name, "", self.summarise)
687687

688688
# Default to Validate
689-
def _validate_only_if(self, expressionRule, field_name, field_value, row) -> ErrorReport:
689+
def _validate_only_if(self, expression_rule, field_name, _field_value, row) -> ErrorReport:
690690
try:
691-
conversionList = expressionRule.split("|")
692-
location = conversionList[0]
693-
valueCheck = conversionList[1]
694-
dataValue = self.data_parser.get_key_value(location)
691+
conversion_list = expression_rule.split("|")
692+
location = conversion_list[0]
693+
value_check = conversion_list[1]
694+
data_value = self.data_parser.get_key_value(location)
695695

696-
if dataValue[0] != valueCheck:
696+
if data_value[0] != value_check:
697697
raise RecordError(
698698
ExceptionMessages.RECORD_CHECK_FAILED,
699699
"Validate Only If failure",
@@ -745,9 +745,9 @@ def _validate_against_lookup(self, _expression_rule, field_name, field_value, ro
745745
return ErrorReport(ExceptionMessages.UNEXPECTED_EXCEPTION, message, row, field_name, "", self.summarise)
746746

747747
# Check with Key Lookup
748-
def _validate_against_key(self, expressionRule, field_name, field_value, row) -> ErrorReport:
748+
def _validate_against_key(self, expression_rule, field_name, field_value, row) -> ErrorReport:
749749
try:
750-
result = self.key_data.findKey(expressionRule, field_value)
750+
result = self.key_data.find_key(expression_rule, field_value)
751751
if not result:
752752
raise RecordError(
753753
ExceptionMessages.KEY_CHECK_FAILED,

‎lambdas/shared/src/common/validator/lookup_expressions/key_data.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def __init__(self):
121121
"16857009",
122122
]
123123

124-
def findKey(self, key_source: str, field_value: str) -> bool:
124+
def find_key(self, key_source: str, field_value: str) -> bool:
125125
try:
126126
match key_source:
127127
case "Procedure":

‎lambdas/shared/tests/test_common/validator/test_key_data.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,37 @@ def setUp(self):
88
self.kd = KeyData()
99

1010
def test_site_valid_code(self):
11-
self.assertTrue(self.kd.findKey("Site", "368208006"))
11+
self.assertTrue(self.kd.find_key("Site", "368208006"))
1212

1313
def test_site_invalid_code(self):
14-
self.assertFalse(self.kd.findKey("Site", "not_a_code"))
14+
self.assertFalse(self.kd.find_key("Site", "not_a_code"))
1515

1616
def test_route_valid_code(self):
1717
# pick one known code from route list
18-
self.assertTrue(self.kd.findKey("Route", "54471007"))
18+
self.assertTrue(self.kd.find_key("Route", "54471007"))
1919

2020
def test_route_invalid_code(self):
21-
self.assertFalse(self.kd.findKey("Route", "000000"))
21+
self.assertFalse(self.kd.find_key("Route", "000000"))
2222

2323
def test_procedure_valid_code(self):
24-
self.assertTrue(self.kd.findKey("Procedure", "956951000000104"))
24+
self.assertTrue(self.kd.find_key("Procedure", "956951000000104"))
2525

2626
def test_procedure_invalid_code(self):
27-
self.assertFalse(self.kd.findKey("Procedure", "956951000000105"))
27+
self.assertFalse(self.kd.find_key("Procedure", "956951000000105"))
2828

2929
def test_organisation_valid_code(self):
30-
self.assertTrue(self.kd.findKey("Organisation", "RJ1"))
30+
self.assertTrue(self.kd.find_key("Organisation", "RJ1"))
3131

3232
def test_organisation_invalid_code(self):
33-
self.assertFalse(self.kd.findKey("Organisation", "RJX"))
33+
self.assertFalse(self.kd.find_key("Organisation", "RJX"))
3434

3535
def test_unknown_key_source_returns_false(self):
36-
self.assertFalse(self.kd.findKey("Unknown", "anything"))
36+
self.assertFalse(self.kd.find_key("Unknown", "anything"))
3737

3838
def test_non_string_inputs_are_handled(self):
3939
# ensure method is resilient and returns False for non-string without raising
40-
self.assertFalse(self.kd.findKey("Site", None))
41-
self.assertFalse(self.kd.findKey("Route", 12345))
40+
self.assertFalse(self.kd.find_key("Site", None))
41+
self.assertFalse(self.kd.find_key("Route", 12345))
4242

4343

4444
if __name__ == "__main__":

0 commit comments

Comments
 (0)