METS Package updates

Author: Kolea Plesco

ted_sws/notice_packager/model/metadata.py

@@ -33,7 +33,7 @@
 MEDIA_TYPE = "RDF"
 LANGUAGES = ["en"]
 LANGUAGE = LANGUAGES[0]
-USES_LANGUAGE = "MULL"
+USES_LANGUAGE = "MUL"
 
 ACTION_CREATE = "create"
 ACTION_UPDATE = "update"
@@ -85,7 +85,7 @@ class WorkMetadata(Metadata):
     dataset_published_by_agent: str = WORK_AGENT
     datetime_transmission: str = datetime.datetime.now().isoformat()
     title: Optional[Dict[str, str]] = None
-    date_creation: Optional[str] = None
+    date_creation: Optional[str] = datetime.datetime.now().strftime('%Y-%m-%d')
     concept_type_dataset: str = CONCEPT_TYPE_DATASET
     dataset_version: Optional[str] = None
     dataset_keyword: List[str] = DATASET_KEYWORD

ted_sws/notice_packager/resources/templates/mets_xml_dmd_rdf.jinja2

@@ -11,19 +11,19 @@
 
     <cdm:work rdf:about="&resource;ted/{{ work.identifier }}">
         <rdf:type rdf:resource="http://publications.europa.eu/ontology/cdm#work"/>
-        <rdf:type rdf:resource="http://publications.europa.eu/ontology/cdm#{{ work.cdm_rdf_type }}"/>
-        <cdm:work_has_resource-type>{{ work.resource_type }}</cdm:work_has_resource-type>
+        <rdf:type rdf:resource="http://publications.europa.eu/ontology/cdm#procurement_public"/>
+        <cdm:work_has_resource-type rdf:resource="http://publications.europa.eu/resource/authority/resource-type/PROCUREMENT_NOTICE"/>
         <cdm:do_not_index rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">{{ work.do_not_index }}</cdm:do_not_index>
         <cdm:work_date_document rdf:datatype="http://www.w3.org/2001/XMLSchema#date">{{ work.date_document }}</cdm:work_date_document>
         <cdm:work_created_by_agent rdf:resource="&cellar-authority;corporate-body/{{ work.created_by_agent }}"/>
         {% for lang in notice.languages %}
         <cdm:work_title xml:lang="{{ lang }}">{{ work.title[lang] }}</cdm:work_title>
         {% endfor %}
         <cdm:datetime_transmission rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">{{ work.datetime_transmission }}</cdm:datetime_transmission>
