diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java index 8f6800dde..52db574fd 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java @@ -1,17 +1,14 @@ package eu.eudat.models.data.dmp; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.DMPProfile; -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.entities.UserDMP; +import eu.eudat.data.entities.*; import eu.eudat.logic.utilities.builders.XmlBuilder; import eu.eudat.models.DataModel; import eu.eudat.models.data.dynamicfields.DynamicFieldWithValue; import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DataManagementPlanProfile; import eu.eudat.models.data.helpermodels.Tuple; import eu.eudat.models.data.listingmodels.DatasetListingModel; +import eu.eudat.models.data.listingmodels.UserInfoListingModel; import eu.eudat.models.data.project.Project; -import eu.eudat.models.data.userinfo.UserInfo; import eu.eudat.models.data.userinfo.UserListingModel; import net.minidev.json.JSONObject; import org.w3c.dom.Document; @@ -42,11 +39,11 @@ public class DataManagementPlan implements DataModel { private Date created; private List dynamicFields; private Map properties; + private List users; public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -54,7 +51,6 @@ public class DataManagementPlan implements DataModel { public Tuple getProfile() { return profile; } - public void setProfile(Tuple profile) { this.profile = profile; } @@ -62,7 +58,6 @@ public class DataManagementPlan implements DataModel { public String getLabel() { return label; } - public void setLabel(String label) { this.label = label; } @@ -70,7 +65,6 @@ public class DataManagementPlan implements DataModel { public UUID getGroupId() { return groupId; } - public void setGroupId(UUID groupId) { this.groupId = groupId; } @@ -78,7 +72,6 @@ public class DataManagementPlan implements DataModel { public List getAssociatedUsers() { return associatedUsers; } - public void setAssociatedUsers(List associatedUsers) { this.associatedUsers = associatedUsers; } @@ -86,7 +79,6 @@ public class DataManagementPlan implements DataModel { public int getVersion() { return version; } - public void setVersion(int version) { this.version = version; } @@ -94,7 +86,6 @@ public class DataManagementPlan implements DataModel { public List getOrganisations() { return organisations; } - public void setOrganisations(List organizations) { this.organisations = organizations; } @@ -102,7 +93,6 @@ public class DataManagementPlan implements DataModel { public List getResearchers() { return researchers; } - public void setResearchers(List researchers) { this.researchers = researchers; } @@ -110,7 +100,6 @@ public class DataManagementPlan implements DataModel { public int getStatus() { return status; } - public void setStatus(int status) { this.status = status; } @@ -118,7 +107,6 @@ public class DataManagementPlan implements DataModel { public Project getProject() { return project; } - public void setProject(Project project) { this.project = project; } @@ -126,7 +114,6 @@ public class DataManagementPlan implements DataModel { public eu.eudat.models.data.userinfo.UserInfo getCreator() { return creator; } - public void setCreator(eu.eudat.models.data.userinfo.UserInfo creator) { this.creator = creator; } @@ -134,7 +121,6 @@ public class DataManagementPlan implements DataModel { public List getProfiles() { return profiles; } - public void setProfiles(List profiles) { this.profiles = profiles; } @@ -142,7 +128,6 @@ public class DataManagementPlan implements DataModel { public Date getCreated() { return created; } - public void setCreated(Date created) { this.created = created; } @@ -150,7 +135,6 @@ public class DataManagementPlan implements DataModel { public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } @@ -158,7 +142,6 @@ public class DataManagementPlan implements DataModel { public DataManagementPlanProfile getDefinition() { return definition; } - public void setDefinition(DataManagementPlanProfile definition) { this.definition = definition; } @@ -166,7 +149,6 @@ public class DataManagementPlan implements DataModel { public Map getProperties() { return properties; } - public void setProperties(Map properties) { this.properties = properties; } @@ -174,7 +156,6 @@ public class DataManagementPlan implements DataModel { public List getDynamicFields() { return dynamicFields; } - public void setDynamicFields(List dynamicFields) { this.dynamicFields = dynamicFields; } @@ -182,7 +163,6 @@ public class DataManagementPlan implements DataModel { public boolean getLockable() { return lockable; } - public void setLockable(boolean lockable) { this.lockable = lockable; } @@ -190,11 +170,17 @@ public class DataManagementPlan implements DataModel { public List getDatasets() { return datasets; } - public void setDatasets(List datasets) { this.datasets = datasets; } + public List getUsers() { + return users; + } + public void setUsers(List users) { + this.users = users; + } + @Override public DataManagementPlan fromDataModel(DMP entity) { this.id = entity.getId(); @@ -231,12 +217,14 @@ public class DataManagementPlan implements DataModel { this.profiles.add(new AssociatedProfile().fromXml((Element) associatedProfileElement)); } } - } + }*/ } + this.datasets = entity.getDataset().stream().map(item -> new DatasetListingModel().fromDataModel(item)).collect(Collectors.toList()); this.created = entity.getCreated(); this.description = entity.getDescription(); this.status = entity.getStatus(); this.associatedUsers = entity.getUsers().stream().map(item -> new UserListingModel().fromDataModel(item.getUser())).collect(Collectors.toList()); + this.users = entity.getUsers().stream().map(item -> new UserInfoListingModel().fromDataModel(item)).collect(Collectors.toList()); return this; }