From 734dc94f264f087087079aa0859d7097c2236876 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 5 Apr 2022 15:27:58 +0300
Subject: [PATCH] Change Dataset sorting on DMP overview and editor from last
 modified to last created

---
 .../logic/managers/DataManagementPlanManager.java      |  4 ++--
 .../models/data/dataset/DatasetOverviewModel.java      | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

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 dc4322711..dafa1fa10 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
@@ -291,7 +291,7 @@ public class DataManagementPlanManager {
         if (includeDatasets) {
             dataManagementPlan.fromDataModel(dataManagementPlanEntity);
             dataManagementPlan.getDatasets().forEach(datasetWizardModel -> datasetWizardModel.setDescription(null));
-            dataManagementPlan.setDatasets(dataManagementPlan.getDatasets().stream().sorted(Comparator.comparing(DatasetWizardModel::getModified).reversed()).collect(Collectors.toList()));
+            dataManagementPlan.setDatasets(dataManagementPlan.getDatasets().stream().sorted(Comparator.comparing(DatasetWizardModel::getCreated).reversed()).collect(Collectors.toList()));
             //List<Dataset> datasetEnities = new ArrayList<>(dataManagementPlanEntity.getDataset());
         /*for (int i = 0; i < datasetEnities.size(); i++) {
             for (int j = i; j < dataManagementPlan.getDatasets().size(); j++) {
@@ -343,7 +343,7 @@ public class DataManagementPlanManager {
         }
         DataManagementPlanOverviewModel datamanagementPlan = new DataManagementPlanOverviewModel();
         datamanagementPlan.fromDataModelDatasets(dataManagementPlanEntity);
-        datamanagementPlan.setDatasets(datamanagementPlan.getDatasets().stream().sorted(Comparator.comparing(DatasetOverviewModel::getModified).reversed()).collect(Collectors.toList()));
+        datamanagementPlan.setDatasets(datamanagementPlan.getDatasets().stream().sorted(Comparator.comparing(DatasetOverviewModel::getCreated).reversed()).collect(Collectors.toList()));
         if (isPublic) {
             datamanagementPlan.setDatasets(datamanagementPlan.getDatasets().stream().filter(dataset -> dataset.getStatus() == Dataset.Status.FINALISED.getValue()).collect(Collectors.toList()));
         }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DatasetOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DatasetOverviewModel.java
index 2ef2aeba1..78e00c7ef 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DatasetOverviewModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DatasetOverviewModel.java
@@ -24,6 +24,7 @@ public class DatasetOverviewModel implements DataModel<Dataset, DatasetOverviewM
     private String description;
     private Boolean isPublic;
     private Date modified;
+    private Date created;
 
     public UUID getId() {
         return id;
@@ -101,6 +102,14 @@ public class DatasetOverviewModel implements DataModel<Dataset, DatasetOverviewM
         this.modified = modified;
     }
 
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
     @Override
     public DatasetOverviewModel fromDataModel(Dataset entity) {
         this.id = entity.getId();
@@ -113,6 +122,7 @@ public class DatasetOverviewModel implements DataModel<Dataset, DatasetOverviewM
         this.description = entity.getDescription();
         this.isPublic = entity.getDmp().isPublic();
         this.modified = entity.getModified();
+        this.created = entity.getCreated();
 
         return this;
     }