From b748d847bb45d71d88dc7a89f8b841a377966e78 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Mon, 11 Jul 2022 13:59:25 +0200 Subject: [PATCH] add typology in api response --- .../main/java/eu/dnetlib/openaire/dsm/DsmCore.java | 5 +++-- .../eu/dnetlib/openaire/dsm/domain/ApiDetails.java | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmCore.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmCore.java index 0d7e9107..b94bcad7 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmCore.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmCore.java @@ -144,11 +144,12 @@ public class DsmCore { public ApiDetailsResponse getApis(final String dsId) throws DsmException { try { - final String eoscType = dsDao.getDs(dsId).getEoscDatasourceType(); + final DatasourceDbEntry ds = dsDao.getDs(dsId); final List apis = dsDao.getApis(dsId); final List api = apis.stream() .map(DsmMappingUtils::asDetails) - .map(a -> a.setEoscDatasourceType(eoscType)) + .map(a -> a.setEoscDatasourceType(ds.getEoscDatasourceType())) + .map(a -> a.setTypology(ds.getTypology())) .collect(Collectors.toList()); return ResponseUtils.apiResponse(api, api.size()); } catch (final Throwable e) { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetails.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetails.java index d2ab101a..0c559702 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetails.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetails.java @@ -63,6 +63,9 @@ public class ApiDetails extends ApiIgnoredProperties { @ApiModelProperty(position = 17) private String metadataIdentifierPath = ""; + @ApiModelProperty(position = 18) + private String typology = null; + public String getId() { return id; } @@ -214,4 +217,13 @@ public class ApiDetails extends ApiIgnoredProperties { this.eoscDatasourceType = eoscDatasourceType; return this; } + + public String getTypology() { + return typology; + } + + public ApiDetails setTypology(final String typology) { + this.typology = typology; + return this; + } }