From 3b09bef7d543b2084a00cf4869d8851639943ea2 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Fri, 24 Jul 2020 12:38:16 +0300
Subject: [PATCH] Fixed minor issues with the elastic search on recent activity

---
 .../java/eu/eudat/logic/managers/DashBoardManager.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java
index e4da1164f..d3c662182 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java
@@ -137,10 +137,10 @@ public class DashBoardManager {
 
         List<Integer> roles = new LinkedList<>();
         List<Dmp> finalDmps = dmps;
-        CompletableFuture dmpFuture = dataManagementPlanRepository.getAuthenticated(dmps != null ? dataManagementPlanRepository.asQueryable().where((builder, root) -> root.get("id").in(finalDmps.stream().map(Dmp::getId).collect(Collectors.toList()))) : dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria), principal.getId(), roles).distinct().countAsync()
+        CompletableFuture dmpFuture = dataManagementPlanRepository.getAuthenticated((dmps != null && !dmps.isEmpty()) ? dataManagementPlanRepository.asQueryable().where((builder, root) -> root.get("id").in(finalDmps.stream().map(Dmp::getId).collect(Collectors.toList()))) : dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria), principal.getId(), roles).distinct().countAsync()
                                                                   .whenComplete((dmpsStats, throwable) -> statistics.setTotalDataManagementPlanCount(dmpsStats));
         List<eu.eudat.elastic.entities.Dataset> finalDatasets = datasets;
-        CompletableFuture datasetFuture = datasetRepository.getAuthenticated(datasets != null ? datasetRepository.asQueryable().where((builder, root) -> root.get("id").in(finalDatasets.stream().map(x -> UUID.fromString(x.getId())).collect(Collectors.toList()))) : datasetRepository.getWithCriteria(datasetCriteria), user, roles).countAsync()
+        CompletableFuture datasetFuture = datasetRepository.getAuthenticated((datasets != null && !datasets.isEmpty()) ? datasetRepository.asQueryable().where((builder, root) -> root.get("id").in(finalDatasets.stream().map(x -> UUID.fromString(x.getId())).collect(Collectors.toList()))) : datasetRepository.getWithCriteria(datasetCriteria), user, roles).countAsync()
                                                            .whenComplete((datasetsStats, throwable) -> statistics.setTotalDataSetCount(datasetsStats));
         CompletableFuture grantFuture = grantRepository.getAuthenticated(grantRepository.getWithCriteria(grantCriteria), user).countAsync()
                 .whenComplete((grantsStats, throwable) -> statistics.setTotalGrantCount(grantsStats));
@@ -241,14 +241,14 @@ public class DashBoardManager {
             }
         }
 
-        if (dmps != null) {
+        if (dmps != null && !dmps.isEmpty()) {
             List<Dmp> finalDmps = dmps;
             dmpList = dataManagementPlanRepository.asQueryable().where((builder, root) -> root.get("id").in(finalDmps.stream().map(Dmp::getId).collect(Collectors.toList()))).distinct();
         } else {
             dmpList = dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria).distinct();
         }
 
-        if (datasets != null) {
+        if (datasets != null  && !datasets.isEmpty()) {
             List<eu.eudat.elastic.entities.Dataset> finalDatasets = datasets;
             datasetList = datasetRepository.asQueryable().where((builder, root) -> root.get("id").in(finalDatasets.stream().map(x -> UUID.fromString(x.getId())).collect(Collectors.toList())));
         } else {