Updates

Author: Kolea Plesco

ted_sws/notice_packager/entrypoints/cli/cmd_bulk_packager.py

@@ -25,7 +25,8 @@
     XMLManifestationMetadataExtractor
 from ted_sws.notice_packager import DEFAULT_NOTICE_PACKAGE_EXTENSION
 from ted_sws.notice_packager.services.metadata_transformer import MetadataTransformer
-from ted_sws.notice_packager.services.notice_packager import create_notice_package, package_notice_and_save_to
+from ted_sws.notice_packager.services.notice_packager import create_notice_package, package_notice_and_save_to, \
+    ARCHIVE_NAME_FORMAT
 
 CMD_NAME = "CMD_BULK_PACKAGER"
 DEFAULT_FILES_COUNT: int = 3000
@@ -62,7 +63,7 @@ def run_cmd(self):
             self.output_path.mkdir(parents=True, exist_ok=True)
             if self.notices:
                 for notice in self.notices:
-                    output_file = self.output_path / (notice.ted_id + DEFAULT_NOTICE_PACKAGE_EXTENSION)
+                    output_file = self.output_path / ARCHIVE_NAME_FORMAT.format(publication_work_identifier())
                     self.log("Saving package to " + str(output_file))
                     package_notice_and_save_to(notice=notice,
                                                save_to=output_file)

ted_sws/notice_packager/services/notice_packager.py

@@ -29,9 +29,9 @@
 from ted_sws.notice_packager.services.metadata_transformer import MetadataTransformer
 from ted_sws.notice_packager import DEFAULT_NOTICE_PACKAGE_EXTENSION
 
-ARCHIVE_NAME_FORMAT = "eProcurement_notice_{notice_id}" + DEFAULT_NOTICE_PACKAGE_EXTENSION
+ARCHIVE_NAME_FORMAT = "{work_identifier}_{action}" + DEFAULT_NOTICE_PACKAGE_EXTENSION
 FILE_METS_XML_FORMAT = "{notice_id}-0.mets.xml.dmd.rdf"
-FILE_METS_ACTION_FORMAT = "{notice_id}_mets2{action}.mets.xml"
+FILE_METS_ACTION_FORMAT = "{work_identifier}_{action}.mets.xml"
 FILE_TMD_FORMAT = "techMDID001.tmd.rdf"
 FILE_RDF_FORMAT = "{notice_id}.rdf"
 
@@ -79,7 +79,7 @@ def package_notice(notice: Notice) -> Notice:
     return notice
 
 
-def package_notice_and_save_to(notice: Notice, save_to: PATH_TYPE = None) -> str:
+def package_notice_and_save_to(notice: Notice, save_to: PATH_TYPE = None, work_identifier: str = None) -> str:
     """
         This function package a Notice to save_to location.
     """