Merge pull request #232 from GenomicDataInfrastructure/extend-search-datar-esults

Extend search datar esults

Author: hcvdwerf

src/main/java/io/github/genomicdatainfrastructure/discovery/datasets/infrastructure/ckan/mapper/CkanDatasetsMapper.java

@@ -52,7 +52,8 @@ public interface CkanDatasetsMapper {
     @Mapping(target = "frequency", source = "frequency")
     @Mapping(target = "inSeries", source = "inSeries")
     @Mapping(target = "isReferencedBy", source = "isReferencedBy")
-    @Mapping(target = "temporalCoverage", source = "temporalCoverage")
+    @Mapping(target = "temporalCoverage.start", source = "temporalStart")
+    @Mapping(target = "temporalCoverage.end", source = "temporalEnd")
     @Mapping(target = "retentionPeriod", source = "retentionPeriod")
     @Mapping(target = "spatialCoverage", source = "spatialCoverage")
     @Mapping(target = "accessRights", source = "accessRights")
@@ -150,6 +151,10 @@ default List<SearchedDataset> map(PackagesSearchResult result) {
     @Mapping(target = "keywords", source = "tags")
     @Mapping(target = "modifiedAt", source = "modified")
     @Mapping(target = "createdAt", source = "issued")
+    @Mapping(target = "accessRights", source = "accessRights")
+    @Mapping(target = "numberOfUniqueIndividuals", source = "numberOfUniqueIndividuals")
+    @Mapping(target = "temporalCoverage.start", source = "temporalStart")
+    @Mapping(target = "temporalCoverage.end", source = "temporalEnd")
     @Mapping(target = "distributionsCount", expression = "java(ckanPackage.getResources()!= null ? ckanPackage.getResources().size():0)")
     @Mapping(target = "catalogue", ignore = true)
     @Mapping(target = "recordsCount", ignore = true)

src/main/openapi/ckan.yaml

@@ -279,10 +279,6 @@ components:
           type: number
           format: float
           description: Minimum spatial separation resolvable in a dataset, measured in meters.
-        temporal_coverage:
-          type: array
-          items:
-            $ref: "#/components/schemas/CkanTimeWindow"
         temporal_resolution:
           type: string
         population_coverage:

src/main/openapi/discovery.yaml

@@ -345,6 +345,13 @@ components:
           type: string
           format: date-time
           title: Metadata for dataset created at
+        accessRights:
+          $ref: "#/components/schemas/ValueLabel"
+        numberOfUniqueIndividuals:
+          type: integer
+          minimum: 0
+        temporalCoverage:
+          $ref: "#/components/schemas/TimeWindow"
         recordsCount:
           type: integer
           title: Records count
@@ -479,9 +486,7 @@ components:
           format: float
           description: Minimum spatial separation resolvable in a dataset, measured in meters.
         temporalCoverage:
-          type: array
-          items:
-            $ref: "#/components/schemas/TimeWindow"
+          $ref: "#/components/schemas/TimeWindow"
         temporalResolution:
           type: string
         populationCoverage:

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

@@ -50,10 +50,10 @@ void given_ckanPackage_with_empty_collections_should_be_mapped_to_empty_Lists()
                     .qualifiedRelation(List.of())
                     .retentionPeriod(List.of())
                     .spatialCoverage(List.of())
-                    .temporalCoverage(List.of())
                     .provenanceActivity(List.of())
                     .qualifiedAttribution(List.of())
                     .qualityAnnotation(List.of())
+                    .temporalCoverage(TimeWindow.builder().build())
                     .build();
 
             assertThat(actual)
@@ -253,11 +253,11 @@ void given_ckanPackage_should_be_mapped_to_expected_values() {
                                     .centroid("5.095,52.120")
                                     .build()))
                     .spatialResolutionInMeters(10.0f)
-                    .temporalCoverage(List.of(
+                    .temporalCoverage(
                             TimeWindow.builder()
-                                    .start(parse("2024-07-01T22:00:00+00:00"))
-                                    .end(parse("2024-07-02T22:00:00+00:00"))
-                                    .build()))
+                                    .start(parse("2024-07-12T22:00:00+00:00"))
+                                    .end(parse("2024-07-13T22:00:00+00:00"))
+                                    .build())
                     .temporalResolution("P1D")
                     .provenanceActivity(List.of())
                     .qualifiedAttribution(List.of())
@@ -399,12 +399,6 @@ private static CkanPackage buildCkanPackage() {
                 ))
                 .temporalStart("2024-07-12T22:00:00+00:00")
                 .temporalEnd("2024-07-13T22:00:00+00:00")
-                .temporalCoverage(List.of(
-                        CkanTimeWindow.builder()
-                                .start("2024-07-01T22:00:00+00:00")
-                                .end("2024-07-02T22:00:00+00:00")
-                                .build()
-                ))
                 .temporalResolution("P1D")
                 .alternateIdentifier(List.of("internalURI:admsIdentifier0"))
                 .spatialCoverage(List.of(
@@ -478,6 +472,15 @@ private static SearchedDataset buildSearchedDataset() {
                     .modifiedAt(OffsetDateTime.parse("2024-07-02T22:00Z"))
                     .createdAt(OffsetDateTime.parse("2024-07-01T22:00Z"))
                     .distributionsCount(1)
+                    .numberOfUniqueIndividuals(123456789)
+                    .accessRights(ValueLabel.builder()
+                            .value("public")
+                            .label("accessRights")
+                            .build())
+                    .temporalCoverage(TimeWindow.builder()
+                            .start(parse("2024-07-12T22:00Z"))
+                            .end(parse("2024-07-13T22:00Z"))
+                            .build())
                     .build();
         }
     }