more work on sonar issues

Author: Akol125

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

@@ -586,7 +586,7 @@ def _validate_positive(self, _expression_rule, field_name, field_value, row) ->
     # NHSNumber Validate
     def _validate_nhs_number(self, _expression_rule, field_name, field_value, row) -> ErrorReport:
         try:
-            regex_rule = "^6[0-9]{10}$"
+            regex_rule = r"^6\d{10}$"
             result = re.search(regex_rule, field_value)
             if not result:
                 raise RecordError(

lambdas/shared/src/common/validator/reporter/dq_reporter.py

@@ -40,8 +40,8 @@ def generate_error_report(self, event_id, occurrence, error_records: list[ErrorR
         self.error_report["eventId"] = event_id
         self.error_report["results"]["timeliness_processed"] = time_taken
 
-        for errorRecord in error_records:
-            self.update_report(errorRecord)
+        for error_record in error_records:
+            self.update_report(error_record)
 
         json_error_report = json.dumps(self.error_report)
         return json_error_report

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

@@ -81,7 +81,7 @@ def _validate_expression(
         if inc_header_in_row_count:
             row = 2
 
-        if self.isCSV:
+        if self.is_csv:
             expression_fieldname = expression["fieldNameCSV"]
         else:
             expression_fieldname = expression["fieldNameFHIR"]
@@ -171,24 +171,24 @@ def run_validation(
             match self.data_type:  # 'FHIR', 'FHIRJSON', 'CSV', 'CSVROW'
                 case DataType.FHIR:
                     self.data_parser = self._get_fhir_parser(self.filepath)
-                    self.isCSV = False
+                    self.is_csv = False
                 case DataType.FHIRJSON:
                     self.data_parser = self._get_fhir_json_parser(self.json_data)
-                    self.isCSV = False
+                    self.is_csv = False
                 case DataType.CSV:
                     self.data_parser = self._get_csv_parser(self.filepath)
-                    self.isCSV = True
+                    self.is_csv = True
                 case DataType.CSVROW:
                     self.data_parser = self._get_csv_line_parser(self.csv_row, self.csv_header)
-                    self.isCSV = True
+                    self.is_csv = True
 
         except Exception as e:
             if report_unexpected_exception:
                 message = f"Data Parser Unexpected exception [{e.__class__.__name__}]: {e}"
                 return [ErrorReport(code=0, message=message)]
 
         try:
-            schemaParser = self._get_schema_parser(self.schema_file)
+            schema_parser = self._get_schema_parser(self.schema_file)
         except Exception as e:
             if report_unexpected_exception:
                 message = f"Schema Parser Unexpected exception [{e.__class__.__name__}]: {e}"
@@ -203,7 +203,7 @@ def run_validation(
 
         # get list of expressions
         try:
-            expressions = schemaParser.get_expressions()
+            expressions = schema_parser.get_expressions()
         except Exception as e:
             if report_unexpected_exception:
                 message = f"Expression Getter Unexpected exception [{e.__class__.__name__}]: {e}"
@@ -217,10 +217,10 @@ def run_validation(
     # -------------------------------------------------------------------------
     # Report Generation
     # Build the error Report
-    def build_error_report(self, eventId):
-        OccurrenceDateTime = self.data_parser.get_key_single_value("occurrenceDateTime")
+    def build_error_report(self, event_id):
+        occurrence_date_time = self.data_parser.get_key_single_value("occurrenceDateTime")
         dq_reporter = DQReporter()
-        dq_report = dq_reporter.generate_error_report(eventId, OccurrenceDateTime, self.error_records)
+        dq_report = dq_reporter.generate_error_report(event_id, occurrence_date_time, self.error_records)
 
         return dq_report