From 79aaf23bb6526f4e74643689759e0e79fcbf5b8e Mon Sep 17 00:00:00 2001
From: Aldo Mihasi <amihasi@cite-sa.gr>
Date: Thu, 21 Sep 2023 10:20:32 +0300
Subject: [PATCH] add missing grant checks

---
 .../eudat/models/data/dataset/DatasetOverviewModel.java   | 4 +++-
 .../models/data/dmp/DataManagementPlanEditorModel.java    | 8 +++++---
 .../models/data/listingmodels/DatasetListingModel.java    | 2 +-
 .../DataManagementPlanPublicListingModel.java             | 4 +++-
 .../overviewmodels/DataManagementPlanPublicModel.java     | 4 +++-
 5 files changed, 15 insertions(+), 7 deletions(-)

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
index 78e00c7ef..4091988ae 100644
--- 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
@@ -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();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
index 29ffb6e00..a15cd0c4f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
@@ -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();
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 b2c41e8a9..1b6e8f34b 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
@@ -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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/listingmodels/DataManagementPlanPublicListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/listingmodels/DataManagementPlanPublicListingModel.java
index 074212935..c5e90e6b1 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/listingmodels/DataManagementPlanPublicListingModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/listingmodels/DataManagementPlanPublicListingModel.java
@@ -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 {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DataManagementPlanPublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DataManagementPlanPublicModel.java
index 082396359..fb71677c5 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DataManagementPlanPublicModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DataManagementPlanPublicModel.java
@@ -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();