fix: fix contact point parsing

GenomicDataInfrastructure · Aug 6, 2024 · b853016 · b853016
1 parent a717332
commit b853016
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 17 deletions.
diff --git a/_http/ckan.http b/_http/ckan.http
@@ -8,7 +8,7 @@ GET https://catalogue.portal.dev.gdi.lu/api/3/action/enhanced_package_search?fq=
 GET https://catalogue.portal.dev.gdi.lu/api/3/action/enhanced_package_show?id=bc7664b4-284a-44c0-9ce8-bc3d6882e7fe
 
 ###
-GET https://catalogue.portal.dev.gdi.lu/api/3/action/enhanced_package_show?id=dummy
+GET https://catalogue.portal.dev.gdi.lu/api/3/action/enhanced_package_show?id=bc7664b4-284a-44c0-9ce8-bc3d6882e7fe
 
 ###
 GET https://catalogue.portal.dev.gdi.lu/api/3/action/enhanced_package_show?id=dummy

diff --git a/_http/discovery.http b/_http/discovery.http
@@ -36,7 +36,7 @@ Content-Type: application/json
 }
 
 ###
-GET http://localhost:8080/api/v1/datasets/577f4d4b-a861-4178-91d5-f46019174193
+GET http://localhost:8080/api/v1/datasets/bc7664b4-284a-44c0-9ce8-bc3d6882e7fe
 
 ###
 GET http://localhost:8080/api/v1/datasets/dummy
@@ -45,4 +45,4 @@ GET http://localhost:8080/api/v1/datasets/dummy
 GET http://localhost:8080/api/v1/datasets/577f4d4b-a861-4178-91d5-f46019174193.ttl
 
 ###
-GET http://localhost:8080/api/v1/organizations
+GET https://api.portal.dev.gdi.lu/discovery/api/v1/organizations
diff --git a/src/main/java/io/github/genomicdatainfrastructure/discovery/utils/PackageShowMapper.java b/src/main/java/io/github/genomicdatainfrastructure/discovery/utils/PackageShowMapper.java
@@ -51,7 +51,7 @@ public RetrievedDataset from(CkanPackage ckanPackage) {
                 .spatial(value(ckanPackage.getSpatialUri()))
                 .distributions(distributions(ckanPackage))
                 .keywords(keywords(ckanPackage))
-                .contacts(contactPoint(ckanPackage.getContacts()))
+                .contacts(contactPoint(ckanPackage.getContactPoint()))
                 .datasetRelationships(relations(ckanPackage.getDatasetRelationships()))
                 .dataDictionary(dictionary(ckanPackage.getDataDictionary()))
                 .build();
@@ -86,8 +86,8 @@ private List<DatasetDictionaryEntry> dictionary(List<CkanDatasetDictionaryEntry>
 
     private ContactPoint contactPointEntry(CkanContactPoint value) {
         return ContactPoint.builder()
-                .name(value.getName())
-                .email(value.getEmail())
+                .name(value.getContactName())
+                .email(value.getContactEmail())
                 .build();
     }
 

diff --git a/src/main/openapi/ckan.yaml b/src/main/openapi/ckan.yaml
@@ -235,11 +235,10 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/CkanTag"
-        contacts:
+        contact_point:
           type: array
           items:
             $ref: "#/components/schemas/CkanContactPoint"
-          title: Contacts
         creators:
           type: array
           items:
@@ -295,15 +294,15 @@ components:
         - title
     CkanContactPoint:
       properties:
-        name:
+        contact_name:
           type: string
           title: name
-        email:
+        contact_email:
+          type: string
+          title: email
+        contact_uri:
           type: string
           title: email
-      required:
-        - name
-        - email
     CkanCreator:
       type: object
       properties:

diff --git a/src/main/openapi/discovery.yaml b/src/main/openapi/discovery.yaml
@@ -348,7 +348,7 @@ components:
           title: Keywords
         provenance:
           type: string
-          title: Contact URI
+          title: Provenance
         spatial:
           $ref: "#/components/schemas/ValueLabel"
           title: Spatial

diff --git a/...st/java/io/github/genomicdatainfrastructure/discovery/services/PackageShowMapperTest.java b/...st/java/io/github/genomicdatainfrastructure/discovery/services/PackageShowMapperTest.java
@@ -116,10 +116,14 @@ void can_parse() {
                                 .lastModified("2024-03-19T13:37:05.472970")
                                 .build()
                 ))
-                .contacts(List.of(
-                        CkanContactPoint.builder().name("Contact 1").email("[email protected]")
+                .contactPoint(List.of(
+                        CkanContactPoint.builder()
+                                .contactName("Contact 1")
+                                .contactEmail("[email protected]")
                                 .build(),
-                        CkanContactPoint.builder().name("Contact 2").email("[email protected]")
+                        CkanContactPoint.builder()
+                                .contactName("Contact 2")
+                                .contactEmail("[email protected]")
                                 .build()
                 ))
                 .creators(List.of(

diff --git a/src/test/resources/mappings/package_show.json b/src/test/resources/mappings/package_show.json
@@ -72,6 +72,13 @@
                     "state": "active",
                     "temporal_end": "2025-12-31",
                     "temporal_start": "2020-01-01",
+                    "contact_point": [
+                        {
+                            "contact_email": "file:///srv/app/[email protected]",
+                            "contact_name": "Chief Technology Officer of BioData.pt",
+                            "contact_uri": ""
+                        }
+                    ],
                     "theme": [
                         {
                             "display_name": "Bio ontology",