Skip to content

Commit b8ca69c

Browse files
committed
test extended attributes
1 parent b5bcbed commit b8ca69c

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

lambdas/filenameprocessor/tests/test_lambda_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def test_lambda_handler_new_file_success_and_first_in_queue(self, mock_get_redis
195195
mock_redis.hkeys = Mock(return_value=all_vaccine_types_in_this_test_file)
196196
mock_get_redis_client.return_value = mock_redis
197197

198-
test_cases = [MockFileDetails.emis_flu, MockFileDetails.ravs_rsv_1]
198+
test_cases = [MockFileDetails.emis_flu, MockFileDetails.ravs_rsv_1, MockFileDetails.extended_attributes_file]
199199
for file_details in test_cases:
200200
with self.subTest(file_details.name):
201201
# Set up the file in the source bucket

lambdas/filenameprocessor/tests/utils_for_tests/values_for_tests.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,16 @@ class FileDetails:
2929

3030
def __init__(
3131
self,
32-
supplier: str,
33-
vaccine_type: str,
34-
spec_version: str = None,
35-
organization_code: str = None,
32+
supplier: str = None,
33+
vaccine_type: str = None,
3634
ods_code: str = None,
3735
file_number: int = 1,
36+
organization_code: str = None,
3837
):
39-
self.vaccine_type = vaccine_type.upper()
40-
self.ods_code = ods_code.upper()
41-
self.spec_version = spec_version
42-
self.orgnization_code = organization_code
43-
self.supplier = supplier.upper()
38+
self.vaccine_type = vaccine_type.upper() if vaccine_type else None
39+
self.ods_code = ods_code.upper() if ods_code else "X8E5B"
40+
self.organization_code = organization_code
41+
self.supplier = supplier.upper() if supplier else None
4442
self.queue_name = f"{self.supplier}_{self.vaccine_type}"
4543

4644
self.created_at_formatted_string = f"200{file_number}0101T00000000"
@@ -51,7 +49,7 @@ def __init__(
5149
file_date_and_time_string = f"20000101T0000000{file_number}"
5250
extended_attributes_prefix = "Vaccination_Extended_Attributes"
5351
if self.vaccine_type.startswith(extended_attributes_prefix):
54-
file_key = f"{extended_attributes_prefix}_{self.spec_version}_{self.organization_code}_{file_date_and_time_string}.csv"
52+
file_key = f"{extended_attributes_prefix}_v1_5_{organization_code}_{file_date_and_time_string}.csv"
5553
else:
5654
file_key = f"{vaccine_type}_Vaccinations_v5_{ods_code}_{file_date_and_time_string}.csv"
5755

@@ -95,6 +93,9 @@ class MockFileDetails:
9593
emis_flu = FileDetails("EMIS", "FLU", "YGM41")
9694
emis_rsv = FileDetails("EMIS", "RSV", "YGM41")
9795
ravs_flu = FileDetails("RAVS", "FLU", "X8E5B")
96+
extended_attributes_file = FileDetails(
97+
vaccine_type="Vaccination_Extended_Attributes", file_number=1, organization_code="RJ123"
98+
)
9899

99100

100101
MOCK_FILE_HEADERS = (

0 commit comments

Comments
 (0)