Merge pull request #377 from NHSDigital/revert-365-AMB-2144-mesh-integration

Revert "Amb 2144 mesh integration"

Author: Valswyn-NHS

.github/workflows/sonarcloud.yml

@@ -78,14 +78,6 @@ 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

filenameprocessor/src/file_key_validation.py

@@ -54,7 +54,7 @@ def validate_file_key(file_key: str) -> tuple[str, str]:
         and version in Constants.VALID_VERSIONS
         and supplier  # Note that if supplier could be identified, this also implies that ODS code is valid
         and is_valid_datetime(timestamp)
-        and ((extension == "CSV") or (extension == "DAT"))  # The DAT extension has been added for MESH file processing
+        and extension == "CSV"
     ):
         raise InvalidFileKeyError("Initial file validation failed: invalid file key")
 

filenameprocessor/tests/test_file_key_validation.py

@@ -93,7 +93,7 @@ def test_validate_file_key(self):
             # File key with missing timestamp
             (VALID_FLU_EMIS_FILE_KEY.replace("20000101T00000001", ""), invalid_file_key_error_message),
             # File key with incorrect extension
-            (VALID_FLU_EMIS_FILE_KEY.replace(".csv", ".xlsx"), invalid_file_key_error_message),
+            (VALID_FLU_EMIS_FILE_KEY.replace(".csv", ".dat"), invalid_file_key_error_message),
         ]
 
         for file_key, expected_result in test_cases_for_failure_scenarios: