updated METS package generation

Author: kaleanych

ted_sws/notice_packager/services/metadata_transformer.py

@@ -60,7 +60,7 @@ def from_notice_metadata(cls, notice_metadata: ExtractedMetadata) -> PackagerMet
         metadata.notice.id = cls.normalize_value(notice_metadata.notice_publication_number)
         metadata.notice.public_number_document = publication_notice_number(metadata.notice.id)
         metadata.notice.public_number_edition = publication_notice_year(
-            notice_metadata) + notice_metadata.ojs_issue_number.zfill(3)
+            notice_metadata) + filled_ojs_issue_number(notice_metadata.ojs_issue_number)
 
         # WORK
         publication_date = datetime.datetime.strptime(notice_metadata.publication_date, '%Y%m%d').strftime('%Y-%m-%d')
@@ -132,10 +132,15 @@ def publication_notice_uri(notice_id, notice_metadata):
 def publication_work_identifier(notice_id, notice_metadata):
     year = publication_notice_year(notice_metadata)
     number = publication_notice_number(notice_id)
-    return f"{year}_{notice_metadata.ojs_type}_{notice_metadata.ojs_issue_number.zfill(3)}_{number}"
+    return f"{year}_{notice_metadata.ojs_type}_{filled_ojs_issue_number(notice_metadata.ojs_issue_number)}_{number}"
 
 
 def publication_work_oj_identifier(notice_id, notice_metadata):
     year = publication_notice_year(notice_metadata)
     number = publication_notice_number(notice_id)
-    return f"JOS_{year}_{notice_metadata.ojs_issue_number.zfill(3)}_R_{number}"
+    return f"JOS_{year}_{filled_ojs_issue_number(notice_metadata.ojs_issue_number)}_R_{number}"
+
+
+def filled_ojs_issue_number(ojs_issue_number: str) -> str:
+    # just return the number without any preceding 0 (leaved the formula as it is in case of revert)
+    return ojs_issue_number.zfill(0)

ted_sws/notice_packager/services/notice_packager.py

@@ -35,6 +35,15 @@
 FILE_METS_ACTION_FORMAT = "{work_identifier}_{action}.mets.xml"
 DEFAULT_RDF_FILE_FORMAT = "turtle"
 
+# The naming convention for an TEDRDF package:
+# {year}_{notice_metadata.ojs_type}_{notice_metadata.ojs_issue_number}_{notice_number}_{action}
+# ex.: "2021_S_4_003544_create.zip" , where:
+# year = 2021
+# notice_metadata.ojs_type = S
+# notice_metadata.ojs_issue_number = 4
+# notice_number = 003544
+# action = create
+
 
 def package_notice(notice: Notice, action: str = METS_TYPE_CREATE) -> Notice:
     """

tests/unit/notice_packager/test_metadata_transformer.py

@@ -47,5 +47,5 @@ def test_publication_notice_uri(notice_id, notice_sample_metadata):
 
 def test_publication_work_identifier(notice_id, notice_sample_metadata):
     work_id = publication_work_identifier(notice_id, notice_sample_metadata)
-    assert work_id == "2018_S_022_196390"
+    assert work_id == "2018_S_22_196390"