Skip to content

Commit 78e8e9d

Browse files
authored
Revert "Amb 2144 mesh integration"
1 parent e0b79b8 commit 78e8e9d

File tree

17 files changed

+4
-499
lines changed

17 files changed

+4
-499
lines changed

.github/workflows/sonarcloud.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,6 @@ jobs:
7878
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
7979
poetry run coverage run --source=backend -m unittest discover -s backend || echo "fhir-api tests failed" >> failed_tests.txt
8080
poetry run coverage xml -o sonarcloud-coverage.xml
81-
82-
- name: Run unittest with coverage-mesh-processor
83-
id: meshprocessor
84-
continue-on-error: true
85-
run: |
86-
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
87-
poetry run coverage run --source=meshfileprocessor -m unittest discover -s meshfileprocessor || echo "meshfileprocessor tests failed" >> failed_tests.txt
88-
poetry run coverage xml -o sonarcloud-meshfileprocessor-coverage.xml
8981
9082
- name: Run Test Failure Summary
9183
id: check_failure

filenameprocessor/src/file_key_validation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def validate_file_key(file_key: str) -> tuple[str, str]:
5454
and version in Constants.VALID_VERSIONS
5555
and supplier # Note that if supplier could be identified, this also implies that ODS code is valid
5656
and is_valid_datetime(timestamp)
57-
and ((extension == "CSV") or (extension == "DAT")) # The DAT extension has been added for MESH file processing
57+
and extension == "CSV"
5858
):
5959
raise InvalidFileKeyError("Initial file validation failed: invalid file key")
6060

filenameprocessor/tests/test_file_key_validation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def test_validate_file_key(self):
9393
# File key with missing timestamp
9494
(VALID_FLU_EMIS_FILE_KEY.replace("20000101T00000001", ""), invalid_file_key_error_message),
9595
# File key with incorrect extension
96-
(VALID_FLU_EMIS_FILE_KEY.replace(".csv", ".xlsx"), invalid_file_key_error_message),
96+
(VALID_FLU_EMIS_FILE_KEY.replace(".csv", ".dat"), invalid_file_key_error_message),
9797
]
9898

9999
for file_key, expected_result in test_cases_for_failure_scenarios:

mesh-infra/main.tf

Lines changed: 0 additions & 41 deletions
This file was deleted.

meshfileprocessor/Dockerfile

Lines changed: 0 additions & 27 deletions
This file was deleted.

meshfileprocessor/Makefile

Lines changed: 0 additions & 19 deletions
This file was deleted.

meshfileprocessor/README.md

Whitespace-only changes.

meshfileprocessor/pyproject.toml

Lines changed: 0 additions & 31 deletions
This file was deleted.

meshfileprocessor/src/__init__.py

Whitespace-only changes.

meshfileprocessor/src/converter.py

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)