MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

add missing grant checks

This commit is contained in:
Bernaldo Mihasi 2023-09-21 10:20:32 +03:00
parent b68070aa01
commit 79aaf23bb6
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DatasetOverviewModel.java
View File

@ -118,7 +118,9 @@ public class DatasetOverviewModel implements DataModel<Dataset, DatasetOverviewM
this.datasetTemplate = new DatasetProfileOverviewModel().fromDataModel(entity.getProfile());
this.users = entity.getDmp().getUsers().stream().map(x -> new UserInfoListingModel().fromDataModel(x)).collect(Collectors.toList());
this.dmp = new DataManagementPlanOverviewModel().fromDataModel(entity.getDmp());
this.grant = new GrantOverviewModel().fromDataModel(entity.getDmp().getGrant());
if (entity.getDmp().getGrant() != null) {
this.grant = new GrantOverviewModel().fromDataModel(entity.getDmp().getGrant());
}
this.description = entity.getDescription();
this.isPublic = entity.getDmp().isPublic();
this.modified = entity.getModified();

8
dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
View File

@ -232,10 +232,12 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
this.version = entity.getVersion();
this.groupId = this.groupId == null ? null : entity.getGroupId();
this.label = entity.getLabel();
this.grant = new GrantDMPEditorModel();
this.properties = entity.getProperties() != null ? new org.json.JSONObject(entity.getProperties()).toMap() : null;
this.grant.getExistGrant().fromDataModel(entity.getGrant());
this.grant.getExistGrant().setSource("");
if (entity.getGrant() != null) {
this.grant = new GrantDMPEditorModel();
this.grant.getExistGrant().fromDataModel(entity.getGrant());
this.grant.getExistGrant().setSource("");
}
this.creator = new eu.eudat.models.data.userinfo.UserInfo();
this.groupId = entity.getGroupId();
this.lockable = entity.getDataset().stream().findAny().isPresent();

2
dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java
View File

@ -144,7 +144,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
this.label = entity.getLabel();
this.created = entity.getCreated();
this.modified = entity.getModified();
this.grant = entity.getDmp() != null ? entity.getDmp().getGrant().getLabel() : "";
this.grant = (entity.getDmp() != null && entity.getDmp().getGrant() != null) ? entity.getDmp().getGrant().getLabel() : "";
this.dmp = entity.getDmp() != null ? entity.getDmp().getLabel() : "";
this.dmpId = entity.getDmp() != null ? entity.getDmp().getId().toString() : "";
this.profile = entity.getProfile() != null ? new DatasetProfileOverviewModel().fromDataModel(entity.getProfile()) : null;

4
dmp-backend/web/src/main/java/eu/eudat/publicapi/models/listingmodels/DataManagementPlanPublicListingModel.java
View File

@ -126,7 +126,9 @@ public class DataManagementPlanPublicListingModel implements DataModel<DMP, Data
public DataManagementPlanPublicListingModel fromDataModelNoDatasets(DMP entity) {
this.fromDataModel(entity);
this.version = entity.getVersion();
this.grant = entity.getGrant().getLabel();
if (entity.getGrant() != null) {
this.grant = entity.getGrant().getLabel();
}
this.createdAt = entity.getCreated();
this.modifiedAt = entity.getModified();
try {

4
dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DataManagementPlanPublicModel.java
View File

@ -176,7 +176,9 @@ public class DataManagementPlanPublicModel implements DataModel<DMP, DataManagem
public DataManagementPlanPublicModel fromDataModelDatasets(DMP entity) {
this.fromDataModel(entity);
this.version = entity.getVersion();
this.grant = new GrantPublicOverviewModel().fromDataModel(entity.getGrant());
if (entity.getGrant() != null) {
this.grant = new GrantPublicOverviewModel().fromDataModel(entity.getGrant());
}
if (entity.getProfile() != null) this.profile = entity.getProfile().getLabel();
this.createdAt = entity.getCreated();
this.modifiedAt = entity.getModified();