Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

dmp-backend/core/src/main/java/eu/eudat/commons/metrics/MetricLabels.java

@@ -0,0 +1,21 @@
+package eu.eudat.commons.metrics;
+
+public class MetricLabels {
+
+    public static final String DRAFT = "draft";
+
+    public static final String FINALIZED = "finalized";
+
+    public static final String PUBLISHED = "published";
+
+    public static final String DOIED = "doied";
+
+    public static final String ACTIVE = "active";
+
+    public static final String USED = "used";
+
+    public static final String LOGGEDIN = "loggedin";
+
+    public static final String TOTAL = "total";
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/metrics/MetricNames.java

@@ -1,24 +1,28 @@
 package eu.eudat.commons.metrics;
 
 public class MetricNames {
+
     public static final String DATASET_TEMPLATE = "argos_dmp_templates";
+
     public static final String INSTALLATIONS = "installations";
+
     public static final String USERS = "argos_users";
+
     public static final String DMP = "argos_managed_dmps";
+
     public static final String DATASET = "argos_managed_dataset_descriptions";
-    public static final String RESEARCHER = "argos_researchers";
+
-    public static final String PROJECT = "argos_projects";
+    public static final String RESEARCHERS = "argos_researchers";
+
+    public static final String PROJECTS = "argos_projects";
+
     public static final String FUNDERS = "argos_funders";
+
     public static final String GRANTS = "argos_grants";
+
     public static final String LANGUAGES = "argos_languages";
+
     public static final String DMP_WITH_GRANT = "argos_managed_dmps_with_grantid";
-    public static final String DRAFT = "draft";
+
-    public static final String FINALIZED = "finalized";
+    public static final String NEXUS_PREFIX = "nexus_";
-    public static final String PUBLISHED = "published";
-    public static final String DOIED = "doied";
-    public static final String ACTIVE = "active";
-    public static final String USED = "used";
-    public static final String LOGGEDIN = "loggedin";
-    public static final String TOTAL = "total";
-    public static final String NEXUS = "nexus_";
 }

dmp-backend/core/src/main/java/eu/eudat/query/DescriptionQuery.java

@@ -3,17 +3,13 @@ package eu.eudat.query;
 import eu.eudat.authorization.AuthorizationFlags;
 import eu.eudat.authorization.Permission;
 import eu.eudat.commons.enums.DescriptionStatus;
-import eu.eudat.commons.enums.DmpAccessType;
 import eu.eudat.commons.enums.IsActive;
 import eu.eudat.commons.scope.user.UserScope;
 import eu.eudat.data.DescriptionEntity;
 import eu.eudat.data.DmpDescriptionTemplateEntity;
 import eu.eudat.data.DmpEntity;
 import eu.eudat.model.Description;
-import eu.eudat.model.Dmp;
-import eu.eudat.model.DmpDescriptionTemplate;
 import eu.eudat.model.PublicDescription;
-import eu.eudat.query.utils.BuildSubQueryInput;
 import eu.eudat.query.utils.QueryUtilsService;
 import gr.cite.commons.web.authz.service.AuthorizationService;
 import gr.cite.tools.data.query.FieldResolver;
@@ -22,7 +18,6 @@ import gr.cite.tools.data.query.QueryContext;
 import jakarta.persistence.Tuple;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Predicate;
-import jakarta.persistence.criteria.Subquery;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
@@ -33,29 +28,43 @@ import java.util.*;
 @Component
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DescriptionQuery extends QueryBase<DescriptionEntity> {
+
     private String like;
+
     private Collection<UUID> ids;
+
     private Collection<UUID> createdByIds;
-    
+
     private DmpDescriptionTemplateQuery dmpDescriptionTemplateQuery;
+
     private DmpQuery dmpQuery;
+
     private Instant createdAfter;
+
     private Instant createdBefore;
+
     private Instant finalizedAfter;
+
     private Instant finalizedBefore;
+
     private Collection<UUID> excludedIds;
+
     private Collection<IsActive> isActives;
 
     private Collection<DescriptionStatus> statuses;
+
     private Collection<UUID> dmpIds;
 
     private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
 
     private final UserScope userScope;
+
     private final AuthorizationService authService;
+
     private final QueryUtilsService queryUtilsService;
 
     private Collection<UUID> dmpDescriptionTemplateIds;
+
     public DescriptionQuery(UserScope userScope, AuthorizationService authService, QueryUtilsService queryUtilsService) {
         this.userScope = userScope;
         this.authService = authService;
@@ -141,7 +150,7 @@ public class DescriptionQuery extends QueryBase<DescriptionEntity> {
         this.dmpQuery = subQuery;
         return this;
     }
-    
+
     public DescriptionQuery excludedIds(Collection<UUID> values) {
         this.excludedIds = values;
         return this;
@@ -218,15 +227,19 @@ public class DescriptionQuery extends QueryBase<DescriptionEntity> {
 
     @Override
     protected <X, Y> Predicate applyAuthZ(QueryContext<X, Y> queryContext) {
-        if (this.authorize.contains(AuthorizationFlags.None)) return null;
+        if (this.authorize.contains(AuthorizationFlags.None))
-        if (this.authorize.contains(AuthorizationFlags.Permission) && this.authService.authorize(Permission.BrowseDescription)) return null;
+            return null;
+        if (this.authorize.contains(AuthorizationFlags.Permission) && this.authService.authorize(Permission.BrowseDescription))
+            return null;
         UUID userId;
         boolean usePublic = this.authorize.contains(AuthorizationFlags.Public);
-        if (this.authorize.contains(AuthorizationFlags.DmpAssociated)) userId = this.userScope.getUserIdSafe();
+        if (this.authorize.contains(AuthorizationFlags.DmpAssociated))
-        else  userId = null;
+            userId = this.userScope.getUserIdSafe();
+        else
+            userId = null;
 
         List<Predicate> predicates = new ArrayList<>();
-        if (userId != null || usePublic ) {
+        if (userId != null || usePublic) {
             predicates.add(queryContext.CriteriaBuilder.in(queryContext.Root.get(DescriptionEntity._id)).value(queryUtilsService.buildDescriptionAuthZSubQuery(queryContext.Query, queryContext.CriteriaBuilder, userId, usePublic)));
         }
         if (!predicates.isEmpty()) {
@@ -236,7 +249,7 @@ public class DescriptionQuery extends QueryBase<DescriptionEntity> {
             return queryContext.CriteriaBuilder.or(); //Creates a false query
         }
     }
-    
+
     @Override
     protected <X, Y> Predicate applyFilters(QueryContext<X, Y> queryContext) {
         List<Predicate> predicates = new ArrayList<>();
@@ -308,6 +321,7 @@ public class DescriptionQuery extends QueryBase<DescriptionEntity> {
                 inClause.value(item);
             predicates.add(inClause);
         }
+
         if (!predicates.isEmpty()) {
             Predicate[] predicatesArray = predicates.toArray(new Predicate[0]);
             return queryContext.CriteriaBuilder.and(predicatesArray);
@@ -318,27 +332,48 @@ public class DescriptionQuery extends QueryBase<DescriptionEntity> {
 
     @Override
     protected String fieldNameOf(FieldResolver item) {
-        if (item.match(Description._id) || item.match(PublicDescription._id)) return DescriptionEntity._id;
+        if (item.match(Description._id) || item.match(PublicDescription._id))
-        else if (item.match(Description._label) || item.match(PublicDescription._label)) return DescriptionEntity._label;
+            return DescriptionEntity._id;
-        else if (item.prefix(Description._properties)) return DescriptionEntity._properties;
+        else if (item.match(Description._label) || item.match(PublicDescription._label))
-        else if (item.match(Description._status) || item.match(PublicDescription._status)) return DescriptionEntity._status;
+            return DescriptionEntity._label;
-        else if (item.match(Description._description) || item.match(PublicDescription._description)) return DescriptionEntity._description;
+        else if (item.prefix(Description._properties))
-        else if (item.match(Description._createdBy)) return DescriptionEntity._createdById;
+            return DescriptionEntity._properties;
-        else if (item.prefix(Description._createdBy)) return DescriptionEntity._createdById;
+        else if (item.match(Description._status) || item.match(PublicDescription._status))
-        else if (item.match(Description._createdAt) || item.match(PublicDescription._createdAt)) return DescriptionEntity._createdAt;
+            return DescriptionEntity._status;
-        else if (item.match(Description._updatedAt) || item.match(PublicDescription._updatedAt)) return DescriptionEntity._updatedAt;
+        else if (item.match(Description._description) || item.match(PublicDescription._description))
-        else if (item.match(Description._isActive)) return DescriptionEntity._isActive;
+            return DescriptionEntity._description;
-        else if (item.match(Description._hash)) return DescriptionEntity._updatedAt;
+        else if (item.match(Description._createdBy))
-        else if (item.match(Description._finalizedAt) || item.match(PublicDescription._finalizedAt)) return DescriptionEntity._finalizedAt;
+            return DescriptionEntity._createdById;
-        else if (item.prefix(Description._dmpDescriptionTemplate) || item.prefix(PublicDescription._dmpDescriptionTemplate)) return DescriptionEntity._dmpDescriptionTemplateId;
+        else if (item.prefix(Description._createdBy))
-        else if (item.match(Description._dmpDescriptionTemplate) || item.match(PublicDescription._dmpDescriptionTemplate)) return DescriptionEntity._dmpDescriptionTemplateId;
+            return DescriptionEntity._createdById;
-        else if (item.prefix(Description._descriptionTemplate) || item.prefix(PublicDescription._descriptionTemplate)) return DescriptionEntity._descriptionTemplateId;
+        else if (item.match(Description._createdAt) || item.match(PublicDescription._createdAt))
-        else if (item.match(Description._descriptionTemplate) || item.match(PublicDescription._descriptionTemplate)) return DescriptionEntity._descriptionTemplateId;
+            return DescriptionEntity._createdAt;
-        else if (item.prefix(Description._dmp)) return DescriptionEntity._dmpId;
+        else if (item.match(Description._updatedAt) || item.match(PublicDescription._updatedAt))
-        else if (item.match(Description._dmp)) return DescriptionEntity._dmpId;
+            return DescriptionEntity._updatedAt;
-        else if (item.match(Description._belongsToCurrentTenant)) return DescriptionEntity._tenantId;
+        else if (item.match(Description._isActive))
-        else if (item.match(DescriptionEntity._tenantId)) return DescriptionEntity._tenantId;
+            return DescriptionEntity._isActive;
-        else return null;
+        else if (item.match(Description._hash))
+            return DescriptionEntity._updatedAt;
+        else if (item.match(Description._finalizedAt) || item.match(PublicDescription._finalizedAt))
+            return DescriptionEntity._finalizedAt;
+        else if (item.prefix(Description._dmpDescriptionTemplate) || item.prefix(PublicDescription._dmpDescriptionTemplate))
+            return DescriptionEntity._dmpDescriptionTemplateId;
+        else if (item.match(Description._dmpDescriptionTemplate) || item.match(PublicDescription._dmpDescriptionTemplate))
+            return DescriptionEntity._dmpDescriptionTemplateId;
+        else if (item.prefix(Description._descriptionTemplate) || item.prefix(PublicDescription._descriptionTemplate))
+            return DescriptionEntity._descriptionTemplateId;
+        else if (item.match(Description._descriptionTemplate) || item.match(PublicDescription._descriptionTemplate))
+            return DescriptionEntity._descriptionTemplateId;
+        else if (item.prefix(Description._dmp))
+            return DescriptionEntity._dmpId;
+        else if (item.match(Description._dmp))
+            return DescriptionEntity._dmpId;
+        else if (item.match(Description._belongsToCurrentTenant))
+            return DescriptionEntity._tenantId;
+        else if (item.match(DescriptionEntity._tenantId))
+            return DescriptionEntity._tenantId;
+        else
+            return null;
     }
 
     @Override

dmp-backend/core/src/main/java/eu/eudat/query/DescriptionTemplateQuery.java

@@ -8,6 +8,7 @@ import eu.eudat.commons.enums.IsActive;
 import eu.eudat.commons.scope.user.UserScope;
 import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.DmpDescriptionTemplateEntity;
+import eu.eudat.data.DmpEntity;
 import eu.eudat.model.DescriptionTemplate;
 import eu.eudat.query.utils.BuildSubQueryInput;
 import eu.eudat.query.utils.QueryUtilsService;
@@ -50,6 +51,8 @@ public class DescriptionTemplateQuery extends QueryBase<DescriptionTemplateEntit
 
     private Collection<UUID> typeIds;
 
+    private Instant after;
+
     private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
 
     public DescriptionTemplateQuery like(String value) {
@@ -192,6 +195,11 @@ public class DescriptionTemplateQuery extends QueryBase<DescriptionTemplateEntit
         return this;
     }
 
+    public DescriptionTemplateQuery after(Instant value) {
+        this.after = value;
+        return this;
+    }
+
     public DescriptionTemplateQuery authorize(EnumSet<AuthorizationFlags> values) {
         this.authorize = values;
         return this;
@@ -314,6 +322,11 @@ public class DescriptionTemplateQuery extends QueryBase<DescriptionTemplateEntit
                 notInClause.value(item);
             predicates.add(notInClause.not());
         }
+        if (this.after != null) {
+            Predicate afterClause = queryContext.CriteriaBuilder.greaterThanOrEqualTo(queryContext.Root.get(DmpEntity._createdAt), this.after);
+            predicates.add(afterClause);
+        }
+
         if (!predicates.isEmpty()) {
             Predicate[] predicatesArray = predicates.toArray(new Predicate[0]);
             return queryContext.CriteriaBuilder.and(predicatesArray);

dmp-backend/core/src/main/java/eu/eudat/query/DmpDescriptionTemplateQuery.java

@@ -2,14 +2,10 @@ package eu.eudat.query;
 
 import eu.eudat.authorization.AuthorizationFlags;
 import eu.eudat.authorization.Permission;
-import eu.eudat.commons.enums.DmpAccessType;
 import eu.eudat.commons.enums.IsActive;
 import eu.eudat.commons.scope.user.UserScope;
-import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.DmpDescriptionTemplateEntity;
 import eu.eudat.data.DmpEntity;
-import eu.eudat.data.DmpUserEntity;
-import eu.eudat.model.DmpBlueprint;
 import eu.eudat.model.DmpDescriptionTemplate;
 import eu.eudat.model.PublicDmpDescriptionTemplate;
 import eu.eudat.query.utils.QueryUtilsService;
@@ -20,7 +16,6 @@ import gr.cite.tools.data.query.QueryContext;
 import jakarta.persistence.Tuple;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Predicate;
-import jakarta.persistence.criteria.Subquery;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
@@ -44,8 +39,9 @@ public class DmpDescriptionTemplateQuery extends QueryBase<DmpDescriptionTemplat
 
     private Collection<UUID> excludedIds;
 
-    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+    private Instant after;
 
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
 
     public DmpDescriptionTemplateQuery ids(UUID value) {
         this.ids = List.of(value);
@@ -105,8 +101,8 @@ public class DmpDescriptionTemplateQuery extends QueryBase<DmpDescriptionTemplat
     public DmpDescriptionTemplateQuery sectionIds(Collection<UUID> values) {
         this.sectionIds = values;
         return this;
-    }    
+    }
-    
+
     public DmpDescriptionTemplateQuery descriptionTemplateGroupIds(UUID value) {
         this.descriptionTemplateGroupIds = List.of(value);
         return this;
@@ -137,13 +133,20 @@ public class DmpDescriptionTemplateQuery extends QueryBase<DmpDescriptionTemplat
         return this;
     }
 
+    public DmpDescriptionTemplateQuery after(Instant value) {
+        this.after = value;
+        return this;
+    }
+
     public DmpDescriptionTemplateQuery authorize(EnumSet<AuthorizationFlags> values) {
         this.authorize = values;
         return this;
     }
 
     private final UserScope userScope;
+
     private final AuthorizationService authService;
+
     private final QueryUtilsService queryUtilsService;
 
     public DmpDescriptionTemplateQuery(
@@ -165,14 +168,17 @@ public class DmpDescriptionTemplateQuery extends QueryBase<DmpDescriptionTemplat
 
     @Override
     protected <X, Y> Predicate applyAuthZ(QueryContext<X, Y> queryContext) {
-        if (this.authorize.contains(AuthorizationFlags.None)) return null;
+        if (this.authorize.contains(AuthorizationFlags.None))
-        if (this.authorize.contains(AuthorizationFlags.Permission) && this.authService.authorize(Permission.BrowseDmpDescriptionTemplate)) return null;
+            return null;
+        if (this.authorize.contains(AuthorizationFlags.Permission) && this.authService.authorize(Permission.BrowseDmpDescriptionTemplate))
+            return null;
         UUID userId = null;
         boolean usePublic = this.authorize.contains(AuthorizationFlags.Public);
-        if (this.authorize.contains(AuthorizationFlags.DmpAssociated)) userId = this.userScope.getUserIdSafe();
+        if (this.authorize.contains(AuthorizationFlags.DmpAssociated))
+            userId = this.userScope.getUserIdSafe();
 
         List<Predicate> predicates = new ArrayList<>();
-        if (userId != null || usePublic ) {
+        if (userId != null || usePublic) {
             predicates.add(queryContext.CriteriaBuilder.in(queryContext.Root.get(DmpDescriptionTemplateEntity._dmpId)).value(queryUtilsService.buildDmpAuthZSubQuery(queryContext.Query, queryContext.CriteriaBuilder, userId, usePublic)));
         }
         if (!predicates.isEmpty()) {
@@ -182,7 +188,7 @@ public class DmpDescriptionTemplateQuery extends QueryBase<DmpDescriptionTemplat
             return queryContext.CriteriaBuilder.or(); //Creates a false query
         }
     }
-    
+
     @Override
     protected <X, Y> Predicate applyFilters(QueryContext<X, Y> queryContext) {
         List<Predicate> predicates = new ArrayList<>();
@@ -222,6 +228,11 @@ public class DmpDescriptionTemplateQuery extends QueryBase<DmpDescriptionTemplat
                 inClause.value(item);
             predicates.add(inClause);
         }
+        if (this.after != null) {
+            Predicate afterClause = queryContext.CriteriaBuilder.greaterThanOrEqualTo(queryContext.Root.get(DmpEntity._createdAt), this.after);
+            predicates.add(afterClause);
+        }
+
         if (!predicates.isEmpty()) {
             Predicate[] predicatesArray = predicates.toArray(new Predicate[0]);
             return queryContext.CriteriaBuilder.and(predicatesArray);
@@ -246,21 +257,36 @@ public class DmpDescriptionTemplateQuery extends QueryBase<DmpDescriptionTemplat
 
     @Override
     protected String fieldNameOf(FieldResolver item) {
-        if (item.match(DmpDescriptionTemplate._id) || item.match(PublicDmpDescriptionTemplate._id)) return DmpDescriptionTemplateEntity._id;
+        if (item.match(DmpDescriptionTemplate._id) || item.match(PublicDmpDescriptionTemplate._id))
-        else if (item.prefix(DmpDescriptionTemplate._dmp) || item.prefix(PublicDmpDescriptionTemplate._dmp)) return DmpDescriptionTemplateEntity._dmpId;
+            return DmpDescriptionTemplateEntity._id;
-        else if (item.match(DmpDescriptionTemplate._dmp) || item.prefix(PublicDmpDescriptionTemplate._dmp)) return DmpDescriptionTemplateEntity._dmpId;
+        else if (item.prefix(DmpDescriptionTemplate._dmp) || item.prefix(PublicDmpDescriptionTemplate._dmp))
-        else if (item.prefix(DmpDescriptionTemplate._currentDescriptionTemplate)) return DmpDescriptionTemplateEntity._descriptionTemplateGroupId;
+            return DmpDescriptionTemplateEntity._dmpId;
-        else if (item.match(DmpDescriptionTemplate._currentDescriptionTemplate)) return DmpDescriptionTemplateEntity._descriptionTemplateGroupId;
+        else if (item.match(DmpDescriptionTemplate._dmp) || item.prefix(PublicDmpDescriptionTemplate._dmp))
-        else if (item.prefix(DmpDescriptionTemplate._descriptionTemplates)) return DmpDescriptionTemplateEntity._descriptionTemplateGroupId;
+            return DmpDescriptionTemplateEntity._dmpId;
-        else if (item.match(DmpDescriptionTemplate._descriptionTemplates)) return DmpDescriptionTemplateEntity._descriptionTemplateGroupId;
+        else if (item.prefix(DmpDescriptionTemplate._currentDescriptionTemplate))
-        else if (item.match(DmpDescriptionTemplate._sectionId)) return DmpDescriptionTemplateEntity._sectionId;
+            return DmpDescriptionTemplateEntity._descriptionTemplateGroupId;
-        else if (item.match(DmpDescriptionTemplate._descriptionTemplateGroupId)) return DmpDescriptionTemplateEntity._descriptionTemplateGroupId;
+        else if (item.match(DmpDescriptionTemplate._currentDescriptionTemplate))
-        else if (item.match(DmpDescriptionTemplate._hash)) return DmpDescriptionTemplateEntity._updatedAt;
+            return DmpDescriptionTemplateEntity._descriptionTemplateGroupId;
-        else if (item.match(DmpDescriptionTemplate._createdAt)) return DmpDescriptionTemplateEntity._createdAt;
+        else if (item.prefix(DmpDescriptionTemplate._descriptionTemplates))
-        else if (item.match(DmpDescriptionTemplate._updatedAt)) return DmpDescriptionTemplateEntity._updatedAt;
+            return DmpDescriptionTemplateEntity._descriptionTemplateGroupId;
-        else if (item.match(DmpDescriptionTemplate._isActive)) return DmpDescriptionTemplateEntity._isActive;
+        else if (item.match(DmpDescriptionTemplate._descriptionTemplates))
-        else if (item.match(DmpDescriptionTemplate._belongsToCurrentTenant)) return DmpDescriptionTemplateEntity._tenantId;
+            return DmpDescriptionTemplateEntity._descriptionTemplateGroupId;
-        else return null;
+        else if (item.match(DmpDescriptionTemplate._sectionId))
+            return DmpDescriptionTemplateEntity._sectionId;
+        else if (item.match(DmpDescriptionTemplate._descriptionTemplateGroupId))
+            return DmpDescriptionTemplateEntity._descriptionTemplateGroupId;
+        else if (item.match(DmpDescriptionTemplate._hash))
+            return DmpDescriptionTemplateEntity._updatedAt;
+        else if (item.match(DmpDescriptionTemplate._createdAt))
+            return DmpDescriptionTemplateEntity._createdAt;
+        else if (item.match(DmpDescriptionTemplate._updatedAt))
+            return DmpDescriptionTemplateEntity._updatedAt;
+        else if (item.match(DmpDescriptionTemplate._isActive))
+            return DmpDescriptionTemplateEntity._isActive;
+        else if (item.match(DmpDescriptionTemplate._belongsToCurrentTenant))
+            return DmpDescriptionTemplateEntity._tenantId;
+        else
+            return null;
     }
 
 }

dmp-backend/core/src/main/java/eu/eudat/query/DmpQuery.java

@@ -2,21 +2,22 @@ package eu.eudat.query;
 
 import eu.eudat.authorization.AuthorizationFlags;
 import eu.eudat.authorization.Permission;
-import eu.eudat.commons.enums.DmpAccessType;
+import eu.eudat.commons.enums.*;
-import eu.eudat.commons.enums.DmpStatus;
-import eu.eudat.commons.enums.DmpVersionStatus;
-import eu.eudat.commons.enums.IsActive;
 import eu.eudat.commons.scope.user.UserScope;
 import eu.eudat.data.DmpDescriptionTemplateEntity;
 import eu.eudat.data.DmpEntity;
+import eu.eudat.data.DmpReferenceEntity;
 import eu.eudat.data.DmpUserEntity;
 import eu.eudat.model.Dmp;
 import eu.eudat.model.PublicDmp;
 import eu.eudat.query.utils.QueryUtilsService;
 import gr.cite.commons.web.authz.service.AuthorizationService;
-import gr.cite.tools.data.query.*;
+import gr.cite.tools.data.query.FieldResolver;
+import gr.cite.tools.data.query.QueryBase;
+import gr.cite.tools.data.query.QueryContext;
 import jakarta.persistence.Tuple;
-import jakarta.persistence.criteria.*;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Predicate;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
@@ -31,6 +32,7 @@ public class DmpQuery extends QueryBase<DmpEntity> {
     private String like;
 
     private Collection<UUID> ids;
+
     private Collection<UUID> creatorIds;
 
     private Collection<UUID> excludedIds;
@@ -38,22 +40,33 @@ public class DmpQuery extends QueryBase<DmpEntity> {
     private Collection<IsActive> isActives;
 
     private Collection<DmpStatus> statuses;
+
     private Collection<DmpVersionStatus> versionStatuses;
+
     private Collection<DmpAccessType> accessTypes;
 
     private Collection<Integer> versions;
 
     private Collection<UUID> groupIds;
+
+    private Instant after;
+
     private DmpUserQuery dmpUserQuery;
 
     private DmpDescriptionTemplateQuery dmpDescriptionTemplateQuery;
-    
+
+    private DmpReferenceQuery dmpReferenceQuery;
+
+    private EntityDoiQuery entityDoiQuery;
+
     private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
 
     private final UserScope userScope;
+
     private final AuthorizationService authService;
+
     private final QueryUtilsService queryUtilsService;
-    
+
     public DmpQuery(UserScope userScope, AuthorizationService authService, QueryUtilsService queryUtilsService) {
         this.userScope = userScope;
         this.authService = authService;
@@ -200,6 +213,11 @@ public class DmpQuery extends QueryBase<DmpEntity> {
         return this;
     }
 
+    public DmpQuery after(Instant value) {
+        this.after = value;
+        return this;
+    }
+
     public DmpQuery dmpDescriptionTemplateSubQuery(DmpDescriptionTemplateQuery subQuery) {
         this.dmpDescriptionTemplateQuery = subQuery;
         return this;
@@ -210,6 +228,17 @@ public class DmpQuery extends QueryBase<DmpEntity> {
         return this;
     }
 
+    public DmpQuery dmpReferenceSubQuery(DmpReferenceQuery subQuery) {
+        this.dmpReferenceQuery = subQuery;
+        return this;
+    }
+
+    public DmpQuery entityDoiSubQuery(EntityDoiQuery subQuery) {
+        this.entityDoiQuery = subQuery;
+        this.entityDoiQuery.types(EntityType.DMP);
+        return this;
+    }
+
     public DmpQuery authorize(EnumSet<AuthorizationFlags> values) {
         this.authorize = values;
         return this;
@@ -217,7 +246,7 @@ public class DmpQuery extends QueryBase<DmpEntity> {
 
     @Override
     protected Boolean isFalseQuery() {
-        return this.isEmpty(this.ids) || this.isEmpty(this.creatorIds) ||this.isEmpty(this.isActives) || this.isEmpty(this.versionStatuses) || this.isEmpty(this.excludedIds)  || this.isEmpty(this.accessTypes)|| this.isEmpty(this.statuses)|| this.isFalseQuery(this.dmpDescriptionTemplateQuery)|| this.isFalseQuery(this.dmpUserQuery);
+        return this.isEmpty(this.ids) || this.isEmpty(this.creatorIds) || this.isEmpty(this.isActives) || this.isEmpty(this.versionStatuses) || this.isEmpty(this.excludedIds) || this.isEmpty(this.accessTypes) || this.isEmpty(this.statuses) || this.isFalseQuery(this.dmpDescriptionTemplateQuery) || this.isFalseQuery(this.dmpUserQuery);
     }
 
     @Override
@@ -227,19 +256,22 @@ public class DmpQuery extends QueryBase<DmpEntity> {
 
     @Override
     protected <X, Y> Predicate applyAuthZ(QueryContext<X, Y> queryContext) {
-        if (this.authorize.contains(AuthorizationFlags.None)) return null;
+        if (this.authorize.contains(AuthorizationFlags.None))
-        if (this.authorize.contains(AuthorizationFlags.Permission) && this.authService.authorize(Permission.BrowseDmp)) return null;
+            return null;
+        if (this.authorize.contains(AuthorizationFlags.Permission) && this.authService.authorize(Permission.BrowseDmp))
+            return null;
         UUID userId = null;
         boolean usePublic = this.authorize.contains(AuthorizationFlags.Public);
-        if (this.authorize.contains(AuthorizationFlags.DmpAssociated)) userId = this.userScope.getUserIdSafe();
+        if (this.authorize.contains(AuthorizationFlags.DmpAssociated))
-        
+            userId = this.userScope.getUserIdSafe();
+
         List<Predicate> predicates = new ArrayList<>();
-        if (userId != null || usePublic ) {
+        if (userId != null || usePublic) {
             predicates.add(queryContext.CriteriaBuilder.or(
                     usePublic ? queryContext.CriteriaBuilder.and(
-                                queryContext.CriteriaBuilder.equal(queryContext.Root.get(DmpEntity._status),  DmpStatus.Finalized),
+                            queryContext.CriteriaBuilder.equal(queryContext.Root.get(DmpEntity._status), DmpStatus.Finalized),
-                                queryContext.CriteriaBuilder.equal(queryContext.Root.get(DmpEntity._accessType), DmpAccessType.Public)
+                            queryContext.CriteriaBuilder.equal(queryContext.Root.get(DmpEntity._accessType), DmpAccessType.Public)
-                            )
+                    )
                             : queryContext.CriteriaBuilder.or(),  //Creates a false query
                     userId != null ? queryContext.CriteriaBuilder.in(queryContext.Root.get(DmpEntity._id)).value(this.queryUtilsService.buildDmpUserAuthZSubQuery(queryContext.Query, queryContext.CriteriaBuilder, userId)) : queryContext.CriteriaBuilder.or()  //Creates a false query
             ));
@@ -251,7 +283,7 @@ public class DmpQuery extends QueryBase<DmpEntity> {
             return queryContext.CriteriaBuilder.or(); //Creates a false query
         }
     }
-    
+
     @Override
     protected <X, Y> Predicate applyFilters(QueryContext<X, Y> queryContext) {
         List<Predicate> predicates = new ArrayList<>();
@@ -312,6 +344,10 @@ public class DmpQuery extends QueryBase<DmpEntity> {
                 inClause.value(item);
             predicates.add(inClause);
         }
+        if (this.after != null) {
+            Predicate afterClause = queryContext.CriteriaBuilder.greaterThanOrEqualTo(queryContext.Root.get(DmpEntity._createdAt), this.after);
+            predicates.add(afterClause);
+        }
 
         if (this.dmpUserQuery != null) {
             QueryContext<DmpUserEntity, UUID> subQuery = this.applySubQuery(this.dmpUserQuery, queryContext, UUID.class, root -> root.get(DmpUserEntity._dmpId));
@@ -322,6 +358,12 @@ public class DmpQuery extends QueryBase<DmpEntity> {
             QueryContext<DmpDescriptionTemplateEntity, UUID> subQuery = this.applySubQuery(this.dmpDescriptionTemplateQuery, queryContext, UUID.class, dmpDescriptionTemplateEntityRoot -> dmpDescriptionTemplateEntityRoot.get(DmpDescriptionTemplateEntity._dmpId));
             predicates.add(queryContext.CriteriaBuilder.in(queryContext.Root.get(DmpEntity._id)).value(subQuery.Query));
         }
+
+        if (this.dmpReferenceQuery != null) {
+            QueryContext<DmpReferenceEntity, UUID> subQuery = this.applySubQuery(this.dmpReferenceQuery, queryContext, UUID.class, dmpReferenceEntityRoot -> dmpReferenceEntityRoot.get(DmpReferenceEntity._dmpId));
+            predicates.add(queryContext.CriteriaBuilder.in(queryContext.Root.get(DmpEntity._id)).value(subQuery.Query));
+        }
+
         if (!predicates.isEmpty()) {
             Predicate[] predicatesArray = predicates.toArray(new Predicate[0]);
             return queryContext.CriteriaBuilder.and(predicatesArray);
@@ -332,29 +374,52 @@ public class DmpQuery extends QueryBase<DmpEntity> {
 
     @Override
     protected String fieldNameOf(FieldResolver item) {
-        if (item.match(Dmp._id) || item.match(PublicDmp._id)) return DmpEntity._id;
+        if (item.match(Dmp._id) || item.match(PublicDmp._id))
-        else if (item.match(Dmp._label) || item.match(PublicDmp._label)) return DmpEntity._label;
+            return DmpEntity._id;
-        else if (item.match(Dmp._version) || item.match(PublicDmp._version)) return DmpEntity._version;
+        else if (item.match(Dmp._label) || item.match(PublicDmp._label))
-        else if (item.match(Dmp._status)) return DmpEntity._status;
+            return DmpEntity._label;
-        else if (item.match(Dmp._properties)) return DmpEntity._properties;
+        else if (item.match(Dmp._version) || item.match(PublicDmp._version))
-        else if (item.prefix(Dmp._properties)) return DmpEntity._properties;
+            return DmpEntity._version;
-        else if (item.match(Dmp._groupId)) return DmpEntity._groupId;
+        else if (item.match(Dmp._status))
-        else if (item.match(Dmp._description) || item.match(PublicDmp._description)) return DmpEntity._description;
+            return DmpEntity._status;
-        else if (item.match(Dmp._createdAt)) return DmpEntity._createdAt;
+        else if (item.match(Dmp._properties))
-        else if (item.match(Dmp._updatedAt)) return DmpEntity._updatedAt;
+            return DmpEntity._properties;
-        else if (item.match(Dmp._hash)) return DmpEntity._updatedAt;
+        else if (item.prefix(Dmp._properties))
-        else if (item.match(Dmp._isActive) ) return DmpEntity._isActive;
+            return DmpEntity._properties;
-        else if (item.match(Dmp._finalizedAt) || item.match(PublicDmp._finalizedAt)) return DmpEntity._finalizedAt;
+        else if (item.match(Dmp._groupId))
-        else if (item.match(Dmp._accessType)) return DmpEntity._accessType;
+            return DmpEntity._groupId;
-        else if (item.match(Dmp._creator)) return DmpEntity._creatorId;
+        else if (item.match(Dmp._description) || item.match(PublicDmp._description))
-        else if (item.prefix(Dmp._creator)) return DmpEntity._blueprintId;
+            return DmpEntity._description;
-        else if (item.match(Dmp._blueprint)) return DmpEntity._blueprintId;
+        else if (item.match(Dmp._createdAt))
-        else if (item.prefix(Dmp._blueprint)) return DmpEntity._blueprintId;
+            return DmpEntity._createdAt;
-        else if (item.match(Dmp._language)) return DmpEntity._language;
+        else if (item.match(Dmp._updatedAt))
-        else if (item.match(Dmp._publicAfter)) return DmpEntity._publicAfter;
+            return DmpEntity._updatedAt;
-        else if (item.match(Dmp._versionStatus)) return DmpEntity._versionStatus;
+        else if (item.match(Dmp._hash))
-        else if (item.match(Dmp._belongsToCurrentTenant)) return DmpEntity._tenantId;
+            return DmpEntity._updatedAt;
-        else return null;
+        else if (item.match(Dmp._isActive))
+            return DmpEntity._isActive;
+        else if (item.match(Dmp._finalizedAt) || item.match(PublicDmp._finalizedAt))
+            return DmpEntity._finalizedAt;
+        else if (item.match(Dmp._accessType))
+            return DmpEntity._accessType;
+        else if (item.match(Dmp._creator))
+            return DmpEntity._creatorId;
+        else if (item.prefix(Dmp._creator))
+            return DmpEntity._blueprintId;
+        else if (item.match(Dmp._blueprint))
+            return DmpEntity._blueprintId;
+        else if (item.prefix(Dmp._blueprint))
+            return DmpEntity._blueprintId;
+        else if (item.match(Dmp._language))
+            return DmpEntity._language;
+        else if (item.match(Dmp._publicAfter))
+            return DmpEntity._publicAfter;
+        else if (item.match(Dmp._versionStatus))
+            return DmpEntity._versionStatus;
+        else if (item.match(Dmp._belongsToCurrentTenant))
+            return DmpEntity._tenantId;
+        else
+            return null;
     }
 
     @Override

dmp-backend/core/src/main/java/eu/eudat/query/EntityDoiQuery.java

@@ -5,10 +5,9 @@ import eu.eudat.authorization.Permission;
 import eu.eudat.commons.enums.EntityType;
 import eu.eudat.commons.enums.IsActive;
 import eu.eudat.commons.scope.user.UserScope;
-import eu.eudat.data.*;
+import eu.eudat.data.DmpEntity;
-import eu.eudat.model.Dmp;
+import eu.eudat.data.EntityDoiEntity;
 import eu.eudat.model.EntityDoi;
-import eu.eudat.query.utils.BuildSubQueryInput;
 import eu.eudat.query.utils.QueryUtilsService;
 import gr.cite.commons.web.authz.service.AuthorizationService;
 import gr.cite.tools.data.query.FieldResolver;
@@ -17,7 +16,6 @@ import gr.cite.tools.data.query.QueryContext;
 import jakarta.persistence.Tuple;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Predicate;
-import jakarta.persistence.criteria.Subquery;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
@@ -36,12 +34,15 @@ public class EntityDoiQuery extends QueryBase<EntityDoiEntity> {
     private Collection<EntityType> types;
 
     private Collection<UUID> excludedIds;
+
     private Collection<String> repositoryIds;
 
     private Collection<String> dois;
 
     private Collection<UUID> entityIds;
 
+    private Instant after;
+
     private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
 
     public EntityDoiQuery ids(UUID value) {
@@ -149,6 +150,11 @@ public class EntityDoiQuery extends QueryBase<EntityDoiEntity> {
         return this;
     }
 
+    public EntityDoiQuery after(Instant value) {
+        this.after = value;
+        return this;
+    }
+
     public EntityDoiQuery authorize(EnumSet<AuthorizationFlags> values) {
         this.authorize = values;
         return this;
@@ -160,13 +166,11 @@ public class EntityDoiQuery extends QueryBase<EntityDoiEntity> {
 
     private final QueryUtilsService queryUtilsService;
 
-
-
     public EntityDoiQuery(
-		    UserScope userScope, AuthorizationService authService, QueryUtilsService queryUtilsService) {
+            UserScope userScope, AuthorizationService authService, QueryUtilsService queryUtilsService) {
-	    this.userScope = userScope;
+        this.userScope = userScope;
-	    this.authService = authService;
+        this.authService = authService;
-	    this.queryUtilsService = queryUtilsService;
+        this.queryUtilsService = queryUtilsService;
     }
 
     @Override
@@ -176,16 +180,20 @@ public class EntityDoiQuery extends QueryBase<EntityDoiEntity> {
 
     @Override
     protected Boolean isFalseQuery() {
-        return this.isEmpty(this.ids) || this.isEmpty(this.isActives)|| this.isEmpty(this.repositoryIds) || this.isEmpty(this.excludedIds) || this.isEmpty(this.types);
+        return this.isEmpty(this.ids) || this.isEmpty(this.isActives) || this.isEmpty(this.repositoryIds) || this.isEmpty(this.excludedIds) || this.isEmpty(this.types);
     }
 
     @Override
     protected <X, Y> Predicate applyAuthZ(QueryContext<X, Y> queryContext) {
-        if (this.authorize.contains(AuthorizationFlags.None)) return null;
+        if (this.authorize.contains(AuthorizationFlags.None))
-        if (this.authorize.contains(AuthorizationFlags.Permission) && this.authService.authorize(Permission.BrowseUser)) return null;
+            return null;
+        if (this.authorize.contains(AuthorizationFlags.Permission) && this.authService.authorize(Permission.BrowseUser))
+            return null;
         UUID userId;
-        if (this.authorize.contains(AuthorizationFlags.Owner)) userId = this.userScope.getUserIdSafe();
+        if (this.authorize.contains(AuthorizationFlags.Owner))
-        else  userId = null;
+            userId = this.userScope.getUserIdSafe();
+        else
+            userId = null;
 
         List<Predicate> predicates = new ArrayList<>();
         boolean usePublic = this.authorize.contains(AuthorizationFlags.Public);
@@ -240,13 +248,17 @@ public class EntityDoiQuery extends QueryBase<EntityDoiEntity> {
                 inClause.value(item);
             predicates.add(inClause);
         }
-
         if (this.entityIds != null) {
             CriteriaBuilder.In<UUID> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(EntityDoiEntity._entityId));
-            for (UUID item: this.entityIds)  
+            for (UUID item : this.entityIds)
                 inClause.value(item);
             predicates.add(inClause);
         }
+        if (this.after != null) {
+            Predicate afterClause = queryContext.CriteriaBuilder.greaterThanOrEqualTo(queryContext.Root.get(DmpEntity._createdAt), this.after);
+            predicates.add(afterClause);
+        }
+
         if (!predicates.isEmpty()) {
             Predicate[] predicatesArray = predicates.toArray(new Predicate[0]);
             return queryContext.CriteriaBuilder.and(predicatesArray);
@@ -286,7 +298,8 @@ public class EntityDoiQuery extends QueryBase<EntityDoiEntity> {
             return EntityDoiEntity._createdAt;
         else if (item.match(EntityDoi._updatedAt))
             return EntityDoiEntity._updatedAt;
-        else if (item.match(EntityDoi._hash)) return EntityDoiEntity._updatedAt;
+        else if (item.match(EntityDoi._hash))
+            return EntityDoiEntity._updatedAt;
         else if (item.match(EntityDoi._isActive))
             return EntityDoiEntity._isActive;
         else if (item.match(EntityDoi._belongsToCurrentTenant))

dmp-backend/core/src/main/java/eu/eudat/query/ReferenceQuery.java

@@ -2,14 +2,11 @@ package eu.eudat.query;
 
 import eu.eudat.authorization.AuthorizationFlags;
 import eu.eudat.authorization.Permission;
-import eu.eudat.commons.enums.DmpAccessType;
-import eu.eudat.commons.enums.DmpStatus;
 import eu.eudat.commons.enums.IsActive;
 import eu.eudat.commons.enums.ReferenceSourceType;
 import eu.eudat.commons.scope.user.UserScope;
 import eu.eudat.data.DmpEntity;
 import eu.eudat.data.DmpReferenceEntity;
-import eu.eudat.data.DmpUserEntity;
 import eu.eudat.data.ReferenceEntity;
 import eu.eudat.model.PublicReference;
 import eu.eudat.model.Reference;
@@ -44,12 +41,14 @@ public class ReferenceQuery extends QueryBase<ReferenceEntity> {
     private Collection<UUID> typeIds;
 
     private Collection<String> references;
+
     private Collection<String> sources;
 
     private Collection<UUID> excludedIds;
 
-    private DmpReferenceQuery dmpReferenceQuery;
+    private Instant after;
 
+    private DmpReferenceQuery dmpReferenceQuery;
 
     private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
 
@@ -163,6 +162,11 @@ public class ReferenceQuery extends QueryBase<ReferenceEntity> {
         return this;
     }
 
+    public ReferenceQuery after(Instant value) {
+        this.after = value;
+        return this;
+    }
+
     public ReferenceQuery dmpReferenceSubQuery(DmpReferenceQuery value) {
         this.dmpReferenceQuery = value;
         return this;
@@ -172,16 +176,18 @@ public class ReferenceQuery extends QueryBase<ReferenceEntity> {
         this.authorize = values;
         return this;
     }
+
     private final UserScope userScope;
 
     private final AuthorizationService authService;
+
     private final QueryUtilsService queryUtilsService;
 
     public ReferenceQuery(
-		    UserScope userScope, AuthorizationService authService, QueryUtilsService queryUtilsService) {
+            UserScope userScope, AuthorizationService authService, QueryUtilsService queryUtilsService) {
-	    this.userScope = userScope;
+        this.userScope = userScope;
-	    this.authService = authService;
+        this.authService = authService;
-	    this.queryUtilsService = queryUtilsService;
+        this.queryUtilsService = queryUtilsService;
     }
 
     @Override
@@ -191,23 +197,27 @@ public class ReferenceQuery extends QueryBase<ReferenceEntity> {
 
     @Override
     protected Boolean isFalseQuery() {
-        return this.isEmpty(this.ids) || this.isEmpty(this.isActives) || this.isEmpty(this.sources) ||this.isEmpty(this.excludedIds) || this.isEmpty(this.typeIds) || this.isEmpty(this.referenceSourceTypes)|| this.isFalseQuery(this.dmpReferenceQuery);
+        return this.isEmpty(this.ids) || this.isEmpty(this.isActives) || this.isEmpty(this.sources) || this.isEmpty(this.excludedIds) || this.isEmpty(this.typeIds) || this.isEmpty(this.referenceSourceTypes) || this.isFalseQuery(this.dmpReferenceQuery);
     }
 
     @Override
     protected <X, Y> Predicate applyAuthZ(QueryContext<X, Y> queryContext) {
-        if (this.authorize.contains(AuthorizationFlags.None)) return null;
+        if (this.authorize.contains(AuthorizationFlags.None))
-        if (this.authorize.contains(AuthorizationFlags.Permission) && this.authService.authorize(Permission.BrowseReference)) return null;
+            return null;
+        if (this.authorize.contains(AuthorizationFlags.Permission) && this.authService.authorize(Permission.BrowseReference))
+            return null;
         UUID userId;
         boolean usePublic = this.authorize.contains(AuthorizationFlags.Public);
-        if (this.authorize.contains(AuthorizationFlags.DmpAssociated)) userId = this.userScope.getUserIdSafe();
+        if (this.authorize.contains(AuthorizationFlags.DmpAssociated))
-        else  userId = null;
+            userId = this.userScope.getUserIdSafe();
+        else
+            userId = null;
 
         List<Predicate> predicates = new ArrayList<>();
-        if (userId != null || usePublic ) {
+        if (userId != null || usePublic) {
             predicates.add(queryContext.CriteriaBuilder.or(
                     queryContext.CriteriaBuilder.isNull(queryContext.Root.get(ReferenceEntity._createdById)),
-                    userId != null ?  queryContext.CriteriaBuilder.equal(queryContext.Root.get(ReferenceEntity._createdById), userId) : queryContext.CriteriaBuilder.or(),  //Creates a false query
+                    userId != null ? queryContext.CriteriaBuilder.equal(queryContext.Root.get(ReferenceEntity._createdById), userId) : queryContext.CriteriaBuilder.or(),  //Creates a false query
                     queryContext.CriteriaBuilder.in(queryContext.Root.get(ReferenceEntity._id)).value(queryUtilsService.buildSubQuery(new BuildSubQueryInput<>(new BuildSubQueryInput.Builder<>(DmpReferenceEntity.class, UUID.class)
                             .query(queryContext.Query)
                             .criteriaBuilder(queryContext.CriteriaBuilder)
@@ -225,7 +235,7 @@ public class ReferenceQuery extends QueryBase<ReferenceEntity> {
             return queryContext.CriteriaBuilder.or(); //Creates a false query
         }
     }
-    
+
     @Override
     protected <X, Y> Predicate applyFilters(QueryContext<X, Y> queryContext) {
         List<Predicate> predicates = new ArrayList<>();
@@ -277,6 +287,11 @@ public class ReferenceQuery extends QueryBase<ReferenceEntity> {
                 notInClause.value(item);
             predicates.add(notInClause.not());
         }
+        if (this.after != null) {
+            Predicate afterClause = queryContext.CriteriaBuilder.greaterThanOrEqualTo(queryContext.Root.get(DmpEntity._createdAt), this.after);
+            predicates.add(afterClause);
+        }
+
         if (this.dmpReferenceQuery != null) {
             QueryContext<DmpReferenceEntity, UUID> subQuery = this.applySubQuery(this.dmpReferenceQuery, queryContext, UUID.class, root -> root.get(DmpReferenceEntity._referenceId));
             predicates.add(queryContext.CriteriaBuilder.in(queryContext.Root.get(DmpReferenceEntity._id)).value(subQuery.Query));
@@ -311,23 +326,40 @@ public class ReferenceQuery extends QueryBase<ReferenceEntity> {
 
     @Override
     protected String fieldNameOf(FieldResolver item) {
-        if (item.match(Reference._id) || item.match(PublicReference._id)) return ReferenceEntity._id;
+        if (item.match(Reference._id) || item.match(PublicReference._id))
-        else if (item.match(Reference._label) || item.match(PublicReference._label)) return ReferenceEntity._label;
+            return ReferenceEntity._id;
-        else if (item.match(Reference._description) || item.match(PublicReference._description)) return ReferenceEntity._description;
+        else if (item.match(Reference._label) || item.match(PublicReference._label))
-        else if (item.match(Reference._createdAt)) return ReferenceEntity._createdAt;
+            return ReferenceEntity._label;
-        else if (item.match(Reference._updatedAt)) return ReferenceEntity._updatedAt;
+        else if (item.match(Reference._description) || item.match(PublicReference._description))
-        else if (item.match(Reference._hash)) return ReferenceEntity._updatedAt;
+            return ReferenceEntity._description;
-        else if (item.match(Reference._isActive)) return ReferenceEntity._isActive;
+        else if (item.match(Reference._createdAt))
-        else if (item.prefix(Reference._definition)) return ReferenceEntity._definition;
+            return ReferenceEntity._createdAt;
-        else if (item.match(Reference._abbreviation)) return ReferenceEntity._abbreviation;
+        else if (item.match(Reference._updatedAt))
-        else if (item.match(Reference._reference) || item.match(PublicReference._reference)) return ReferenceEntity._reference;
+            return ReferenceEntity._updatedAt;
-        else if (item.match(Reference._source)) return ReferenceEntity._source;
+        else if (item.match(Reference._hash))
-        else if (item.match(Reference._sourceType)) return ReferenceEntity._sourceType;
+            return ReferenceEntity._updatedAt;
-        else if (item.match(Reference._type) || item.match(PublicReference._type)) return ReferenceEntity._typeId;
+        else if (item.match(Reference._isActive))
-        else if (item.prefix(Reference._type) || item.prefix(PublicReference._type)) return ReferenceEntity._typeId;
+            return ReferenceEntity._isActive;
-        else if (item.prefix(Reference._createdBy)) return ReferenceEntity._createdById;
+        else if (item.prefix(Reference._definition))
-        else if (item.prefix(Reference._belongsToCurrentTenant)) return ReferenceEntity._tenantId;
+            return ReferenceEntity._definition;
-        else return null;
+        else if (item.match(Reference._abbreviation))
+            return ReferenceEntity._abbreviation;
+        else if (item.match(Reference._reference) || item.match(PublicReference._reference))
+            return ReferenceEntity._reference;
+        else if (item.match(Reference._source))
+            return ReferenceEntity._source;
+        else if (item.match(Reference._sourceType))
+            return ReferenceEntity._sourceType;
+        else if (item.match(Reference._type) || item.match(PublicReference._type))
+            return ReferenceEntity._typeId;
+        else if (item.prefix(Reference._type) || item.prefix(PublicReference._type))
+            return ReferenceEntity._typeId;
+        else if (item.prefix(Reference._createdBy))
+            return ReferenceEntity._createdById;
+        else if (item.prefix(Reference._belongsToCurrentTenant))
+            return ReferenceEntity._tenantId;
+        else
+            return null;
     }
 
 }

dmp-backend/core/src/main/java/eu/eudat/service/keycloak/MyUsersModule.java

@@ -7,16 +7,13 @@ import org.keycloak.representations.idm.UserRepresentation;
 import java.util.List;
 
 public class MyUsersModule {
+
     private final RealmResource realm;
 
     MyUsersModule(RealmResource realm) {
         this.realm = realm;
     }
 
-    public List<UserRepresentation> getUsers() {
-        return this.realm.users().list();
-    }
-
     public UserRepresentation findUserById(String id) {
         return this.realm.users().get(id).toRepresentation();
     }
@@ -45,6 +42,14 @@ public class MyUsersModule {
         return this.realm.users().get(userId).groups();
     }
 
+    public double getUserSessionsCountByClientId(String clientId) {
+        return this.realm.clients().get(clientId).getUserSessions(0, Integer.MAX_VALUE).size();
+    }
+
+    public double getAllUsersCount() {
+        return this.realm.users().count();
+    }
+
     public void updateUser(String userId, UserRepresentation user) {
         UserRepresentation existing = this.realm.users().get(userId).toRepresentation();
         existing.setFirstName(user.getFirstName());

dmp-backend/core/src/main/java/eu/eudat/service/metrics/MetricsServiceImpl.java

@@ -1,92 +1,326 @@
 package eu.eudat.service.metrics;
 
-import eu.eudat.commons.enums.DmpStatus;
+import eu.eudat.commons.enums.*;
-import eu.eudat.commons.enums.IsActive;
+import eu.eudat.commons.metrics.MetricLabels;
 import eu.eudat.commons.metrics.MetricNames;
+import eu.eudat.data.DmpEntity;
 import eu.eudat.data.TenantEntityManager;
-import eu.eudat.query.DmpQuery;
+import eu.eudat.model.Dmp;
+import eu.eudat.query.*;
+import eu.eudat.service.keycloak.KeycloakService;
+import eu.eudat.service.keycloak.MyKeycloakAdminRestApi;
+import gr.cite.commons.web.keycloak.api.configuration.KeycloakClientProperties;
 import gr.cite.tools.data.query.QueryFactory;
+import gr.cite.tools.fieldset.BaseFieldSet;
+import gr.cite.tools.fieldset.FieldSet;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
 import io.prometheus.client.Gauge;
 import org.springframework.stereotype.Service;
 
 import javax.management.InvalidApplicationException;
+import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Service
 public class MetricsServiceImpl implements MetricsService {
-	private final PrometheusMeterRegistry registry;
-	private final QueryFactory queryFactory;
-	private final TenantEntityManager entityManager;
 
-	public MetricsServiceImpl(PrometheusMeterRegistry registry, QueryFactory queryFactory, TenantEntityManager entityManager) {
+    private final PrometheusMeterRegistry registry;
-		this.registry = registry;
-		this.queryFactory = queryFactory;
-		this.entityManager = entityManager;
-	}
 
-	@Override
+    private final QueryFactory queryFactory;
-	public void calculate(Map<String, Gauge> gauges) throws InvalidApplicationException {
-		try {
-			this.entityManager.disableTenantFilters();
 
-			this.setGauseValue(gauges, MetricNames.DMP, calculateFinalizedDmps(), MetricNames.FINALIZED);
+    private final TenantEntityManager entityManager;
-		}finally {
-			this.entityManager.enableTenantFilters();
-		}
-	}
 
-	@Override
+    private final MyKeycloakAdminRestApi keycloakAdminRestApi;
-	public Map<String, Gauge> gaugesBuild() {
-		registry.clear();
 
-		return Stream.of( new Object[][]{
+    private final UpdateMetricsTaskProperties _config;
-				{MetricNames.DMP, Gauge.build().name(MetricNames.DMP).help("Number of managed DMPs").labelNames("status").register(registry.getPrometheusRegistry())},
-				{MetricNames.NEXUS + MetricNames.DMP, Gauge.build().name(MetricNames.NEXUS + MetricNames.DMP).help("Number of managed DMPs during Nexus").labelNames("status").register(registry.getPrometheusRegistry())},
 
-				{MetricNames.FUNDERS, Gauge.build().name(MetricNames.FUNDERS).help("Number of registered Funders").register(registry.getPrometheusRegistry())},
+    private final KeycloakClientProperties _keycloakConfig;
-				{MetricNames.GRANTS, Gauge.build().name(MetricNames.GRANTS).help("Number of registered Grants").register(registry.getPrometheusRegistry())},
-				{MetricNames.PROJECT, Gauge.build().name(MetricNames.PROJECT).help("Number of registered Projects").register(registry.getPrometheusRegistry())},
-				{MetricNames.RESEARCHER, Gauge.build().name(MetricNames.RESEARCHER).help("Number of Colaborators/Researchers").register(registry.getPrometheusRegistry())},
 
-				{MetricNames.NEXUS + MetricNames.FUNDERS, Gauge.build().name(MetricNames.NEXUS + MetricNames.FUNDERS).help("Number of registered Funders during Nexus").register(registry.getPrometheusRegistry())},
+    public MetricsServiceImpl(
-				{MetricNames.NEXUS + MetricNames.GRANTS, Gauge.build().name(MetricNames.NEXUS + MetricNames.GRANTS).help("Number of registered Grants during Nexus").register(registry.getPrometheusRegistry())},
+            PrometheusMeterRegistry registry,
-				{MetricNames.NEXUS + MetricNames.PROJECT, Gauge.build().name(MetricNames.NEXUS + MetricNames.PROJECT).help("Number of registered Projects during Nexus").register(registry.getPrometheusRegistry())},
+            QueryFactory queryFactory,
-				{MetricNames.NEXUS + MetricNames.RESEARCHER, Gauge.build().name(MetricNames.NEXUS + MetricNames.RESEARCHER).help("Number of Colaborators/Researchers during Nexus").register(registry.getPrometheusRegistry())},
+            TenantEntityManager entityManager,
+            MyKeycloakAdminRestApi keycloakAdminRestApi,
+            UpdateMetricsTaskProperties config, KeycloakClientProperties keycloakConfig) {
+        this.registry = registry;
+        this.queryFactory = queryFactory;
+        this.entityManager = entityManager;
+        this.keycloakAdminRestApi = keycloakAdminRestApi;
+        this._config = config;
+        this._keycloakConfig = keycloakConfig;
+    }
 
-				{MetricNames.DATASET, Gauge.build().name(MetricNames.DATASET).help("Number of managed Dataset Descriptions").labelNames("status").register(registry.getPrometheusRegistry())},
+    @Override
+    public void calculate(Map<String, Gauge> gauges) throws InvalidApplicationException {
+        try {
+            this.entityManager.disableTenantFilters();
 
-				{MetricNames.NEXUS + MetricNames.DATASET, Gauge.build().name(MetricNames.NEXUS + MetricNames.DATASET).help("Number of managed Dataset Descriptions during Nexus").labelNames("status").register(registry.getPrometheusRegistry())},
+			this.setGaugeValue(gauges, MetricNames.DMP, calculateDraftDmps(false), MetricLabels.DRAFT);
+            this.setGaugeValue(gauges, MetricNames.DMP, calculateFinalizedDmps(false), MetricLabels.FINALIZED);
+            this.setGaugeValue(gauges, MetricNames.DMP, calculatePublishedDmps(false), MetricLabels.PUBLISHED);
+            this.setGaugeValue(gauges, MetricNames.DMP, calculateDoiedDmps(false), MetricLabels.DOIED);
 
-				{MetricNames.DATASET_TEMPLATE, Gauge.build().name(MetricNames.DATASET_TEMPLATE).help("Number of dataset Templates").labelNames("status").register(registry.getPrometheusRegistry())},
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculateDraftDmps(true), MetricLabels.DRAFT);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculateFinalizedDmps(true), MetricLabels.FINALIZED);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculatePublishedDmps(true), MetricLabels.PUBLISHED);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculateDoiedDmps(true), MetricLabels.DOIED);
 
-				{MetricNames.NEXUS + MetricNames.DATASET_TEMPLATE, Gauge.build().name(MetricNames.NEXUS + MetricNames.DATASET_TEMPLATE).help("Number of dataset Templates during Nexus").labelNames("status").register(registry.getPrometheusRegistry())},
+            this.setGaugeValue(gauges, MetricNames.DMP, calculateDraftDmpsWithGrant(false), MetricLabels.DRAFT);
+            this.setGaugeValue(gauges, MetricNames.DMP, calculateFinalizedDmpsWithGrant(false), MetricLabels.FINALIZED);
+            this.setGaugeValue(gauges, MetricNames.DMP, calculatePublishedDmpsWithGrant(false), MetricLabels.PUBLISHED);
+            this.setGaugeValue(gauges, MetricNames.DMP, calculateDoiedDmpsWithGrant(false), MetricLabels.DOIED);
 
-				{MetricNames.USERS, Gauge.build().name(MetricNames.USERS).help("Number of users").labelNames("type").register(registry.getPrometheusRegistry())},
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculateDraftDmpsWithGrant(true), MetricLabels.DRAFT);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculateFinalizedDmpsWithGrant(true), MetricLabels.FINALIZED);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculatePublishedDmpsWithGrant(true), MetricLabels.PUBLISHED);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculateDoiedDmpsWithGrant(true), MetricLabels.DOIED);
 
-				{MetricNames.LANGUAGES, Gauge.build().name(MetricNames.LANGUAGES).help("Number of Languages").register(registry.getPrometheusRegistry())},
+            this.setGaugeValue(gauges, MetricNames.FUNDERS, calculateAllFunders(false), null);
+            this.setGaugeValue(gauges, MetricNames.GRANTS, calculateAllGrants(false), null);
+            this.setGaugeValue(gauges, MetricNames.PROJECTS, calculateAllProjects(false), null);
+            this.setGaugeValue(gauges, MetricNames.RESEARCHERS, calculateAllResearchers(false), null);
 
-				{MetricNames.DMP_WITH_GRANT, Gauge.build().name(MetricNames.DMP_WITH_GRANT).help("Number of Grants based on the status of the DMP that is using them").labelNames("status").register(registry.getPrometheusRegistry())},
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.FUNDERS, calculateAllFunders(true), null);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.GRANTS, calculateAllGrants(true), null);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.PROJECTS, calculateAllProjects(true), null);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.RESEARCHERS, calculateAllResearchers(true), null);
 
-				{MetricNames.NEXUS + MetricNames.DMP_WITH_GRANT, Gauge.build().name(MetricNames.NEXUS + MetricNames.DMP_WITH_GRANT).help("Number of Grants based on the status of the DMP that is using them during Nexus").labelNames("status").register(registry.getPrometheusRegistry())},
+            this.setGaugeValue(gauges, MetricNames.DATASET, calculateDraftDatasets(false), MetricLabels.DRAFT);
+            this.setGaugeValue(gauges, MetricNames.DATASET, calculateFinalizedDatasets(false), MetricLabels.FINALIZED);
+            this.setGaugeValue(gauges, MetricNames.DATASET, calculatePublishedDatasets(false), MetricLabels.PUBLISHED);
+            this.setGaugeValue(gauges, MetricNames.DATASET, calculateDoiedDatasets(false), MetricLabels.DOIED);
 
-				{MetricNames.INSTALLATIONS, Gauge.build().name(MetricNames.INSTALLATIONS).help("Number of Installations").register(registry.getPrometheusRegistry())},
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DATASET, calculateDraftDatasets(true), MetricLabels.DRAFT);
-				{MetricNames.NEXUS + MetricNames.INSTALLATIONS, Gauge.build().name(MetricNames.NEXUS + MetricNames.INSTALLATIONS).help("Number of Installations").register(registry.getPrometheusRegistry())},
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DATASET, calculateFinalizedDatasets(true), MetricLabels.FINALIZED);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DATASET, calculatePublishedDatasets(true), MetricLabels.PUBLISHED);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DATASET, calculateDoiedDatasets(true), MetricLabels.DOIED);
 
-		}).collect(Collectors.toMap(data -> (String)data[0], data -> (Gauge) data[1]));
+            this.setGaugeValue(gauges, MetricNames.DATASET_TEMPLATE, calculateDraftTemplates(false), MetricLabels.DRAFT);
-	}
+            this.setGaugeValue(gauges, MetricNames.DATASET_TEMPLATE, calculateFinalizedTemplates(false), MetricLabels.ACTIVE);
-	
+            this.setGaugeValue(gauges, MetricNames.DATASET_TEMPLATE, calculateUsedTemplates(false), MetricLabels.USED);
-	private double calculateFinalizedDmps(){
-		return this.queryFactory.query(DmpQuery.class).statuses(DmpStatus.Finalized).isActive(IsActive.Active).count();
-	}
 
-	private void setGauseValue(Map<String, Gauge> gauges, String name, Double amount, String label) {
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DATASET_TEMPLATE, calculateDraftTemplates(true), MetricLabels.DRAFT);
-		if(label != null) {
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DATASET_TEMPLATE, calculateFinalizedTemplates(true), MetricLabels.ACTIVE);
-			gauges.get(name).labels(label).set(amount);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DATASET_TEMPLATE, calculateUsedTemplates(true), MetricLabels.USED);
-		} else {
+
-			gauges.get(name).set(amount);
+            this.setGaugeValue(gauges, MetricNames.USERS, calculateActiveUsers(), MetricLabels.LOGGEDIN);
-		}
+            this.setGaugeValue(gauges, MetricNames.USERS, calculateAllUsers(), MetricLabels.TOTAL);
-	}
+
+            this.setGaugeValue(gauges, MetricNames.LANGUAGES, calculateLanguages(), null);
+
+            this.setGaugeValue(gauges, MetricNames.INSTALLATIONS, 1d, null);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.INSTALLATIONS, 1d, null);
+        } finally {
+            this.entityManager.enableTenantFilters();
+        }
+    }
+
+    @Override
+    public Map<String, Gauge> gaugesBuild() {
+        registry.clear();
+
+        return Stream.of(new Object[][]{
+                {MetricNames.DMP, Gauge.build().name(MetricNames.DMP).help("Number of managed DMPs").labelNames("status").register(registry.getPrometheusRegistry())},
+                {MetricNames.NEXUS_PREFIX + MetricNames.DMP, Gauge.build().name(MetricNames.NEXUS_PREFIX + MetricNames.DMP).help("Number of managed DMPs during Nexus").labelNames("status").register(registry.getPrometheusRegistry())},
+
+                {MetricNames.FUNDERS, Gauge.build().name(MetricNames.FUNDERS).help("Number of registered Funders").register(registry.getPrometheusRegistry())},
+                {MetricNames.GRANTS, Gauge.build().name(MetricNames.GRANTS).help("Number of registered Grants").register(registry.getPrometheusRegistry())},
+                {MetricNames.PROJECTS, Gauge.build().name(MetricNames.PROJECTS).help("Number of registered Projects").register(registry.getPrometheusRegistry())},
+                {MetricNames.RESEARCHERS, Gauge.build().name(MetricNames.RESEARCHERS).help("Number of Collaborators/Researchers").register(registry.getPrometheusRegistry())},
+
+                {MetricNames.NEXUS_PREFIX + MetricNames.FUNDERS, Gauge.build().name(MetricNames.NEXUS_PREFIX + MetricNames.FUNDERS).help("Number of registered Funders during Nexus").register(registry.getPrometheusRegistry())},
+                {MetricNames.NEXUS_PREFIX + MetricNames.GRANTS, Gauge.build().name(MetricNames.NEXUS_PREFIX + MetricNames.GRANTS).help("Number of registered Grants during Nexus").register(registry.getPrometheusRegistry())},
+                {MetricNames.NEXUS_PREFIX + MetricNames.PROJECTS, Gauge.build().name(MetricNames.NEXUS_PREFIX + MetricNames.PROJECTS).help("Number of registered Projects during Nexus").register(registry.getPrometheusRegistry())},
+                {MetricNames.NEXUS_PREFIX + MetricNames.RESEARCHERS, Gauge.build().name(MetricNames.NEXUS_PREFIX + MetricNames.RESEARCHERS).help("Number of Collaborators/Researchers during Nexus").register(registry.getPrometheusRegistry())},
+
+                {MetricNames.DATASET, Gauge.build().name(MetricNames.DATASET).help("Number of managed Dataset Descriptions").labelNames("status").register(registry.getPrometheusRegistry())},
+                {MetricNames.NEXUS_PREFIX + MetricNames.DATASET, Gauge.build().name(MetricNames.NEXUS_PREFIX + MetricNames.DATASET).help("Number of managed Dataset Descriptions during Nexus").labelNames("status").register(registry.getPrometheusRegistry())},
+
+                {MetricNames.DATASET_TEMPLATE, Gauge.build().name(MetricNames.DATASET_TEMPLATE).help("Number of dataset Templates").labelNames("status").register(registry.getPrometheusRegistry())},
+                {MetricNames.NEXUS_PREFIX + MetricNames.DATASET_TEMPLATE, Gauge.build().name(MetricNames.NEXUS_PREFIX + MetricNames.DATASET_TEMPLATE).help("Number of dataset Templates during Nexus").labelNames("status").register(registry.getPrometheusRegistry())},
+
+                {MetricNames.USERS, Gauge.build().name(MetricNames.USERS).help("Number of users").labelNames("type").register(registry.getPrometheusRegistry())},
+
+                {MetricNames.LANGUAGES, Gauge.build().name(MetricNames.LANGUAGES).help("Number of Languages").register(registry.getPrometheusRegistry())},
+
+                {MetricNames.DMP_WITH_GRANT, Gauge.build().name(MetricNames.DMP_WITH_GRANT).help("Number of Grants based on the status of the DMP that is using them").labelNames("status").register(registry.getPrometheusRegistry())},
+                {MetricNames.NEXUS_PREFIX + MetricNames.DMP_WITH_GRANT, Gauge.build().name(MetricNames.NEXUS_PREFIX + MetricNames.DMP_WITH_GRANT).help("Number of Grants based on the status of the DMP that is using them during Nexus").labelNames("status").register(registry.getPrometheusRegistry())},
+
+                {MetricNames.INSTALLATIONS, Gauge.build().name(MetricNames.INSTALLATIONS).help("Number of Installations").register(registry.getPrometheusRegistry())},
+                {MetricNames.NEXUS_PREFIX + MetricNames.INSTALLATIONS, Gauge.build().name(MetricNames.NEXUS_PREFIX + MetricNames.INSTALLATIONS).help("Number of Installations").register(registry.getPrometheusRegistry())},
+        }).collect(Collectors.toMap(data -> (String) data[0], data -> (Gauge) data[1]));
+    }
+
+    private double calculateDraftDmps(boolean forNexus) {
+        DmpQuery dmpQuery = this.queryFactory.query(DmpQuery.class).statuses(DmpStatus.Draft).isActive(IsActive.Active);
+        if (forNexus)
+            dmpQuery.after(_config.getNexusDate());
+		return dmpQuery.count();
+    }
+
+    private double calculateFinalizedDmps(boolean forNexus) {
+        DmpQuery dmpQuery = this.queryFactory.query(DmpQuery.class).statuses(DmpStatus.Finalized).isActive(IsActive.Active);
+        if (forNexus)
+            dmpQuery.after(_config.getNexusDate());
+        return dmpQuery.count();
+    }
+
+    private double calculatePublishedDmps(boolean forNexus) {
+        DmpQuery dmpQuery = this.queryFactory.query(DmpQuery.class).statuses(DmpStatus.Finalized).accessTypes(DmpAccessType.Public).isActive(IsActive.Active);
+        if (forNexus)
+            dmpQuery.after(_config.getNexusDate());
+        return dmpQuery.count();
+    }
+
+    private double calculateDoiedDmps(boolean forNexus) {
+        DmpQuery dmpQuery = this.queryFactory.query(DmpQuery.class).isActive(IsActive.Active);
+        if (forNexus)
+            dmpQuery.after(_config.getNexusDate());
+        EntityDoiQuery entityDoiQuery = this.queryFactory.query(EntityDoiQuery.class).types(EntityType.DMP).isActive(IsActive.Active);
+        dmpQuery.entityDoiSubQuery(entityDoiQuery);
+        return dmpQuery.count();
+    }
+
+    private double calculateDraftDmpsWithGrant(boolean forNexus) {
+        DmpQuery dmpQuery = this.queryFactory.query(DmpQuery.class).statuses(DmpStatus.Draft).isActive(IsActive.Active);
+        if (forNexus)
+            dmpQuery.after(_config.getNexusDate());
+        ReferenceQuery referenceQuery = this.queryFactory.query(ReferenceQuery.class).typeIds(_config.getReferenceTypes().getGrantIds()).isActive(IsActive.Active);
+        DmpReferenceQuery dmpReferenceQuery = this.queryFactory.query(DmpReferenceQuery.class).referenceSubQuery(referenceQuery).isActives(IsActive.Active);
+        dmpQuery.dmpReferenceSubQuery(dmpReferenceQuery);
+        return dmpQuery.count();
+    }
+
+    private double calculateFinalizedDmpsWithGrant(boolean forNexus) {
+        DmpQuery dmpQuery = this.queryFactory.query(DmpQuery.class).statuses(DmpStatus.Finalized).isActive(IsActive.Active);
+        if (forNexus)
+            dmpQuery.after(_config.getNexusDate());
+        ReferenceQuery referenceQuery = this.queryFactory.query(ReferenceQuery.class).typeIds(_config.getReferenceTypes().getGrantIds()).isActive(IsActive.Active);
+        DmpReferenceQuery dmpReferenceQuery = this.queryFactory.query(DmpReferenceQuery.class).referenceSubQuery(referenceQuery).isActives(IsActive.Active);
+        dmpQuery.dmpReferenceSubQuery(dmpReferenceQuery);
+        return dmpQuery.count();
+    }
+
+    private double calculatePublishedDmpsWithGrant(boolean forNexus) {
+        DmpQuery dmpQuery = this.queryFactory.query(DmpQuery.class).statuses(DmpStatus.Finalized).accessTypes(DmpAccessType.Public).isActive(IsActive.Active);
+        if (forNexus)
+            dmpQuery.after(_config.getNexusDate());
+        ReferenceQuery referenceQuery = this.queryFactory.query(ReferenceQuery.class).typeIds(_config.getReferenceTypes().getGrantIds()).isActive(IsActive.Active);
+        DmpReferenceQuery dmpReferenceQuery = this.queryFactory.query(DmpReferenceQuery.class).referenceSubQuery(referenceQuery).isActives(IsActive.Active);
+        dmpQuery.dmpReferenceSubQuery(dmpReferenceQuery);
+        return dmpQuery.count();
+    }
+
+    private double calculateDoiedDmpsWithGrant(boolean forNexus) {
+        DmpQuery dmpQuery = this.queryFactory.query(DmpQuery.class).isActive(IsActive.Active);
+        if (forNexus)
+            dmpQuery.after(_config.getNexusDate());
+        ReferenceQuery referenceQuery = this.queryFactory.query(ReferenceQuery.class).typeIds(_config.getReferenceTypes().getGrantIds()).isActive(IsActive.Active);
+        DmpReferenceQuery dmpReferenceQuery = this.queryFactory.query(DmpReferenceQuery.class).referenceSubQuery(referenceQuery).isActives(IsActive.Active);
+        dmpQuery.dmpReferenceSubQuery(dmpReferenceQuery);
+        EntityDoiQuery entityDoiQuery = this.queryFactory.query(EntityDoiQuery.class).isActive(IsActive.Active);
+        dmpQuery.entityDoiSubQuery(entityDoiQuery);
+        return dmpQuery.count();
+    }
+
+    private double calculateAllFunders(boolean forNexus) {
+        ReferenceQuery referenceQuery = this.queryFactory.query(ReferenceQuery.class).typeIds(_config.getReferenceTypes().getFunderIds()).isActive(IsActive.Active);
+        if (forNexus)
+            referenceQuery.after(_config.getNexusDate());
+        return referenceQuery.count();
+    }
+
+    private double calculateAllGrants(boolean forNexus) {
+        ReferenceQuery referenceQuery = this.queryFactory.query(ReferenceQuery.class).typeIds(_config.getReferenceTypes().getGrantIds()).isActive(IsActive.Active);
+        if (forNexus)
+            referenceQuery.after(_config.getNexusDate());
+        return referenceQuery.count();
+    }
+
+    private double calculateAllProjects(boolean forNexus) {
+        ReferenceQuery referenceQuery = this.queryFactory.query(ReferenceQuery.class).typeIds(_config.getReferenceTypes().getProjectIds()).isActive(IsActive.Active);
+        if (forNexus)
+            referenceQuery.after(_config.getNexusDate());
+        return referenceQuery.count();
+    }
+
+    private double calculateAllResearchers(boolean forNexus) {
+        ReferenceQuery referenceQuery = this.queryFactory.query(ReferenceQuery.class).typeIds(_config.getReferenceTypes().getResearcherIds()).isActive(IsActive.Active);
+        if (forNexus)
+            referenceQuery.after(_config.getNexusDate());
+        return referenceQuery.count();
+    }
+
+    private double calculateDraftDatasets(boolean forNexus) {
+        DescriptionQuery descriptionQuery = this.queryFactory.query(DescriptionQuery.class).statuses(DescriptionStatus.Draft).isActive(IsActive.Active);
+        if (forNexus)
+            descriptionQuery.createdAfter(_config.getNexusDate());
+        return descriptionQuery.count();
+    }
+
+    private double calculateFinalizedDatasets(boolean forNexus) {
+        DescriptionQuery descriptionQuery = this.queryFactory.query(DescriptionQuery.class).statuses(DescriptionStatus.Finalized).isActive(IsActive.Active);
+        if (forNexus)
+            descriptionQuery.createdAfter(_config.getNexusDate());
+        return descriptionQuery.count();
+    }
+
+    private double calculatePublishedDatasets(boolean forNexus) {
+        DescriptionQuery descriptionQuery = this.queryFactory.query(DescriptionQuery.class).statuses(DescriptionStatus.Finalized).isActive(IsActive.Active);
+        if (forNexus)
+            descriptionQuery.createdAfter(_config.getNexusDate());
+        DmpQuery dmpQuery = this.queryFactory.query(DmpQuery.class).isActive(IsActive.Active).statuses(DmpStatus.Finalized).accessTypes(DmpAccessType.Public);
+        descriptionQuery.dmpSubQuery(dmpQuery);
+        return descriptionQuery.count();
+    }
+
+    private double calculateDoiedDatasets(boolean forNexus) {
+        return 0;
+    }
+
+    private double calculateDraftTemplates(boolean forNexus) {
+        DescriptionTemplateQuery descriptionTemplateQuery = this.queryFactory.query(DescriptionTemplateQuery.class).statuses(DescriptionTemplateStatus.Draft).isActive(IsActive.Active);
+        if (forNexus)
+            descriptionTemplateQuery.after(_config.getNexusDate());
+        return descriptionTemplateQuery.count();
+    }
+
+    private double calculateFinalizedTemplates(boolean forNexus) {
+        DescriptionTemplateQuery descriptionTemplateQuery = this.queryFactory.query(DescriptionTemplateQuery.class).statuses(DescriptionTemplateStatus.Finalized).isActive(IsActive.Active);
+        if (forNexus)
+            descriptionTemplateQuery.after(_config.getNexusDate());
+        return descriptionTemplateQuery.count();
+    }
+
+    private double calculateUsedTemplates(boolean forNexus) {
+        DmpDescriptionTemplateQuery dmpDescriptionTemplateQuery = this.queryFactory.query(DmpDescriptionTemplateQuery.class).isActive(IsActive.Active);
+        dmpDescriptionTemplateQuery.setDistinct(true);
+        if (forNexus)
+            dmpDescriptionTemplateQuery.after(_config.getNexusDate());
+        return dmpDescriptionTemplateQuery.count();
+    }
+
+    private double calculateActiveUsers() {
+        return this.keycloakAdminRestApi.users().getUserSessionsCountByClientId(_keycloakConfig.getClientId());
+    }
+
+    private double calculateAllUsers() {
+        return this.keycloakAdminRestApi.users().getAllUsersCount();
+    }
+
+    private double calculateLanguages() {
+        LanguageQuery languageQuery = this.queryFactory.query(LanguageQuery.class).isActive(IsActive.Active);
+        return languageQuery.count();
+    }
+
+    private void setGaugeValue(Map<String, Gauge> gauges, String name, Double amount, String label) {
+        if (label != null) {
+            gauges.get(name).labels(label).set(amount);
+        } else {
+            gauges.get(name).set(amount);
+        }
+    }
 }

dmp-backend/core/src/main/java/eu/eudat/service/metrics/UpdateMetricsTaskProperties.java

@@ -1,27 +1,96 @@
 package eu.eudat.service.metrics;
 
-
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+import java.time.Instant;
+import java.util.List;
+import java.util.UUID;
+
 @ConfigurationProperties(prefix = "metrics.task")
 public class UpdateMetricsTaskProperties {
-	private boolean enable;
-	private int intervalSeconds;
 
-	public boolean getEnable() {
+    private boolean enable;
-		return enable;
-	}
 
-	public void setEnable(boolean enable) {
+    private int intervalSeconds;
-		this.enable = enable;
-	}
 
-	public int getIntervalSeconds() {
+	private Instant nexusDate;
-		return intervalSeconds;
+
-	}
+    private ReferenceTypesProperties referenceTypes;
+
+    public boolean getEnable() {
+        return enable;
+    }
+
+    public int getIntervalSeconds() {
+        return intervalSeconds;
+    }
+
+    public Instant getNexusDate() {
+        return nexusDate;
+    }
+
+    public ReferenceTypesProperties getReferenceTypes() {
+        return referenceTypes;
+    }
+
+    public void setEnable(boolean enable) {
+        this.enable = enable;
+    }
+
+    public void setIntervalSeconds(int intervalSeconds) {
+        this.intervalSeconds = intervalSeconds;
+    }
+
+    public void setNexusDate(Instant nexusDate) {
+        this.nexusDate = nexusDate;
+    }
+
+    public void setReferenceTypes(ReferenceTypesProperties referenceTypes) {
+        this.referenceTypes = referenceTypes;
+    }
+
+    public static class ReferenceTypesProperties {
+
+        private List<UUID> funderIds;
+
+        private List<UUID> grantIds;
+
+        private List<UUID> projectIds;
+
+        private List<UUID> researcherIds;
+
+        public List<UUID> getFunderIds() {
+            return funderIds;
+        }
+
+        public List<UUID> getGrantIds() {
+            return grantIds;
+        }
+
+        public List<UUID> getProjectIds() {
+            return projectIds;
+        }
+
+        public List<UUID> getResearcherIds() {
+            return researcherIds;
+        }
+
+        public void setFunderIds(List<UUID> funderIds) {
+            this.funderIds = funderIds;
+        }
+
+        public void setGrantIds(List<UUID> grantIds) {
+            this.grantIds = grantIds;
+        }
+
+        public void setProjectIds(List<UUID> projectIds) {
+            this.projectIds = projectIds;
+        }
+
+        public void setResearcherIds(List<UUID> researcherIds) {
+            this.researcherIds = researcherIds;
+        }
+    }
 
-	public void setIntervalSeconds(int intervalSeconds) {
-		this.intervalSeconds = intervalSeconds;
-	}
 }
 

dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/GlobalExceptionHandler.java

@@ -50,7 +50,11 @@ public class GlobalExceptionHandler {
 				case ERROR:
 					logger.error(message, e);
 					break;
+				default:
+					logger.error(e);
 			}
+		} else {
+			logger.error(e);
 		}
 	}
 

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

@@ -1,6 +1,7 @@
 package eu.eudat.logic.managers;
 
 import eu.eudat.commons.enums.DescriptionTemplateStatus;
+import eu.eudat.commons.metrics.MetricLabels;
 import eu.eudat.commons.metrics.MetricNames;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
 import io.prometheus.client.Gauge;
@@ -29,8 +30,8 @@ public class MetricsManager {
     private final Map<String, Gauge> gauges;
 
     public static final Map<Short, String> datasetTemplateStatus = Stream.of(new Object[][] {
-            { DescriptionTemplateStatus.Draft.getValue(), MetricNames.DRAFT },
+            { DescriptionTemplateStatus.Draft.getValue(), MetricLabels.DRAFT },
-            { DescriptionTemplateStatus.Finalized.getValue(), MetricNames.ACTIVE },
+            { DescriptionTemplateStatus.Finalized.getValue(), MetricLabels.ACTIVE },
     }).collect(Collectors.toMap(data -> (Short) data[0], data -> (String) data[1]));
 
     public void increaseValue(String name, int amount,  String label) {

dmp-backend/web/src/main/resources/config/metrics.yml

@@ -2,6 +2,12 @@ metrics:
   task:
     enable: true
     intervalSeconds: 600
+    nexusDate: "2021-01-01T00:00:00.00Z"
+    referenceTypes:
+      funderIds: ["538928bb-c7c6-452e-b66d-08e539f5f082"]
+      grantIds: ["5b9c284f-f041-4995-96cc-fad7ad13289c"]
+      projectIds: ["3d372db5-a456-45e6-a845-e41e1a8311f8"]
+      researcherIds: ["5a2112e7-ea99-4cfe-98a1-68665e26726e"]
 management:
   endpoint:
     metrics:
@@ -13,7 +19,7 @@ management:
     web:
       base-path: /
       exposure:
-        include: ["prometheus","health","metrics" ]
+        include: ["prometheus","health","metrics"]
   
   metrics:
     enabled: true