From bca715d52becd63de88522d171ef434880d4afdd Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Tue, 27 Aug 2019 17:00:09 +0300
Subject: [PATCH] Fixes bug on not storing Funder Id on Grant table.

---
 .../data/src/main/java/eu/eudat/data/entities/Funder.java | 6 ++++--
 .../eudat/logic/managers/DataManagementPlanManager.java   | 7 +++++--
 .../models/data/dmp/DataManagementPlanEditorModel.java    | 2 +-
 .../src/main/java/eu/eudat/models/data/grant/Grant.java   | 2 +-
 .../main/java/eu/eudat/models/data/project/Project.java   | 8 ++++----
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Funder.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Funder.java
index d66162494..2b6bce8b1 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Funder.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Funder.java
@@ -154,10 +154,12 @@ public class Funder implements DataEntity<Funder, UUID> {
 	@Override
 	public void update(Funder entity) {
 		this.label = entity.getLabel();
-		this.created = entity.getCreated();
+		this.reference = entity.getReference();
 		this.definition = entity.getDefinition();
-		this.modified = new Date();
 		this.status = entity.getStatus();
+		this.created = entity.getCreated();
+		this.modified = new Date();
+		this.type = entity.getType();
 	}
 
 	@Override
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 c9890d1c0..b52a44429 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
@@ -457,11 +457,14 @@ public class DataManagementPlanManager {
 
         if (newDmp.getGrant().getId() != null) {
             Grant grant = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().find(newDmp.getGrant().getId());
-            if ( !grant.getFunder().getId().equals(newDmp.getGrant().getFunder().getId()) && !newDmp.getGrant().getCreationUser().getId().equals(user.getId())){
-                throw new Exception("User is not the owner of the Grant therefore, cannot edit it");
+            if (grant.getFunder() != null
+                    && !grant.getFunder().getId().equals(newDmp.getGrant().getFunder().getId())
+                    && !grant.getCreationUser().getId().equals(user.getId())){
+                throw new Exception("User is not the owner of the Grant, therefore, cannot edit it");
             }
         }
 
+        apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().createOrUpdate(newDmp.getGrant());
         newDmp = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(newDmp);
 
         // Dataset manipulation for when the DMP is set to be finalized.
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 30ac3a10a..a0d73dc83 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
@@ -293,7 +293,7 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
             }
         }
 
-        if (this.funder != null) {
+        if (this.funder != null && this.funder.getExistFunder() != null) {
             if (this.funder.getExistFunder() != null && this.funder.getLabel() == null)
                 dataManagementPlanEntity.getGrant().setFunder(this.funder.getExistFunder().toDataModel());
             else {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java
index f6f009d4a..2cb1d6b0c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java
@@ -198,8 +198,8 @@ public class Grant implements DataModel<eu.eudat.data.entities.Grant, Grant> {
         entity.setStatus(this.status != null ? this.getStatus() : eu.eudat.data.entities.Grant.Status.ACTIVE.getValue());
         entity.setModified(new Date());
         entity.setDescription(this.description);
-        entity.setFunder(new Funder());
         if (this.funderId != null) {
+            entity.setFunder(new Funder());
             entity.getFunder().setId(this.funderId);
         }
 
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java
index 7b238e0db..61474faaa 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java
@@ -22,7 +22,7 @@ public class Project implements DataModel<eu.eudat.data.entities.Project, Projec
 	private String definition;
 	private Date startDate;
 	private Date endDate;
-	private eu.eudat.data.entities.Project.Status status;
+	private Short status;
 	private UserInfo creationUser;
 	private Date created;
 	private Date modified;
@@ -99,11 +99,11 @@ public class Project implements DataModel<eu.eudat.data.entities.Project, Projec
 		this.endDate = endDate;
 	}
 
-	public short getStatus() {
-		return status.getValue();
+	public Short getStatus() {
+		return status;
 	}
 	public void setStatus(Short status) {
-		this.status = eu.eudat.data.entities.Project.Status.fromInteger(status);
+		this.status = status;
 	}
 
 	public UserInfo getCreationUser() {