feat: add distribution dcat:mediaType attribute

Informasjonsforvaltning · Jun 26, 2023 · c381635 · c381635
1 parent 3a2006d
commit c381635
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/src/main/kotlin/no/fdk/dataset_catalog/model/Dataset.kt b/src/main/kotlin/no/fdk/dataset_catalog/model/Dataset.kt
@@ -287,6 +287,7 @@ data class Distribution(
     val conformsTo: List<SkosConcept>? = null,
     val page: List<SkosConcept>? = null,
     val format: List<String>? = null,
+    val mediaType: List<String>? = null,
     val accessService: List<DataDistributionService>? = null,
 )
 

diff --git a/src/main/kotlin/no/fdk/dataset_catalog/rdf/RDFUtils.kt b/src/main/kotlin/no/fdk/dataset_catalog/rdf/RDFUtils.kt
@@ -168,6 +168,7 @@ fun Resource.addDistribution(property: Property, distributions: Collection<Distr
                     .addConformsTo(it.conformsTo)
                     .safeAddURLs(FOAF.page, it.page?.map { page -> page.uri })
                     .safeAddURLs(DCTerms.format, it.format)
+                    .safeAddURLs(DCAT.mediaType, it.mediaType)
                     .addDataDistributionServices(it.accessService)
             )
         }
@@ -190,10 +191,11 @@ private fun Distribution.hasNonNullOrEmptyProperty(): Boolean =
 
     format?.all { entry -> entry.isNullOrEmpty() } == false ||
 
+    mediaType?.all { entry -> entry.isNullOrEmpty() } == false ||
+
     !accessService.isNullOrEmpty()
 
 // TODO: add dcat:endpointURLs and make sure front-end sends necessary data (https://doc.difi.no/review/dcat-ap-no/#_obligatoriske_egenskaper_for_datatjeneste)
-// TODO: add a list of dct:MediaTypes (https://doc.difi.no/review/dcat-ap-no/#distribusjon-medietype)
 
 fun Resource.addDataDistributionServices(dataDistributionServices: Collection<DataDistributionService>?): Resource {
     dataDistributionServices?.forEach {

diff --git a/src/main/resources/specification/specification.yaml b/src/main/resources/specification/specification.yaml
@@ -803,6 +803,11 @@ components:
           items:
             type: string
           description: Associated formats
+        mediaType:
+          type: array
+          items:
+            type: string
+          description: Associated media types
         accessService:
           type: array
           items:

diff --git a/src/test/kotlin/no/fdk/dataset_catalog/utils/TestDataset_0.kt b/src/test/kotlin/no/fdk/dataset_catalog/utils/TestDataset_0.kt
@@ -98,6 +98,7 @@ val DISTRIBUTION_EX = Distribution(
     conformsTo = listOf(SKOSCONCEPT_EX("dct:conformsTo")),
     page = listOf(SKOSCONCEPT_EX("foaf:page")),
     format = listOf("Formats"),
+    mediaType = listOf("MediaTypes"),
     accessService = listOf(DATADISTRIBUTIONSERVICE_EX),
 )
 

diff --git a/src/test/kotlin/no/fdk/dataset_catalog/utils/TestDataset_1.kt b/src/test/kotlin/no/fdk/dataset_catalog/utils/TestDataset_1.kt
@@ -93,14 +93,16 @@ val DISTRIBUTION = Distribution(
     conformsTo= listOf(CONFORMS_TO),
     license=SkosConcept("https://data.norge.no/nlod/no/2.0", mapOf(Pair("nb", "NODL")), extraType = DCTerms.LicenseDocument.uri),
     page= listOf(SkosConcept("http://lenke/til/mer/info",  mapOf(Pair("nb", "Dokumentasjon av distribusjonen")), extraType =  FOAF.Document.uri)),
-    format=listOf("https://www.iana.org/assignments/media-types/application/json"),
+    format=listOf("http://publications.europa.eu/resource/authority/file-type/JSON"),
+    mediaType=listOf("https://www.iana.org/assignments/media-types/application/json"),
     accessService=listOf(SAMPLE_DESCRIPTION)
 )
 
 val SAMPLE = Distribution(
     uri = "$DATASET_URI/samples/d2",
     description = mapOf(Pair("nb", "Dette er beskrivelsen av eksempeldataene. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.")),
-    format =  listOf("https://www.iana.org/assignments/media-types/application/rdf+xml"),
+    format =  listOf("http://publications.europa.eu/resource/authority/file-type/RDF"),
+    mediaType =  listOf("https://www.iana.org/assignments/media-types/application/rdf+xml"),
     accessURL =  listOf("http://www.detteerenlenke.no/til-nedlasting", "www.dette.kan.også/hende")
 )
 

diff --git a/src/test/resources/catalog_2.ttl b/src/test/resources/catalog_2.ttl
@@ -33,8 +33,9 @@
 <http://localhost:5000/catalogs/987654321/datasets/72a54592-692c-4cfa-a938-cd1a56a2ed8d/samples/d2>
         a                dcat:Distribution ;
         dct:description  "Dette er beskrivelsen av eksempeldataene. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor."@nb ;
-        dct:format       <https://www.iana.org/assignments/media-types/application/rdf+xml> ;
-        dcat:accessURL    <http://www.detteerenlenke.no/til-nedlasting> .
+        dct:format       <http://publications.europa.eu/resource/authority/file-type/RDF> ;
+        dcat:mediaType   <https://www.iana.org/assignments/media-types/application/rdf+xml> ;
+        dcat:accessURL   <http://www.detteerenlenke.no/til-nedlasting> .
 
 <http://localhost:5000/catalogs/987654321>
         a                dcat:Catalog ;
@@ -63,7 +64,8 @@
                                  dct:title  "SOSI"@nb
                                ] ;
         dct:description        "Dette er beskrivelsen av distribusjonen. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Vestibulum id ligula porta felis euismod semper con desbit arum. Se dokumentasjon for denne distribusjonen."@nb ;
-        dct:format             <https://www.iana.org/assignments/media-types/application/json> ;
+        dct:format             <http://publications.europa.eu/resource/authority/file-type/JSON> ;
+        dcat:mediaType         <https://www.iana.org/assignments/media-types/application/json> ;
         dct:license            <https://data.norge.no/nlod/no/2.0> ;
         dcat:accessURL         <http://www.detteerentredjelenke.no/til-en-tredje-nedlasting> , <http://www.detteerenannenlenke.no/til-en-annen-nedlasting> , <http://www.detteerenlenke.no/til-nedlasting> ;
         foaf:page              <http://lenke/til/mer/info> .