From 27e9e2ac973262e607ba30109d1536959e61ecf3 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Wed, 28 Aug 2019 16:20:55 +0300
Subject: [PATCH] Fixes bug not adding Creation User on new Grant.

---
 .../eu/eudat/logic/managers/DataManagementPlanManager.java     | 2 +-
 .../eudat/models/data/dmp/DataManagementPlanEditorModel.java   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 308d10a5d..b91015455 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -430,8 +430,8 @@ public class DataManagementPlanManager {
 
         createOrganisationsIfTheyDontExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getOrganisationDao());
         createResearchersIfTheyDontExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getResearcherDao());
-        createGrantIfItDoesntExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getGrantDao());
         createFunderIfItDoesntExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getFunderDao());
+        createGrantIfItDoesntExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getGrantDao());
         if (newDmp.getProject().getLabel() == null || newDmp.getProject().getLabel().trim().isEmpty()) {
             newDmp.setProject(newDmp.getProject().projectFromGrant(newDmp.getGrant()));
         }
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 86ed120b7..6ed6ba302 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
@@ -288,6 +288,9 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
                 grant.setStatus(Grant.Status.ACTIVE.getValue());
                 grant.setModified(new Date());
                 grant.setDescription(this.grant.getDescription());
+                UserInfo userInfo = new UserInfo();
+                userInfo.setId(this.users.stream().filter(userInfoListingModel -> ((Integer) userInfoListingModel.getRole()).equals(UserDMP.UserDMPRoles.OWNER.getValue())).findFirst().get().getId());
+                grant.setCreationUser(userInfo);
 
                 dataManagementPlanEntity.setGrant(grant);
             }