From 868e6886b3a9741c4ab2f8fe6b42fefb0a0407fc Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Tue, 25 Jun 2019 12:40:01 +0300 Subject: [PATCH] Clarifies DMP's finalize filter to not include published ones. --- .../main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java index 7546cc47e..7678b3aec 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java @@ -13,7 +13,6 @@ import eu.eudat.queryable.types.SelectionField; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import schemasMicrosoftComOfficeOffice.LeftDocument; import javax.persistence.criteria.JoinType; import java.util.Arrays; @@ -50,7 +49,7 @@ public class DMPDaoImpl extends DatabaseAccess implements DMPDao { query.where((builder, root) -> root.get("groupId").in(criteria.getGroupIds())); if (criteria.getStatus() != null) { if (criteria.getStatus() == DMP.DMPStatus.FINALISED.getValue()) { - query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.FINALISED.getValue())); + query.where((builder, root) -> builder.and(builder.equal(root.get("status"), DMP.DMPStatus.FINALISED.getValue()), builder.notEqual(root.get("isPublic"), true))); } else if (criteria.getStatus() == DMP.DMPStatus.ACTIVE.getValue()) { query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.ACTIVE.getValue())); } @@ -58,9 +57,9 @@ public class DMPDaoImpl extends DatabaseAccess implements DMPDao { if (criteria.getIsPublic()) query.where(((builder, root) -> builder.equal(root.get("isPublic"), true))); if (criteria.getRole() != null) { - if (criteria.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())){ + if (criteria.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())) { query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).get("role"), UserDMP.UserDMPRoles.OWNER.getValue())); - } else if (criteria.getRole().equals(UserDMP.UserDMPRoles.USER.getValue())){ + } else if (criteria.getRole().equals(UserDMP.UserDMPRoles.USER.getValue())) { query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).get("role"), UserDMP.UserDMPRoles.USER.getValue())); } }