Merge pull request #157 from GenomicDataInfrastructure/upgrade-to-dca…

…textension2.1.0 feat(mapping): Update mapping with missing fields after updating to C…
GenomicDataInfrastructure · Nov 20, 2024 · 4d91c1f · 4d91c1f
2 parents f634153 + 6503b68
commit 4d91c1f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 0 deletions.
diff --git a/...nomicdatainfrastructure/discovery/datasets/infrastructure/ckan/utils/CkanAgentParser.java b/...nomicdatainfrastructure/discovery/datasets/infrastructure/ckan/utils/CkanAgentParser.java
@@ -34,6 +34,7 @@ public Agent agent(CkanAgent agent) {
                 .name(agent.getName())
                 .email(agent.getEmail())
                 .url(agent.getUrl())
+                .uri(agent.getUri())
                 .type(agent.getType())
                 .identifier(agent.getIdentifier())
                 .build();

diff --git a/...micdatainfrastructure/discovery/datasets/infrastructure/ckan/utils/PackageShowMapper.java b/...micdatainfrastructure/discovery/datasets/infrastructure/ckan/utils/PackageShowMapper.java
@@ -77,6 +77,7 @@ private ContactPoint contactPointEntry(CkanContactPoint value) {
                 .name(value.getName())
                 .email(value.getEmail())
                 .uri(value.getUri())
+                .identifier(value.getIdentifier())
                 .build();
     }
 
@@ -134,6 +135,7 @@ private Agent agent(CkanAgent value) {
                         .type(value.getType())
                         .identifier(value.getIdentifier())
                         .url(value.getUrl())
+                        .uri(value.getUri())
                         .build())
                 .orElse(null);
     }

diff --git a/src/main/openapi/ckan.yaml b/src/main/openapi/ckan.yaml
@@ -262,6 +262,9 @@ components:
         uri:
           type: string
           title: uri
+        identifier:
+          type: string
+          title: identifier
       required:
         - name
         - email
@@ -276,6 +279,9 @@ components:
         url:
           type: string
           title: url
+        uri:
+          type: string
+          title: uri
         type:
           type: string
           title: type

diff --git a/src/main/openapi/discovery.yaml b/src/main/openapi/discovery.yaml
@@ -473,6 +473,9 @@ components:
         uri:
           type: string
           title: uri
+        identifier:
+          type: string
+          title: identifier
       required:
         - name
         - email
@@ -493,6 +496,9 @@ components:
         identifier:
           type: string
           title: identifier
+        uri:
+          type: string
+          title: uri
       required:
         - name
     DatasetRelationEntry:

diff --git a/...st/java/io/github/genomicdatainfrastructure/discovery/services/PackageShowMapperTest.java b/...st/java/io/github/genomicdatainfrastructure/discovery/services/PackageShowMapperTest.java
@@ -106,11 +106,13 @@ void can_parse() {
                         CkanContactPoint.builder()
                                 .name("Contact 1")
                                 .email("contact1@example.com")
+                                .identifier("contact-identifier-1")
                                 .build(),
                         CkanContactPoint.builder()
                                 .name("Contact 2")
                                 .email("contact2@example.com")
                                 .uri("http://example.com")
+                                .identifier("contact-identifier-2")
                                 .build()
                 ))
                 .creator(List.of(
@@ -120,13 +122,15 @@ void can_parse() {
                                 .email("email")
                                 .url("url")
                                 .type("type")
+                                .uri("uri")
                                 .build(),
                         CkanAgent.builder()
                                 .name("creatorName2")
                                 .identifier("creatorIdentifier2")
                                 .email("email2")
                                 .url("url2")
                                 .type("type2")
+                                .uri("uri2")
                                 .build()
                 ))
                 .publisher(List.of(
@@ -136,13 +140,15 @@ void can_parse() {
                                 .email("email")
                                 .url("url")
                                 .type("type")
+                                .uri("uri")
                                 .build(),
                         CkanAgent.builder()
                                 .name("publisherName2")
                                 .identifier("publisherIdentifier2")
                                 .email("email2")
                                 .url("url2")
                                 .type("type2")
+                                .uri("uri2")
                                 .build()
                 ))
                 .datasetRelationships(List.of(
@@ -190,13 +196,15 @@ void can_parse() {
                                 .email("email")
                                 .url("url")
                                 .type("type")
+                                .uri("uri")
                                 .build(),
                         Agent.builder()
                                 .name("creatorName2")
                                 .identifier("creatorIdentifier2")
                                 .email("email2")
                                 .url("url2")
                                 .type("type2")
+                                .uri("uri2")
                                 .build()
                 ))
                 .publishers(List.of(
@@ -206,13 +214,15 @@ void can_parse() {
                                 .email("email")
                                 .url("url")
                                 .type("type")
+                                .uri("uri")
                                 .build(),
                         Agent.builder()
                                 .name("publisherName2")
                                 .identifier("publisherIdentifier2")
                                 .email("email2")
                                 .url("url2")
                                 .type("type2")
+                                .uri("uri2")
                                 .build()
                 ))
                 .accessRights(ValueLabel.builder()
@@ -256,11 +266,13 @@ void can_parse() {
                         ContactPoint.builder()
                                 .name("Contact 1")
                                 .email("contact1@example.com")
+                                .identifier("contact-identifier-1")
                                 .build(),
                         ContactPoint.builder()
                                 .name("Contact 2")
                                 .email("contact2@example.com")
                                 .uri("http://example.com")
+                                .identifier("contact-identifier-2")
                                 .build()
                 ))
                 .datasetRelationships(List.of(