other fixes to dcat_ap_it api

CMCC-Foundation · Aug 2, 2024 · 352c4c7 · 352c4c7
1 parent 6565728
commit 352c4c7
Show file tree

Hide file tree

Showing 2 changed files with 297 additions and 96 deletions.
diff --git a/api/app/main.py b/api/app/main.py
@@ -6,7 +6,7 @@
 from datetime import datetime
 
 from oai_dcat.metadata_provider import BASE_URL
-from oai_dcat.oai_utils import convert_to_dcat_ap, convert_to_dcat_ap_it
+from oai_dcat.oai_utils import serialize_and_concatenate_graphs, convert_to_dcat_ap_it
 from fastapi import FastAPI, HTTPException, Request, status, Query, Response
 from fastapi.middleware.cors import CORSMiddleware
 from starlette.middleware.authentication import AuthenticationMiddleware
@@ -675,8 +675,8 @@ async def dcatapit(request: Request):
     data = dataset_handler.get_datasets(
             user_roles_names=request.auth.scopes
         )
-    dcatap_graph = convert_to_dcat_ap(data, BASE_URL)
-    dcatapit_graph = convert_to_dcat_ap_it(dcatap_graph, BASE_URL)
-    response = dcatapit_graph.serialize(format='pretty-xml')
+    catalog_graph, datasets_graph, distributions_graph = convert_to_dcat_ap_it(data, BASE_URL)
+    # response = dcatapit_graph.serialize(format='pretty-xml')
+    response = serialize_and_concatenate_graphs(catalog_graph, datasets_graph, distributions_graph)
 
     return Response(content=response, media_type="text/xml")