From f59881d7aa8a12071a71c158efd193bb6621ffce Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Tue, 8 Oct 2019 10:58:02 +0300
Subject: [PATCH] Makes Funder a mandatory entity. (Issue #182)

---
 .../controllers/QuickWizardController.java      | 13 ++++++-------
 .../data/dmp/DataManagementPlanEditorModel.java | 17 ++++++++---------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java
index 044700940..adedfcb4f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java
@@ -44,10 +44,12 @@ public class QuickWizardController extends BaseController {
 
         Funder funderEntity;
         //Create Funder
-        if (quickWizard.getFunder().getExistFunder() == null
-                && quickWizard.getFunder().getLabel() == null) {
-            funderEntity = null;
-        } else if (quickWizard.getFunder().getExistFunder() == null && quickWizard.getFunder().getLabel() != null){
+        if (quickWizard.getFunder() == null) {
+            throw new Exception("Funder is a mandatory entity");
+        } else if (quickWizard.getFunder().getExistFunder() == null && quickWizard.getFunder().getLabel() == null) {
+            // funderEntity = null;
+            throw new Exception("Funder is a mandatory entity");
+        } else if (quickWizard.getFunder().getExistFunder() == null && quickWizard.getFunder().getLabel() != null) {
             funderEntity = this.quickWizardManager.createOrUpdate(quickWizard.getFunder().toDataFunder(), principal);
         } else {
             funderEntity = quickWizard.getFunder().getExistFunder().toDataModel();
@@ -90,8 +92,6 @@ public class QuickWizardController extends BaseController {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<QuickWizardModel>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created"));
     }
 
-
-
     @RequestMapping(method = RequestMethod.POST, value = {"/datasetcreate"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
     ResponseEntity<ResponseItem<DatasetCreateWizardModel>> addDatasetWizard(@RequestBody DatasetCreateWizardModel datasetCreateWizardModel, Principal principal) throws Exception{
@@ -101,5 +101,4 @@ public class QuickWizardController extends BaseController {
 
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetCreateWizardModel>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Dataset added!"));
     }
-
 }
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 cd886dfff..8a9d283e9 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,13 +293,13 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
             }
         }
 
-        if(this.funder == null && this.funder.getExistFunder() == null && this.funder.getLabel() == null) {
-            dataManagementPlanEntity.getGrant().setFunder(null);
-        }
-        else if (this.funder != null && this.funder.getExistFunder() == null && this.funder.getLabel() == null) {
-            dataManagementPlanEntity.getGrant().setFunder(null);
-        }
-        else {
+        if (this.funder == null) {
+            // dataManagementPlanEntity.getGrant().setFunder(null);
+            throw new Exception("Funder is a mandatory entity");
+        } else if (this.funder.getExistFunder() == null && this.funder.getLabel() == null) {
+            // dataManagementPlanEntity.getGrant().setFunder(null);
+            throw new Exception("Funder is a mandatory entity");
+        } else {
             if (this.funder.getLabel() != null) {
                 Funder funder = new Funder();
                 funder.setLabel(this.funder.getLabel());
@@ -311,8 +311,7 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
                 funder.setModified(new Date());
 
                 dataManagementPlanEntity.getGrant().setFunder(funder);
-            }
-            else if (this.funder.getExistFunder() != null && this.funder.getLabel() == null){
+            } else if (this.funder.getExistFunder() != null && this.funder.getLabel() == null){
                 dataManagementPlanEntity.getGrant().setFunder(this.funder.getExistFunder().toDataModel());
                 dataManagementPlanEntity.getGrant().getFunder().setType(Funder.FunderType.EXTERNAL.getValue());
             }