From f93b6103e98eb7fbb73060b110bde6b3bc8031c4 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Tue, 24 Sep 2019 12:28:13 +0300
Subject: [PATCH] Adds ordering on Published Dataset Descriptions listing
 (descending by published date). (Issue #174)

---
 .../java/eu/eudat/logic/managers/DatasetManager.java     | 3 +++
 .../models/data/listingmodels/DatasetListingModel.java   | 9 +++++++++
 .../src/app/core/model/dataset/dataset-listing.ts        | 1 +
 .../explore-dataset-listing-item.component.html          | 2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
index 6ba300157..ab7ff1f5e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
@@ -141,6 +141,9 @@ public class DatasetManager {
             } else
                 items.where((builder, root) -> root.get("id").in(new UUID[]{UUID.randomUUID()}));
         }
+        String[] strings = new String[1];
+        strings[0] = "-dmp:publishedAt|join|";
+        datasetTableRequest.getOrderings().setFields(strings);
         QueryableList<eu.eudat.data.entities.Dataset> pagedItems = PaginationManager.applyPaging(items, datasetTableRequest);
         DataTableData<DatasetListingModel> dataTable = new DataTableData<>();
 
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 6aac4b997..d1cd16647 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
@@ -27,6 +27,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     private String grantAbbreviation;
     private String grantId;
     private Date finalizedAt;
+    private Date dmpPublishedAt;
 
     public String getId() {
         return id;
@@ -140,6 +141,13 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
         this.finalizedAt = finalizedAt;
     }
 
+    public Date getDmpPublishedAt() {
+        return dmpPublishedAt;
+    }
+    public void setDmpPublishedAt(Date dmpPublishedAt) {
+        this.dmpPublishedAt = dmpPublishedAt;
+    }
+
     @Override
     public DatasetListingModel fromDataModel(Dataset entity) {
         this.id = entity.getId().toString();
@@ -158,6 +166,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
         this.dataRepositories = LabelBuilder.getLabel(entity.getDatasetDataRepositories().stream().map(item -> new DataRepository().fromDataModel(item.getDataRepository())).collect(Collectors.toList()));
         this.services = LabelBuilder.getLabel(entity.getServices().stream().map(item -> new Service().fromDataModel(item.getService())).collect(Collectors.toList()));
         this.finalizedAt = entity.getFinalizedAt();
+        this.dmpPublishedAt = entity.getDmp().getPublishedAt();
         return this;
     }
 
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 80e0f931e..1776ab9be 100644
--- a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
+++ b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
@@ -15,4 +15,5 @@ export interface DatasetListingModel {
 	created: Date;
 	modified: Date;
 	finalizedAt: Date;
+	dmpPublishedAt?: Date;
 }
diff --git a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.html b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.html
index 1c8b1ac04..4be537f20 100644
--- a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.html
+++ b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.html
@@ -32,7 +32,7 @@
 				<div class="pt-1">
 					<div matTooltip="{{ dataset.profile }}" class="chip ml-2 mr-2">{{ dataset.profile }}</div>
 				</div>
-				<p>{{'DATASET-LISTING.COLUMNS.PUBLISHED' | translate}} {{dataset.created | date: "shortDate"}}</p>
+				<p>{{'DATASET-LISTING.COLUMNS.PUBLISHED' | translate}} {{dataset.dmpPublishedAt | date: "shortDate"}}</p>
 			</div>
 		</div>
 		<!-- <div class="info">