2 files changed, 52 insertions, 11 deletions
diff --git a/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueIndex.java
index 9235bc57b1a..6b2c826f2c9 100644
--- a/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueIndex.java
+++ b/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueIndex.java
@@ -871,7 +871,7 @@ public class IssueIndex {
     if (newCodeOnReference != null) {
       filters.addFilter(
         FIELD_ISSUE_NEW_CODE_REFERENCE, new SimpleFieldFilterScope(FIELD_ISSUE_NEW_CODE_REFERENCE),
-        termQuery(FIELD_ISSUE_NEW_CODE_REFERENCE, true));
+        termQuery(FIELD_ISSUE_NEW_CODE_REFERENCE, newCodeOnReference));
     }
   }
 
diff --git a/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueQueryFactory.java b/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueQueryFactory.java
index a8c4216b14f..f1d99c660b3 100644
--- a/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueQueryFactory.java
+++ b/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueQueryFactory.java
@@ -31,6 +31,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -45,6 +46,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.sonar.api.issue.impact.SoftwareQuality;
 import org.sonar.db.component.ComponentQualifiers;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.core.rule.RuleType;
@@ -69,6 +71,8 @@ import static java.lang.String.format;
 import static java.util.Collections.singleton;
 import static java.util.Collections.singletonList;
 import static org.sonar.api.issue.Issue.STATUSES;
+import static org.sonar.api.issue.Issue.STATUS_CONFIRMED;
+import static org.sonar.api.issue.Issue.STATUS_OPEN;
 import static org.sonar.api.issue.Issue.STATUS_REVIEWED;
 import static org.sonar.api.issue.Issue.STATUS_TO_REVIEW;
 import static org.sonar.api.measures.CoreMetrics.ANALYSIS_FROM_SONARQUBE_9_4_KEY;
@@ -181,6 +185,39 @@ public class IssueQueryFactory {
     }
   }
 
+  public IssueQuery openIssueCountBySeverity(
+    String projectUuid,
+    String branchUuid,
+    String componentUuid,
+    boolean isMainBranch,
+    boolean newCode,
+    SoftwareQuality softwareQuality
+  ) {
+    var timeZone = clock.getZone();
+
+    var types = EnumSet.complementOf(EnumSet.of(RuleType.SECURITY_HOTSPOT))
+      .stream()
+      .map(RuleType::name)
+      .toList();
+
+    var query = IssueQuery.builder()
+      .branchUuid(branchUuid)
+      .mainBranch(isMainBranch)
+      .issueStatuses(List.of(STATUS_OPEN, STATUS_CONFIRMED))
+      .impactSoftwareQualities(List.of(softwareQuality.name()))
+      .projectUuids(List.of(projectUuid))
+      .timeZone(timeZone)
+      .types(types);
+
+    if (newCode) {
+      try (DbSession dbSession = dbClient.openSession(false)) {
+        setInNewCodePeriod(dbSession, query, componentUuid);
+      }
+    }
+
+    return query.build();
+  }
+
   private Collection<String> collectIssueKeys(DbSession dbSession, SearchRequest request) {
     Collection<String> issueKeys = null;
     if (request.getFixedInPullRequest() != null) {
@@ -269,18 +306,22 @@ public class IssueQueryFactory {
       ComponentDto component = componentUuids.iterator().next();
 
       if (!QUALIFIERS_WITHOUT_LEAK_PERIOD.contains(component.qualifier()) && request.getPullRequest() == null) {
-        Optional<SnapshotDto> snapshot = getLastAnalysis(dbSession, component);
-        if (!snapshot.isEmpty() && isLastAnalysisFromReAnalyzedReferenceBranch(dbSession, snapshot.get())) {
-          builder.newCodeOnReference(true);
-          return;
-        }
-        // if last analysis has no period date, then no issue should be considered new.
-        Date createdAfterFromSnapshot = findCreatedAfterFromComponentUuid(snapshot);
-        setCreatedAfterFromDates(builder, createdAfterFromSnapshot, null, false);
+        setInNewCodePeriod(dbSession, builder, component.uuid());
       }
     }
   }
 
+  private void setInNewCodePeriod(DbSession dbSession, IssueQuery.Builder builder, String componentUuid) {
+    Optional<SnapshotDto> snapshot = getLastAnalysis(dbSession, componentUuid);
+    if (!snapshot.isEmpty() && isLastAnalysisFromReAnalyzedReferenceBranch(dbSession, snapshot.get())) {
+      builder.newCodeOnReference(true);
+      return;
+    }
+    // if last analysis has no period date, then no issue should be considered new.
+    Date createdAfterFromSnapshot = findCreatedAfterFromComponentUuid(snapshot);
+    setCreatedAfterFromDates(builder, createdAfterFromSnapshot, null, false);
+  }
+
   private static boolean notInNewCodePeriod(SearchRequest request) {
     Boolean inNewCodePeriod = request.getInNewCodePeriod();
     inNewCodePeriod = Boolean.TRUE.equals(inNewCodePeriod);
@@ -301,8 +342,8 @@ public class IssueQueryFactory {
       .isPresent();
   }
 
-  private Optional<SnapshotDto> getLastAnalysis(DbSession dbSession, ComponentDto component) {
-    return dbClient.snapshotDao().selectLastAnalysisByComponentUuid(dbSession, component.uuid());
+  private Optional<SnapshotDto> getLastAnalysis(DbSession dbSession, String componentUuid) {
+    return dbClient.snapshotDao().selectLastAnalysisByComponentUuid(dbSession, componentUuid);
   }
 
   private List<SnapshotDto> getLastAnalysis(DbSession dbSession, Set<String> projectUuids) {