Skip to content

Commit 8389634

Browse files
authored
Merge pull request #230 from GenomicDataInfrastructure/fix-openapi-arrays
fix: openapi file for arrays
2 parents 987ec86 + 983ccea commit 8389634

File tree

4 files changed

+21
-9
lines changed

4 files changed

+21
-9
lines changed

src/main/openapi/ckan.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,8 @@ components:
513513
documentation:
514514
type: array
515515
items:
516-
$ref: "#/components/schemas/CkanValueLabel"
516+
type: string
517+
format: uri
517518
download_url:
518519
type: string
519520
format: uri
@@ -528,7 +529,7 @@ components:
528529
conforms_to:
529530
type: array
530531
items:
531-
$ref: "#/components/schemas/CkanValueLabel"
532+
type: string
532533
mimetype:
533534
type: string
534535
modified_date:
@@ -577,7 +578,9 @@ components:
577578
type: string
578579
format: uri
579580
contact:
580-
$ref: "#/components/schemas/CkanContactPoint"
581+
type: array
582+
items:
583+
$ref: "#/components/schemas/CkanContactPoint"
581584
creator:
582585
type: array
583586
items:
@@ -620,7 +623,9 @@ components:
620623
modified:
621624
type: string
622625
publisher:
623-
$ref: "#/components/schemas/CkanAgent"
626+
type: array
627+
items:
628+
$ref: "#/components/schemas/CkanAgent"
624629
serves_dataset:
625630
type: array
626631
items:

src/main/openapi/discovery.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,8 @@ components:
655655
documentation:
656656
type: array
657657
items:
658-
$ref: "#/components/schemas/ValueLabel"
658+
type: string
659+
format: uri
659660
downloadUrl:
660661
type: string
661662
title: Download URL
@@ -671,7 +672,7 @@ components:
671672
conformsTo:
672673
type: array
673674
items:
674-
$ref: "#/components/schemas/ValueLabel"
675+
type: string
675676
mediaType:
676677
type: string
677678
modifiedAt:
@@ -727,7 +728,9 @@ components:
727728
type: string
728729
format: uri
729730
contact:
730-
$ref: "#/components/schemas/ContactPoint"
731+
type: array
732+
items:
733+
$ref: "#/components/schemas/ContactPoint"
731734
creator:
732735
type: array
733736
items:
@@ -772,7 +775,9 @@ components:
772775
type: string
773776
format: date-time
774777
publisher:
775-
$ref: "#/components/schemas/Agent"
778+
type: array
779+
items:
780+
$ref: "#/components/schemas/Agent"
776781
servesDataset:
777782
type: array
778783
items:

src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ datasets.filter-groups[0].filters=access_rights,theme,tags,publisher_name,res_fo
7878
%dev.quarkus.oidc.auth-server-url=https://id.portal.dev.gdi.lu/realms/gdi
7979
%dev.quarkus.oidc.client-id=gdi
8080
%dev.quarkus.oidc.credentials.secret=dummy-secret
81-
%dev.quarkus.rest-client.ckan_yaml.url=https://ckan.healthdata.nl
81+
%dev.quarkus.rest-client.ckan_yaml.url=http://localhost:5500
8282
%dev.quarkus.rest-client.keycloak_yaml.url=https://id.portal.dev.gdi.lu/realms/gdi
8383
%dev.quarkus.rest-client.individuals_yaml.url=https://beacon-network-backend-demo.ega-archive.org/beacon-network
8484
%dev.quarkus.rest-client.gvariants_yaml.url=https://af-gdi-bn-api-demo.ega-archive.org/beacon-network

src/test/java/io/github/genomicdatainfrastructure/discovery/datasets/infrastructure/ckan/mapper/CkanDatasetsMapperTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,8 @@ private static SearchedDataset buildSearchedDataset() {
494494
.issuedDate("2025-03-19")
495495
.modifiedDate("2025-03-19T13:37:05Z")
496496
.language(getValueLabels("language", "en"))
497+
.conformsTo(List.of())
498+
.documentation(List.of())
497499
.build());
498500
}
499501

0 commit comments

Comments
 (0)