optimization

Author: siewer

src/main/java/io/mixeway/api/dashboard/service/DashboardService.java

@@ -27,6 +27,7 @@
 import io.mixeway.utils.Status;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.parameters.P;
@@ -35,6 +36,8 @@
 
 import java.security.Principal;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
 @Service
@@ -146,19 +149,42 @@ private List<VulnResponse> setVulnsForVulnName(String search) {
     public ResponseEntity<DashboardTopStatistics> getRootStatistics(Principal principal) {
         DashboardTopStatistics dashboardTopStatistics = new DashboardTopStatistics();
 
-        List<ProjectVulnerability> projectVulnerabilities = vulnTemplate.projectVulnerabilityRepository.getLatestVulnerabilitiesForProjects(permissionFactory.getProjectForPrincipal(principal));
+        // Fetch projects for the principal
+        List<Project> projects = permissionFactory.getProjectForPrincipal(principal);
 
-        StatisticCard statisticCard = new StatisticCard(
-          findProjectService.count(),
-          getScanNumberService.getNumberOfScansRunning(),
-          getScanNumberService.getNumberOfScansInQueue(),
-          vulnTemplate.projectVulnerabilityRepository.countVulns()
-        );
-        dashboardTopStatistics.setStatisticCard(statisticCard);
-        dashboardTopStatistics.setProjectVulnerabilityList(projectVulnerabilities.stream().limit(5).collect(Collectors.toList()));
-        return new ResponseEntity<>(dashboardTopStatistics, HttpStatus.OK);
+        // Fetch the top 5 latest vulnerabilities with pagination
+        List<ProjectVulnerability> projectVulnerabilities = vulnTemplate.projectVulnerabilityRepository
+                .getLatestVulnerabilitiesForProjects(projects, PageRequest.of(0, 5));
+
+        // Parallelize service calls
+        CompletableFuture<Long> projectCountFuture = CompletableFuture.supplyAsync(() -> findProjectService.count());
+        CompletableFuture<Long> scansRunningFuture = CompletableFuture.supplyAsync(() -> getScanNumberService.getNumberOfScansRunning());
+        CompletableFuture<Long> scansInQueueFuture = CompletableFuture.supplyAsync(() -> getScanNumberService.getNumberOfScansInQueue());
+        CompletableFuture<Long> vulnCountFuture = CompletableFuture.supplyAsync(() -> vulnTemplate.projectVulnerabilityRepository.countVulns());
+
+        try {
+            // Wait for all futures to complete
+            CompletableFuture.allOf(projectCountFuture, scansRunningFuture, scansInQueueFuture, vulnCountFuture).join();
+
+            StatisticCard statisticCard = new StatisticCard(
+                    projectCountFuture.get(),
+                    scansRunningFuture.get(),
+                    scansInQueueFuture.get(),
+                    vulnCountFuture.get()
+            );
+
+            dashboardTopStatistics.setStatisticCard(statisticCard);
+            dashboardTopStatistics.setProjectVulnerabilityList(projectVulnerabilities);
+
+            return new ResponseEntity<>(dashboardTopStatistics, HttpStatus.OK);
+        } catch (InterruptedException | ExecutionException e) {
+            // Handle exceptions appropriately
+            Thread.currentThread().interrupt();
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 
+
     /**
      * Merging two projects. Move all resources in source project to destination project and delete source.
      * 1. Move all codeprojects

src/main/java/io/mixeway/db/repository/ProjectVulnerabilityRepository.java

@@ -4,6 +4,7 @@
 import io.mixeway.db.projection.CommonVulns;
 import io.mixeway.db.projection.VulnBarChartProjection;
 import io.mixeway.db.projection.VulnerableProjects;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.*;
 import org.springframework.data.repository.query.Param;
 
@@ -216,5 +217,6 @@ int countRiskForCodeProject(@Param("codeProject_id")Long codeProject_id,@Param("
     long countVulns();
     // In ProjectVulnerabilityRepository
     List<ProjectVulnerability> findByProjectAndStatusIdNotAndGradeNot(Project project, Long statusId, int grade);
+    List<ProjectVulnerability> getLatestVulnerabilitiesForProjects(List<Project> projects, Pageable pageable);
 
 }