Exclude collection projects from portfolio metrics calculation to not…

… wrongly influence numbers Signed-off-by: Ralf King <[email protected]>
DependencyTrack · Apr 22, 2024 · 26ed8b6 · 26ed8b6
1 parent b6d04ba
commit 26ed8b6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/org/dependencytrack/tasks/metrics/PortfolioMetricsUpdateTask.java b/src/main/java/org/dependencytrack/tasks/metrics/PortfolioMetricsUpdateTask.java
@@ -168,10 +168,12 @@ private void updateMetrics() throws Exception {
 
     private List<Project> fetchNextActiveProjectsPage(final PersistenceManager pm, final Long lastId) throws Exception {
         try (final Query<Project> query = pm.newQuery(Project.class)) {
+            // exclude collection projects since their numbers are included in other projects and would wrongly influence portfolio metrics.
             if (lastId == null) {
-                query.setFilter("(active == null || active == true)");
+                query.setFilter("(active == null || active == true) && (collectionLogic == null || collectionLogic == 'NONE')");
             } else {
-                query.setFilter("(active == null || active == true) && id < :lastId");
+                query.setFilter("(active == null || active == true) && (collectionLogic == null || collectionLogic == 'NONE') " +
+                        "&& id < :lastId");
                 query.setParameters(lastId);
             }
             query.setOrdering("id DESC");