-        <cdm:procurement_public_issued_by_country>{{ work.procurement_public_issued_by_country }}</cdm:procurement_public_issued_by_country>
+        {# <cdm:procurement_public_issued_by_country>{{ work.procurement_public_issued_by_country }}</cdm:procurement_public_issued_by_country>
         {% for uri in work.procurement_public_url_etendering %}
         <cdm:procurement_public_url_etendering xml:lang="{{ uri.language }}">{{ uri.text }}</cdm:procurement_public_url_etendering>
-        {% endfor %}
+        {% endfor %} #}
         {# <cdm:datetime_negotiation rdf:resource="http://publications.europa.eu/ontology/cdm#datetime_transmission"/>
         <cdm:work_dataset_published_by_agent rdf:resource="&cellar-authority;corporate-body/{{ work.dataset_published_by_agent }}"/>
         <cdm:work_date_creation rdf:datatype="http://www.w3.org/2001/XMLSchema#date">{{ work.date_creation }}</cdm:work_date_creation>

ted_sws/notice_packager/services/metadata_transformer.py

@@ -67,16 +67,15 @@ def from_notice_metadata(cls, notice_metadata: ExtractedMetadata) -> PackagerMet
         metadata.notice.id = cls.normalize_value(notice_metadata.notice_publication_number)
 
         # WORK
+        publication_date = datetime.datetime.strptime(notice_metadata.publication_date, '%Y%m%d').strftime('%Y-%m-%d')
         metadata.work.identifier = publication_work_identifier(metadata.notice.id, notice_metadata)
         metadata.work.cdm_rdf_type = PROCUREMENT_PUBLIC
         metadata.work.resource_type = PROCUREMENT_NOTICE
-        metadata.work.date_document = notice_metadata.publication_date
-        metadata.work.uri = publication_notice_uri(metadata.notice.id)
+        metadata.work.date_document = publication_date
+        metadata.work.uri = publication_notice_uri(metadata.notice.id, notice_metadata)
         title_search = [t.title.text for t in notice_metadata.title if t.title.language == LANGUAGE.upper()]
         if len(title_search) > 0:
             metadata.work.title = {LANGUAGE: title_search[0]}
-        metadata.work.date_creation = datetime.datetime \
-            .strptime(notice_metadata.publication_date, '%Y%m%d').strftime('%Y-%m-%d')
         metadata.work.dataset_version = _date.strftime('%Y%m%d') + '-' + _revision
         metadata.work.procurement_public_issued_by_country = notice_metadata.country_of_buyer
         metadata.work.procurement_public_url_etendering = notice_metadata.uri_list
@@ -85,23 +84,23 @@ def from_notice_metadata(cls, notice_metadata: ExtractedMetadata) -> PackagerMet
         metadata.expression.title = {LANGUAGE: BASE_TITLE + " " + metadata.notice.id}
 
         # MANIFESTATION
-        metadata.manifestation.date_publication = notice_metadata.publication_date
+        metadata.manifestation.date_publication = publication_date
         return metadata
 
 
-def publication_notice_year(notice_id):
-    return notice_id.split(NORMALIZED_SEPARATOR)[1]
+def publication_notice_year(notice_metadata):
+    return datetime.datetime.strptime(notice_metadata.publication_date, '%Y%m%d').strftime('%Y')
 
 
 def publication_notice_number(notice_id):
     return notice_id.split(NORMALIZED_SEPARATOR)[0]
 
 
-def publication_notice_uri(notice_id):
-    return f"{BASE_WORK}{publication_notice_year(notice_id)}/{notice_id}"
+def publication_notice_uri(notice_id, notice_metadata):
+    return f"{BASE_WORK}{publication_notice_year(notice_metadata)}/{notice_id}"
 
 
 def publication_work_identifier(notice_id, notice_metadata):
-    year = publication_notice_year(notice_id)
+    year = publication_notice_year(notice_metadata)
     number = publication_notice_number(notice_id)
     return f"{year}_{notice_metadata.ojs_type}_{notice_metadata.ojs_issue_number}_{number}"

tests/test_data/notice_packager/template_metadata.json

@@ -9,7 +9,7 @@
   },
   "work": {
     "do_not_index": "true",
-    "date_document": "2021-08-01",
+    "date_document": "2016-08-01",
     "created_by_agent": "PUBL",
     "dataset_published_by_agent": "PUBL",
     "datetime_transmission": "2021-08-01T00:01:00",
@@ -34,7 +34,7 @@
   },
   "manifestation": {
     "type": "E_PROCUREMENT_ONTOLOGY",
-    "date_publication": "2021-08-01",
+    "date_publication": "2016-08-01",
     "distribution_has_status_distribution_status": "COMPLETED",
     "distribution_has_media_type_concept_media_type": "RDF"
   }

tests/unit/notice_packager/conftest.py

@@ -93,4 +93,4 @@ def invalid_rdf_files_path():
 
 @pytest.fixture
 def notice_id():
-    return "196390_2016"
+    return "196390_2018"

tests/unit/notice_packager/test_metadata_transformer.py

@@ -26,11 +26,11 @@ def test_metadata_transformer(notice_sample_metadata: ExtractedMetadata):
     assert hasattr(template_metadata, "manifestation")
 
 
-def test_publication_notice_year(notice_id):
-    year = publication_notice_year(notice_id)
-    assert year == "2016"
+def test_publication_notice_year(notice_sample_metadata):
+    year = publication_notice_year(notice_sample_metadata)
+    assert year == "2018"
 
 
-def test_publication_notice_uri(notice_id):
-    uri = publication_notice_uri(notice_id)
-    assert uri == "http://data.europa.eu/a4g/resource/2016/196390_2016"
+def test_publication_notice_uri(notice_id, notice_sample_metadata):
+    uri = publication_notice_uri(notice_id, notice_sample_metadata)
+    assert uri == "http://data.europa.eu/a4g/resource/2018/196390_2018"