From 3e7747455cb605fe226a4d8c3e69f118ad46d6f2 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Mon, 22 Apr 2019 13:45:36 +0300
Subject: [PATCH] Adds dmpId on Dataset Response.

---
 .../listingmodels/DatasetListingModel.java    | 20 +++++++++----------
 .../app/core/model/dataset/dataset-listing.ts |  1 +
 2 files changed, 10 insertions(+), 11 deletions(-)

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 4c063f97f..6fe36fcb4 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
@@ -15,6 +15,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     private String label;
     private String project;
     private String dmp;
+    private String dmpId;
     private String profile;
     private String dataRepositories;
     private String registries;
@@ -26,7 +27,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     public String getId() {
         return id;
     }
-
     public void setId(String id) {
         this.id = id;
     }
@@ -34,7 +34,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     public String getLabel() {
         return label;
     }
-
     public void setLabel(String label) {
         this.label = label;
     }
@@ -42,7 +41,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     public String getProject() {
         return project;
     }
-
     public void setProject(String project) {
         this.project = project;
     }
@@ -50,15 +48,20 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     public String getDmp() {
         return dmp;
     }
-
     public void setDmp(String dmp) {
         this.dmp = dmp;
     }
 
+    public String getDmpId() {
+        return dmpId;
+    }
+    public void setDmpId(String dmpId) {
+        this.dmpId = dmpId;
+    }
+
     public String getProfile() {
         return profile;
     }
-
     public void setProfile(String profile) {
         this.profile = profile;
     }
@@ -66,7 +69,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     public String getDataRepositories() {
         return dataRepositories;
     }
-
     public void setDataRepositories(String dataRepositories) {
         this.dataRepositories = dataRepositories;
     }
@@ -74,7 +76,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     public String getRegistries() {
         return registries;
     }
-
     public void setRegistries(String registries) {
         this.registries = registries;
     }
@@ -82,7 +83,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     public String getServices() {
         return services;
     }
-
     public void setServices(String services) {
         this.services = services;
     }
@@ -90,7 +90,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     public int getStatus() {
         return status;
     }
-
     public void setStatus(int status) {
         this.status = status;
     }
@@ -98,7 +97,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     public Date getCreated() {
         return created;
     }
-
     public void setCreated(Date created) {
         this.created = created;
     }
@@ -106,7 +104,6 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     public String getDescription() {
         return description;
     }
-
     public void setDescription(String description) {
         this.description = description;
     }
@@ -118,6 +115,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
         this.created = entity.getCreated();
         this.project = entity.getDmp().getProject().getLabel();
         this.dmp = entity.getDmp() != null ? entity.getDmp().getLabel() : "";
+        this.dmpId = entity.getDmp() != null ? entity.getDmp().getId().toString() : "";
         this.profile = entity.getProfile() != null ? entity.getProfile().getLabel() : "";
         this.description = entity.getDescription();
         this.status = entity.getStatus();
diff --git a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
index b1b07caed..23b8182b4 100644
--- a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
+++ b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
@@ -2,6 +2,7 @@ export interface DatasetListingModel {
 	id: String;
 	label: String;
 	dmp: String;
+	dmpId: String;
 	project: String;
 	profile: String;
 	dataRepositories: String;