EPMRPP-87044 exclude empty statistics records from processing

reportportal · Oct 30, 2023 · 884ef9c · 884ef9c
1 parent f042158
commit 884ef9c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/...n/java/com/epam/ta/reportportal/dao/widget/healthcheck/content/HealthCheckTableChain.java b/...n/java/com/epam/ta/reportportal/dao/widget/healthcheck/content/HealthCheckTableChain.java
@@ -70,14 +70,14 @@ private List<HealthCheckTableContent> concat(boolean contentFirst,
         result.add(resultEntry);
       });
     } else {
-      columnMapping.forEach((key, attributes) -> {
-        HealthCheckTableContent resultEntry = ofNullable(content.remove(key)).map(
-            statisticsContent -> entryFromStatistics(key,
-                statisticsContent
-            )).orElseGet(HealthCheckTableContent::new);
-        resultEntry.setCustomValues(attributes);
-        result.add(resultEntry);
-      });
+      columnMapping.forEach((key, attributes) ->
+          ofNullable(content.remove(key))
+              .map(statisticsContent -> entryFromStatistics(key, statisticsContent))
+              .ifPresent(resultEntry -> {
+                resultEntry.setCustomValues(attributes);
+                result.add(resultEntry);
+              }));
+
       content.forEach((key, statistics) -> result.add(entryFromStatistics(key, statistics)));
     }
     return result;

diff --git a/src/test/java/com/epam/ta/reportportal/dao/WidgetContentRepositoryTest.java b/src/test/java/com/epam/ta/reportportal/dao/WidgetContentRepositoryTest.java
@@ -1337,7 +1337,7 @@ void componentHealthCheckTable() {
             .of("first", "build", Sort.by(Sort.Direction.DESC, "customColumn"), true,
                 new ArrayList<>()));
 
-    assertFalse(healthCheckTableContents.isEmpty());
+    assertTrue(healthCheckTableContents.isEmpty());
 
     initParams = HealthCheckTableInitParams.of("hello",
         com.google.common.collect.Lists.newArrayList("build"));
@@ -1440,9 +1440,9 @@ void componentHealthCheckTableCompositeAttributeWithoutAny() {
             new ArrayList<>()
         ));
 
-    assertFalse(healthCheckTableContents.isEmpty());
+    assertTrue(healthCheckTableContents.isEmpty());
 
     widgetContentRepository.removeWidgetView(initParams.getViewName());
 
   }
-}
+}