From e8e5ea0db8462633fa39d7f05f67b81e1ac58bad Mon Sep 17 00:00:00 2001
From: Rae Knowler <rae.knowler@liip.ch>
Date: Mon, 8 Apr 2024 10:28:07 +0200
Subject: [PATCH] fix: Fix uris for IANA media-types

---
 ckanext/dcatapchharvest/dcat_helpers.py                     | 3 ++-
 ckanext/dcatapchharvest/tests/fixtures/1901.xml             | 6 +++---
 .../dcatapchharvest/tests/fixtures/dataset-media-types.xml  | 4 ++--
 ckanext/dcatapchharvest/tests/test_dcatap_ch_parse.py       | 4 ++--
 ckanext/dcatapchharvest/tests/test_dcatap_ch_serialize.py   | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ckanext/dcatapchharvest/dcat_helpers.py b/ckanext/dcatapchharvest/dcat_helpers.py
index d449bea..2e1d800 100644
--- a/ckanext/dcatapchharvest/dcat_helpers.py
+++ b/ckanext/dcatapchharvest/dcat_helpers.py
@@ -302,5 +302,6 @@ def get_iana_media_type_values():
                 uri_suffix = registry_type + '/' + name
 
             media_type_values[registry_type + '/' + name] = \
-                media_types_namespaces['ns'] + '/' + uri_suffix
+                media_types_namespaces['ns'] + '/media-types/' + uri_suffix
+
     return media_type_values
diff --git a/ckanext/dcatapchharvest/tests/fixtures/1901.xml b/ckanext/dcatapchharvest/tests/fixtures/1901.xml
index f1e7601..0ad7a90 100644
--- a/ckanext/dcatapchharvest/tests/fixtures/1901.xml
+++ b/ckanext/dcatapchharvest/tests/fixtures/1901.xml
@@ -9,7 +9,7 @@
     <dcat:distribution>
       <dcat:Distribution rdf:about="https://opendata.swiss/dataset/7451e012-64b2-4bbc-af20-a0e2bc61b585/resource/c8ec6ca0-6923-4cf3-92f2-95a10e6f8e25">
         <dct:title xml:lang="fr">Annuaire statistique de la Suisse 1901</dct:title>
-        <dcat:mediaType rdf:resource="http://www.iana.org/assignments/text/html"/>
+        <dcat:mediaType rdf:resource="https://www.iana.org/assignments/media-types/text/html"/>
         <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">1900-12-31T00:00:00</dct:issued>
         <dcat:accessURL rdf:resource="https://www.bfs.admin.ch/asset/fr/hs-b-00.01-jb-1901"/>
         <dct:language>fr</dct:language>
@@ -37,13 +37,13 @@
     <dcat:qualifiedRelation>
       <dcat:Relationship>
         <dct:relation rdf:resource="http://example.org/Original987"/>
-        <dcat:hadRole rdf:resource="http://www.iana.org/assignments/relation/original"/>
+        <dcat:hadRole rdf:resource="https://www.iana.org/assignments/media-types/relation/original"/>
       </dcat:Relationship>
     </dcat:qualifiedRelation>
     <dcat:qualifiedRelation>
       <dcat:Relationship>
         <dct:relation rdf:resource="http://example.org/Related486"/>
-        <dcat:hadRole rdf:resource="http://www.iana.org/assignments/relation/related"/>
+        <dcat:hadRole rdf:resource="https://www.iana.org/assignments/media-types/relation/related"/>
       </dcat:Relationship>
     </dcat:qualifiedRelation>
     <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">1900-12-31T00:00:00</dct:issued>
diff --git a/ckanext/dcatapchharvest/tests/fixtures/dataset-media-types.xml b/ckanext/dcatapchharvest/tests/fixtures/dataset-media-types.xml
index 1eae4cd..2c618de 100644
--- a/ckanext/dcatapchharvest/tests/fixtures/dataset-media-types.xml
+++ b/ckanext/dcatapchharvest/tests/fixtures/dataset-media-types.xml
@@ -4,7 +4,7 @@
   <dcat:Dataset rdf:about="https://opendata.swiss/dataset/7451e012-64b2-4bbc-af20-a0e2bc61b585">
     <dcat:distribution>
       <dcat:Distribution>
-        <dcat:mediaType rdf:resource="http://www.iana.org/assignments/text/html"/>
+        <dcat:mediaType rdf:resource="https://www.iana.org/assignments/media-types/text/html"/>
         <dcterms:format rdf:resource="http://publications.europa.eu/resource/authority/file-type/HTML"/>
       </dcat:Distribution>
     </dcat:distribution>
@@ -16,7 +16,7 @@
     </dcat:distribution>
     <dcat:distribution>
       <dcat:Distribution>
-        <dcat:mediaType rdf:resource="http://www.iana.org/assignments/text/plain"/>
+        <dcat:mediaType rdf:resource="https://www.iana.org/assignments/media-types/text/plain"/>
         <dcterms:format rdf:resource="http://publications.europa.eu/resource/authority/file-type/GRID_ASCII"/>
       </dcat:Distribution>
     </dcat:distribution>
diff --git a/ckanext/dcatapchharvest/tests/test_dcatap_ch_parse.py b/ckanext/dcatapchharvest/tests/test_dcatap_ch_parse.py
index 555ae3a..512b6d0 100644
--- a/ckanext/dcatapchharvest/tests/test_dcatap_ch_parse.py
+++ b/ckanext/dcatapchharvest/tests/test_dcatap_ch_parse.py
@@ -107,14 +107,14 @@ def test_dataset_all_fields(self):
             qualified_relations[0],
             {
                 "relation": "http://example.org/Original987",
-                "had_role": "http://www.iana.org/assignments/relation/original"
+                "had_role": "https://www.iana.org/assignments/media-types/relation/original"
             }
         )
         eq_(
             qualified_relations[1],
             {
                 "relation": "http://example.org/Related486",
-                "had_role": "http://www.iana.org/assignments/relation/related"
+                "had_role": "https://www.iana.org/assignments/media-types/relation/related"
             }
         )
 
diff --git a/ckanext/dcatapchharvest/tests/test_dcatap_ch_serialize.py b/ckanext/dcatapchharvest/tests/test_dcatap_ch_serialize.py
index 1549adc..07ab52f 100644
--- a/ckanext/dcatapchharvest/tests/test_dcatap_ch_serialize.py
+++ b/ckanext/dcatapchharvest/tests/test_dcatap_ch_serialize.py
@@ -152,7 +152,7 @@ def test_graph_from_dataset(self):
                 assert self._triple(g, distribution, DCT['format'], URIRef("http://publications.europa.eu/resource/authority/file-type/WCS_SRVC"))
 
             if resource_dict.get('media_type') == "application/1d-interleaved-parityfec":
-                assert self._triple(g, distribution, DCAT.mediaType, URIRef("http://www.iana.org/assignments/application/1d-interleaved-parityfec"))
+                assert self._triple(g, distribution, DCAT.mediaType, URIRef("http://www.iana.org/assignments/media-types/application/1d-interleaved-parityfec"))
 
             if resource_dict.get('temporal_resolution') == "P1D":
                 expected_literal = Literal("P1D", datatype=XSD.duration)