From 650e0ceb06b3c4c0e974918ce2e580bf9caede68 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Mon, 28 Mar 2022 17:02:57 +0300
Subject: [PATCH] #7636: [Bug fix] Copy dataset from latest activity or dataset
 listing: Reverting some changes from commit:b6c28be3b3 1.
 DatasetListingModel.java: Added  field DatasetProfileOverviewModel profile,
 getter/setter and set profile in methods "fromDataModel()" and
 "toDataModel()". 2. RecentActivityModel.java: Added field
 DatasetProfileOverviewModel profile and getter/setter. 3.
 RecentDatasetModel.java: Set profile in methods "fromEntity()" and
 "fromDmpEntity()".

---
 .../dashboard/recent/model/RecentActivityModel.java  |  9 +++++++++
 .../dashboard/recent/model/RecentDatasetModel.java   |  3 +++
 .../data/listingmodels/DatasetListingModel.java      | 12 ++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java
index 10b30b87b..4ea17cd64 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java
@@ -18,6 +18,7 @@ public abstract class RecentActivityModel<T extends DataEntity, S extends DataMo
 	private String grant;
 	private Date finalizedAt;
 	private Date publishedAt;
+	private DatasetProfileOverviewModel profile;
 	private int type;
 	private List<UserInfoListingModel> users;
 	private Boolean isPublic;
@@ -94,6 +95,14 @@ public abstract class RecentActivityModel<T extends DataEntity, S extends DataMo
 		this.publishedAt = publishedAt;
 	}
 
+	public DatasetProfileOverviewModel getProfile() {
+		return profile;
+	}
+
+	public void setProfile(DatasetProfileOverviewModel profile) {
+		this.profile = profile;
+	}
+
 	public int getType() {
 		return type;
 	}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDatasetModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDatasetModel.java
index 58e611a55..2d4e5f553 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDatasetModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDatasetModel.java
@@ -1,6 +1,7 @@
 package eu.eudat.models.data.dashboard.recent.model;
 
 import eu.eudat.data.entities.Dataset;
+import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel;
 import eu.eudat.models.data.listingmodels.UserInfoListingModel;
 
 import java.util.Date;
@@ -37,6 +38,7 @@ public class RecentDatasetModel extends RecentActivityModel<Dataset, RecentDatas
 		this.setVersion(entity.getDmp() != null ? entity.getDmp().getVersion(): 0);
 		this.setFinalizedAt(entity.getFinalizedAt());
 		this.setPublishedAt(entity.getDmp() != null ? entity.getDmp().getPublishedAt() : new Date());
+		this.setProfile(entity.getProfile() != null ? new DatasetProfileOverviewModel().fromDataModel(entity.getProfile()): null);
 		this.setGrant(entity.getDmp() != null ? entity.getDmp().getGrant().getLabel() : "");
 		this.setDmp( entity.getDmp() != null ? entity.getDmp().getLabel() : "");
 		this.setDmpId(entity.getDmp() != null ? entity.getDmp().getId().toString() : "");
@@ -55,6 +57,7 @@ public class RecentDatasetModel extends RecentActivityModel<Dataset, RecentDatas
 		this.setVersion(entity.getDmp() != null ? entity.getDmp().getVersion(): 0);
 		this.setFinalizedAt(entity.getFinalizedAt());
 		this.setPublishedAt(entity.getDmp() != null ? entity.getDmp().getPublishedAt() : new Date());
+		this.setProfile(entity.getProfile() != null ? new DatasetProfileOverviewModel().fromDataModel(entity.getProfile()) : null);
 		this.setGrant(entity.getDmp() != null ? entity.getDmp().getGrant().getLabel() : "");
 		this.setDmp( entity.getDmp() != null ? entity.getDmp().getLabel() : "");
 		this.setDmpId(entity.getDmp() != null ? entity.getDmp().getId().toString() : "");
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 1932b96ea..b2c41e8a9 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
@@ -4,6 +4,7 @@ import eu.eudat.data.entities.DMP;
 import eu.eudat.data.entities.Dataset;
 import eu.eudat.data.entities.Grant;
 import eu.eudat.models.DataModel;
+import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -18,6 +19,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     private String grant;
     private String dmp;
     private String dmpId;
+    private DatasetProfileOverviewModel profile;
     private int status;
     private Date created;
     private Date modified;
@@ -63,6 +65,14 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
         this.dmpId = dmpId;
     }
 
+    public DatasetProfileOverviewModel getProfile() {
+        return profile;
+    }
+
+    public void setProfile(DatasetProfileOverviewModel profile) {
+        this.profile = profile;
+    }
+
     public int getStatus() {
         return status;
     }
@@ -137,6 +147,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 ? new DatasetProfileOverviewModel().fromDataModel(entity.getProfile()) : null;
         this.description = entity.getDescription();
         this.status = entity.getStatus();
         if (entity.getFinalizedAt() == null && entity.getStatus() == Dataset.Status.FINALISED.getValue()) {
@@ -173,6 +184,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
         dmp.setPublic(this.getPublic());
         dmp.setFinalizedAt(this.getFinalizedAt());
         entity.setDmp(dmp);
+        entity.setProfile(this.getProfile() != null ? this.getProfile().toDataModel() : null);
         return entity;
     }