From 744942032e5eecbaaddc7af7e2b77895b5af3f50 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Mon, 24 Jun 2019 17:06:54 +0300 Subject: [PATCH] Adds finalizedAt and publicAt dates on DMP models. --- .../DataManagementPlanListingModel.java | 29 +++++++++++++++---- .../listingmodels/DatasetListingModel.java | 12 ++++---- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java index bf50c1ca7..aa64d2b6c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java @@ -37,7 +37,9 @@ public class DataManagementPlanListingModel implements DataModel(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java index 717c7940e..cbf97251a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java @@ -26,7 +26,7 @@ public class DatasetListingModel implements DataModel new eu.eudat.models.data.dataset.Registry().fromDataModel(item)).collect(Collectors.toList())); this.dataRepositories = LabelBuilder.getLabel(entity.getDatasetDataRepositories().stream().map(item -> new DataRepository().fromDataModel(item.getDataRepository())).collect(Collectors.toList())); this.services = LabelBuilder.getLabel(entity.getServices().stream().map(item -> new Service().fromDataModel(item.getService())).collect(Collectors.toList())); - this.finalizedDat = entity.getFinalizedDat(); + this.finalizedAt = entity.getFinalizedAt(); return this; }