Fixes bug on Dataset Description listing, fetching extra wrong items when "Member" criteria was selected.

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDao.java

@@ -6,13 +6,14 @@ import eu.eudat.data.entities.Dataset;
 import eu.eudat.data.entities.UserInfo;
 import eu.eudat.queryable.QueryableList;
 
+import java.util.List;
 import java.util.UUID;
 
 public interface DatasetDao extends DatabaseAccessLayer<Dataset, UUID> {
 
     QueryableList<Dataset> getWithCriteria(DatasetCriteria criteria);
 
-    QueryableList<Dataset> getAuthenticated(QueryableList<Dataset> query, UserInfo principal);
+    QueryableList<Dataset> getAuthenticated(QueryableList<Dataset> query, UserInfo principal, List<Integer> roles);
 
     Dataset isPublicDataset(UUID id);
 

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java

@@ -13,8 +13,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
+import javax.persistence.criteria.Join;
 import javax.persistence.criteria.JoinType;
 import java.util.Arrays;
+import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
@@ -87,9 +89,13 @@ public class DatasetDaoImpl extends DatabaseAccess<Dataset> implements DatasetDa
     }
 
     @Override
-    public QueryableList<Dataset> getAuthenticated(QueryableList<Dataset> query, UserInfo principal) {
+    public QueryableList<Dataset> getAuthenticated(QueryableList<Dataset> query, UserInfo principal, List<Integer> roles) {
-        if (principal.getId() == null) query.where((builder, root) -> builder.equal(root.get("isPublic"), true));
+        if (roles != null && !roles.isEmpty()) {
-        else {
+            query.where((builder, root) -> {
+                Join userJoin = root.join("dmp", JoinType.LEFT).join("users", JoinType.LEFT);
+                return builder.and(builder.equal(userJoin.join("user", JoinType.LEFT).get("id"), principal.getId()), userJoin.get("role").in(roles));
+            });
+        } else {
             query.where((builder, root) -> builder.equal(root.join("dmp", JoinType.LEFT).join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id"), principal.getId()));
         }
         return query;

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java

@@ -80,7 +80,7 @@ public class DashBoardManager {
         List<Integer> roles = new LinkedList<>();
         CompletableFuture dmpFuture = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria), principal.getId(), roles).countAsync()
                 .whenComplete((dmpsStats, throwable) -> statistics.setTotalDataManagementPlanCount(dmpsStats));
-        CompletableFuture datasetFuture = datasetRepository.getAuthenticated(datasetRepository.getWithCriteria(datasetCriteria), user).countAsync()
+        CompletableFuture datasetFuture = datasetRepository.getAuthenticated(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));
@@ -113,7 +113,7 @@ public class DashBoardManager {
                 .selectAsync(item -> recentActivityDataBuilder.label(item.getLabel()).timestamp(item.getModified()).id(item.getId().toString()).build())
                 .whenComplete((dmpActivities, throwable) -> activity.setRecentDmpActivities(dmpActivities));
 
-        CompletableFuture<List<RecentActivityData>> datasets = datasetRepository.getAuthenticated(datasetRepository.getWithCriteria(datasetCriteria), user)
+        CompletableFuture<List<RecentActivityData>> datasets = datasetRepository.getAuthenticated(datasetRepository.getWithCriteria(datasetCriteria), user, roles)
                 .withHint("datasetRecentActivity")
                 .orderBy((builder, root) -> builder.desc(root.get("modified")))
                 .take(numberofactivities)
@@ -149,7 +149,7 @@ public class DashBoardManager {
                 .selectAsync(item -> new SearchBarItem(item.getId().toString(), item.getLabel(), SearchBarItemType.DMP.getValue()))
                 .whenComplete((dmpItems, throwable) -> searchBarItems.addAll(dmpItems));
 
-        CompletableFuture<List<SearchBarItem>> datasets = datasetRepository.getAuthenticated(datasetRepository.asQueryable(), user)
+        CompletableFuture<List<SearchBarItem>> datasets = datasetRepository.getAuthenticated(datasetRepository.asQueryable(), user, roles)
                 .withHint("datasetRecentActivity")
                 .where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + like.toUpperCase() + "%"))
                 .where((builder, root) -> builder.notEqual(root.get("status"), Dataset.Status.DELETED.getValue()))

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java

@@ -109,7 +109,9 @@ public class DatasetManager {
             } else
                 items.where((builder, root) -> root.get("id").in(new UUID[]{UUID.randomUUID()}));
         }
-        QueryableList<eu.eudat.data.entities.Dataset> authItems = databaseRepository.getDatasetDao().getAuthenticated(items, userInfo);
+        List<Integer> roles = new LinkedList<>();
+        if (datasetTableRequest.getCriteria().getRole() != null) roles.add(datasetTableRequest.getCriteria().getRole());
+        QueryableList<eu.eudat.data.entities.Dataset> authItems = databaseRepository.getDatasetDao().getAuthenticated(items, userInfo, roles);
         QueryableList<eu.eudat.data.entities.Dataset> pagedItems = PaginationManager.applyPaging(authItems, datasetTableRequest);
         DataTableData<DatasetListingModel> dataTable = new DataTableData<DatasetListingModel>();