@@ -27,9 +27,19 @@ class FileDetails:
2727 vaccine type.
2828 """
2929
30- def __init__ (self , supplier : str , vaccine_type : str , ods_code : str , file_number : int = 1 ):
30+ def __init__ (
31+ self ,
32+ supplier : str ,
33+ vaccine_type : str ,
34+ spec_version : str = None ,
35+ organization_code : str = None ,
36+ ods_code : str = None ,
37+ file_number : int = 1 ,
38+ ):
3139 self .vaccine_type = vaccine_type .upper ()
3240 self .ods_code = ods_code .upper ()
41+ self .spec_version = spec_version
42+ self .orgnization_code = organization_code
3343 self .supplier = supplier .upper ()
3444 self .queue_name = f"{ self .supplier } _{ self .vaccine_type } "
3545
@@ -39,7 +49,14 @@ def __init__(self, supplier: str, vaccine_type: str, ods_code: str, file_number:
3949 self .name = f"{ self .vaccine_type } / { self .supplier } file"
4050
4151 file_date_and_time_string = f"20000101T0000000{ file_number } "
42- self .file_key = f"{ vaccine_type } _Vaccinations_v5_{ ods_code } _{ file_date_and_time_string } .csv"
52+ extended_attributes_prefix = "Vaccination_Extended_Attributes"
53+ 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"
55+ else :
56+ file_key = f"{ vaccine_type } _Vaccinations_v5_{ ods_code } _{ file_date_and_time_string } .csv"
57+
58+ self .file_key = file_key
59+
4360 self .ack_file_key = f"ack/{ self .file_key [:- 4 ]} _InfAck_{ self .created_at_formatted_string } .csv"
4461
4562 self .permissions_list = [f"{ self .vaccine_type } _FULL" ]
0 commit comments