Add users on DatasetListingModel
This commit is contained in:
parent
3bf6c2d927
commit
3c18ed4a0c
|
@ -6,7 +6,9 @@ import eu.eudat.models.data.dataset.DataRepository;
|
|||
import eu.eudat.models.data.dataset.Service;
|
||||
import eu.eudat.logic.utilities.helpers.LabelBuilder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
||||
|
@ -29,6 +31,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
|
|||
private Date finalizedAt;
|
||||
private Date dmpPublishedAt;
|
||||
private int version;
|
||||
private List<UserInfoListingModel> users;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
|
@ -156,6 +159,14 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
|
|||
this.version = version;
|
||||
}
|
||||
|
||||
public List<UserInfoListingModel> getUsers() {
|
||||
return users;
|
||||
}
|
||||
|
||||
public void setUsers(List<UserInfoListingModel> users) {
|
||||
this.users = users;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DatasetListingModel fromDataModel(Dataset entity) {
|
||||
this.id = entity.getId() != null ? entity.getId().toString() : "";
|
||||
|
@ -176,6 +187,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
|
|||
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<>();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue