Fix RDF uri on publisher

Informasjonsforvaltning · Nov 28, 2024 · d95233c · d95233c
1 parent 78a7939
commit d95233c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/main/kotlin/no/fdk/dataservicecatalog/handler/RDFHandler.kt b/src/main/kotlin/no/fdk/dataservicecatalog/handler/RDFHandler.kt
@@ -102,15 +102,17 @@ class RDFHandler(private val repository: DataServiceRepository, private val prop
     }
 }
 
-fun Model.addCatalog(catalogId: String, baseUri: String, organizationCatalogBaseUri: String, publisherUri: String) {
-    this.createResource(URIref.encode(baseUri.plus(catalogId))).addProperty(RDF.type, DCAT.Catalog)
+fun Model.addCatalog(catalogId: String, baseUri: String, organizationCatalogUri: String, publisherUri: String) {
+    this.createResource(URIref.encode(baseUri.plus(catalogId)))
         .addProperty(
-            DCTerms.publisher, ResourceFactory.createResource(URIref.encode(catalogId))
+            RDF.type, DCAT.Catalog
+        ).addProperty(
+            DCTerms.publisher, ResourceFactory.createResource(URIref.encode(organizationCatalogUri.plus(catalogId)))
         ).addProperty(
             DCTerms.title, ResourceFactory.createLangLiteral("Data service catalog ($catalogId)", "en")
         )
 
-    this.createResource(URIref.encode(organizationCatalogBaseUri.plus(catalogId)))
+    this.createResource(URIref.encode(organizationCatalogUri.plus(catalogId)))
         .addProperty(
             RDF.type, FOAF.Agent
         ).addProperty(

diff --git a/src/test/kotlin/no/fdk/dataservicecatalog/unit/handler/RDFHandlerTest.kt b/src/test/kotlin/no/fdk/dataservicecatalog/unit/handler/RDFHandlerTest.kt
@@ -85,7 +85,7 @@ class RDFHandlerTest {
                     foaf:page                 <http://page.com> .
 
             <$baseUri/catalogs/$catalogId>  rdf:type  dcat:Catalog;
-                    dct:publisher  <$catalogId>;
+                    dct:publisher  <$organizationCatalogBaseUri/organizations/$catalogId>;
                     dct:title      "Data service catalog ($catalogId)"@en;
                     dcat:service   <$baseUri/data-services/$dataServiceId> .
         """
@@ -166,7 +166,7 @@ class RDFHandlerTest {
                     foaf:page                 <http://page.com> .
 
             <$baseUri/catalogs/$catalogId>  rdf:type  dcat:Catalog;
-                    dct:publisher  <$catalogId>;
+                    dct:publisher  <$organizationCatalogBaseUri/organizations/$catalogId>;
                     dct:title      "Data service catalog ($catalogId)"@en;
                     dcat:service   <$baseUri/data-services/$dataServiceId> .
         """