From b7b8e0b0e8be2b572a546391aa7faa66f9518a19 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Fri, 24 Jul 2020 11:46:11 +0300
Subject: [PATCH] Change the profile from DatasetListingModel from String to
 DatasetProfileOverviewModel

---
 .../models/data/listingmodels/DatasetListingModel.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 fab2747d7..667c7ebb2 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
@@ -5,6 +5,7 @@ import eu.eudat.models.DataModel;
 import eu.eudat.models.data.dataset.DataRepository;
 import eu.eudat.models.data.dataset.Service;
 import eu.eudat.logic.utilities.helpers.LabelBuilder;
+import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -18,7 +19,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     private String grant;
     private String dmp;
     private String dmpId;
-    private String profile;
+    private DatasetProfileOverviewModel profile;
     private String dataRepositories;
     private String registries;
     private String services;
@@ -70,10 +71,11 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
         this.dmpId = dmpId;
     }
 
-    public String getProfile() {
+    public DatasetProfileOverviewModel getProfile() {
         return profile;
     }
-    public void setProfile(String profile) {
+
+    public void setProfile(DatasetProfileOverviewModel profile) {
         this.profile = profile;
     }
 
@@ -194,7 +196,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
         this.grant = entity.getDmp() != 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 ? entity.getProfile().getLabel() : "";
+        this.profile = entity.getProfile() != null ? new DatasetProfileOverviewModel().fromDataModel(entity.getProfile()) : null;
         this.description = entity.getDescription();
         this.status = entity.getStatus();
         this.grantAbbreviation = entity.getDmp() != null ? entity.getDmp().getGrant().getAbbreviation() : "";