From 83bd9774849abc93c8379429d02e05f2598059f7 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Fri, 31 Jul 2020 14:06:16 +0300 Subject: [PATCH] If finalized Dataset has no finalized At date then use it's DMP finalized At date --- .../models/data/listingmodels/DatasetListingModel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 667c7ebb2..c0bb5a74f 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 @@ -204,7 +204,11 @@ 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.finalizedAt = entity.getFinalizedAt(); + if (entity.getFinalizedAt() == null && entity.getStatus() == Dataset.Status.FINALISED.getValue()) { + this.finalizedAt = entity.getDmp().getFinalizedAt(); + } else { + this.finalizedAt = entity.getFinalizedAt(); + } this.dmpPublishedAt = entity.getDmp().getPublishedAt(); this.version = entity.getDmp().getVersion(); this.users = entity.getDmp() != null ? entity.getDmp().getUsers().stream().map(x -> new UserInfoListingModel().fromDataModel(x)).collect(Collectors.toList()) : new ArrayList<>();