diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DatasetOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DatasetOverviewModel.java new file mode 100644 index 000000000..bf29b0822 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DatasetOverviewModel.java @@ -0,0 +1,63 @@ +package eu.eudat.models.data.dataset; + +import eu.eudat.data.entities.Dataset; +import eu.eudat.models.DataModel; +import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel; + +import java.util.UUID; + +public class DatasetOverviewModel implements DataModel { + + private UUID id; + private String label; + private short status; + private DatasetProfileOverviewModel datasetTemplate; + + public UUID getId() { + return id; + } + public void setId(UUID id) { + this.id = id; + } + + public String getLabel() { + return label; + } + public void setLabel(String label) { + this.label = label; + } + + public short getStatus() { + return status; + } + public void setStatus(short status) { + this.status = status; + } + + public DatasetProfileOverviewModel getDatasetTemplate() { + return datasetTemplate; + } + public void setDatasetTemplate(DatasetProfileOverviewModel datasetTemplate) { + this.datasetTemplate = datasetTemplate; + } + + @Override + public DatasetOverviewModel fromDataModel(Dataset entity) { + this.id = entity.getId(); + this.label = entity.getLabel(); + this.status = entity.getStatus(); + this.datasetTemplate = new DatasetProfileOverviewModel().fromDataModel(entity.getProfile()); + + return this; + } + + @Override + public Dataset toDataModel() throws Exception { + return null; + } + + @Override + public String getHint() { + return null; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileOverviewModel.java new file mode 100644 index 000000000..8e84655c6 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileOverviewModel.java @@ -0,0 +1,42 @@ +package eu.eudat.models.data.datasetprofile; + +import eu.eudat.data.entities.DatasetProfile; +import eu.eudat.models.DataModel; + +import java.util.UUID; + +public class DatasetProfileOverviewModel implements DataModel { + private UUID id; + private String label; + + public UUID getId() { + return id; + } + public void setId(UUID id) { + this.id = id; + } + + public String getLabel() { + return label; + } + public void setLabel(String label) { + this.label = label; + } + + @Override + public DatasetProfileOverviewModel fromDataModel(DatasetProfile entity) { + this.id = entity.getId(); + this.label = entity.getLabel(); + return this; + } + + @Override + public DatasetProfile toDataModel() throws Exception { + return null; + } + + @Override + public String getHint() { + return null; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java index d35ab490e..d90099384 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java @@ -3,6 +3,7 @@ package eu.eudat.models.data.listingmodels; import eu.eudat.data.entities.DMP; import eu.eudat.logic.utilities.builders.XmlBuilder; import eu.eudat.models.DataModel; +import eu.eudat.models.data.dataset.DatasetOverviewModel; import eu.eudat.models.data.dmp.AssociatedProfile; import eu.eudat.models.data.dmp.Organisation; import eu.eudat.models.data.dmp.Researcher; @@ -30,14 +31,13 @@ public class DataManagementPlanOverviewModel implements DataModel datasets; + private List datasets; private List associatedProfiles; private List researchers; private List users; private String description; - public String getId() { return id; } @@ -101,10 +101,10 @@ public class DataManagementPlanOverviewModel implements DataModel getDatasets() { + public List getDatasets() { return datasets; } - public void setDatasets(List datasets) { + public void setDatasets(List datasets) { this.datasets = datasets; } @@ -160,7 +160,7 @@ public class DataManagementPlanOverviewModel implements DataModel new Organisation().fromDataModel(item)).collect(Collectors.toList()); - this.datasets = entity.getDataset().stream().map(x-> new DatasetUrlListing().fromDataModel(x)).collect(Collectors.toList()); + this.datasets = entity.getDataset().stream().map(x-> new DatasetOverviewModel().fromDataModel(x)).collect(Collectors.toList()); this.users = entity.getUsers().stream().map(x -> new UserInfoListingModel().fromDataModel(x)).collect(Collectors.toList()); this.description = entity.getDescription(); this.researchers = entity.getResearchers().stream().map(item -> new Researcher().fromDataModel(item)).collect(Collectors.toList());