fixed sonar cloud issue

Author: amitkr-22

.github/workflows/sonarcloud.yml

@@ -78,6 +78,14 @@ jobs:
           pip install poetry==1.8.4 moto==4.2.11 coverage redis botocore==1.35.49 simplejson responses structlog fhir.resources jsonpath_ng pydantic==1.10.13 requests aws-lambda-typing cffi pyjwt boto3-stubs-lite[dynamodb]~=1.26.90 python-stdnum==1.20
           poetry run coverage run --source=backend -m unittest discover -s backend || echo "fhir-api tests failed" >> failed_tests.txt
           poetry run coverage xml -o sonarcloud-coverage.xml
+      
+      - name: Run unittest with coverage-mesh-processor
+        id: meshprocessor
+        continue-on-error: true
+        run: |
+          pip install poetry==1.8.4 moto==4.2.11 coverage redis botocore==1.35.49 simplejson responses structlog fhir.resources jsonpath_ng pydantic==1.10.13 requests aws-lambda-typing cffi pyjwt boto3-stubs-lite[dynamodb]~=1.26.90 python-stdnum==1.20
+          poetry run coverage run --source=meshfileprocessor -m unittest discover -s meshfileprocessor || echo "meshfileprocessor tests failed" >> failed_tests.txt
+          poetry run coverage xml -o sonarcloud-meshfileprocessor-coverage.xml
 
       - name: Run Test Failure Summary
         id: check_failure

meshfileprocessor/tests/test_converter.py

@@ -1,6 +1,5 @@
 from unittest import TestCase
 from unittest.mock import patch, MagicMock
-import os
 from src.converter import lambda_handler, ensure_dat_extension
 
 

recordprocessor/src/utils_for_recordprocessor.py

@@ -22,7 +22,7 @@ def get_csv_content_dict_reader(file_key: str) -> DictReader:
     csv_data = response["Body"].read().decode("utf-8")
 
     # Verify and process the DAT file content coming from MESH
-    if '.dat' in file_key:
+    if ".dat" in file_key:
         csv_data = extract_content(csv_data)
     return DictReader(StringIO(csv_data), delimiter="|"), csv_data
 
@@ -50,16 +50,16 @@ def invoke_filename_lambda(file_key: str, message_id: str) -> None:
 
 def extract_content(dat_file_content):
 
-    boundary_pattern = re.compile(r'----------------------------\d+')
+    boundary_pattern = re.compile(r"----------------------------\d+")
 
     parts = boundary_pattern.split(dat_file_content)
 
     # Extract the content between the boundaries
     filecontent = None
     for part in parts:
-        if 'Content-Disposition' in part and 'Content-Type' in part:
+        if "Content-Disposition" in part and "Content-Type" in part:
 
-            content_start = part.index('Content-Type') + len('Content-Type: text/csv') + 2
+            content_start = part.index("Content-Type") + len("Content-Type: text/csv") + 2
             filecontent = part[content_start:].strip()
             break
 

recordprocessor/tests/test_utils_for_recordprocessor.py

@@ -15,7 +15,12 @@
 from tests.utils_for_recordprocessor_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames
 
 with patch("os.environ", MOCK_ENVIRONMENT_DICT):
-    from utils_for_recordprocessor import get_environment, get_csv_content_dict_reader, create_diagnostics_dictionary, extract_content
+    from utils_for_recordprocessor import (
+        get_environment,
+        get_csv_content_dict_reader,
+        create_diagnostics_dictionary,
+        extract_content,
+    )
     from file_level_validation import move_file
 
 s3_client = boto3.client("s3", region_name=REGION_NAME)
@@ -79,10 +84,11 @@ def test_create_diagnostics_dictionary(self):
     def test_extract_content_valid_input(self):
         dat_file_content = (
             "----------------------------1234567890\n"
-            "Content-Disposition: form-data; name=\"file\"; filename=\"COVID19_Vaccinations_v5_YGM41_20250312T113455981.csv\"\n"
+            'Content-Disposition: form-data; name="file"; filename="COVID19_Vaccinations_v5_YGM41_20250312T113455981.csv"\n'
             "Content-Type: text/csv\n\n"
             "NHS_NUMBER|PERSON_FORENAME|PERSON_SURNAME|PERSON_DOB|PERSON_GENDER_CODE|PERSON_POSTCODE\n"
-            "----------------------------1234567890\n")
+            "----------------------------1234567890\n"
+        )
         expected_content = "NHS_NUMBER|PERSON_FORENAME|PERSON_SURNAME|PERSON_DOB|PERSON_GENDER_CODE|PERSON_POSTCODE"
         result = extract_content(dat_file_content)
         self.assertEqual(result, expected_content)

sonar-project.properties

@@ -4,7 +4,7 @@ sonar.organization=nhsdigital
 sonar.host.url=https://sonarcloud.io
 sonar.python.version=3.11
 sonar.exclusions=**/e2e/**,**/e2e_batch/**,**/temporary_sandbox/**,**/devtools/**,**/proxies/**,**/scripts/**,**/terraform/**,**/tests/**
-sonar.python.coverage.reportPaths=sonarcloud-coverage.xml,sonarcloud-coverage-delta.xml,sonarcloud-coverage-ack-lambda.xml,sonarcloud-coverage-filenameprocessor-coverage.xml,sonarcloud-coverage-recordforwarder-coverage.xml,sonarcloud-coverage-recordprocessor-coverage.xml
+sonar.python.coverage.reportPaths=sonarcloud-coverage.xml,sonarcloud-coverage-delta.xml,sonarcloud-coverage-ack-lambda.xml,sonarcloud-coverage-filenameprocessor-coverage.xml,sonarcloud-coverage-recordforwarder-coverage.xml,sonarcloud-coverage-recordprocessor-coverage.xml,sonarcloud-meshfileprocessor-coverage.xml
 sonar.issue.ignore.multicriteria=exclude_snomed_urls,exclude_hl7_urls
 sonar.issue.ignore.multicriteria.exclude_snomed_urls.ruleKey=python:S5332
 sonar.issue.ignore.multicriteria.exclude_snomed_urls.resourceKey=**http://snomed\.info/sct**