SCA-125 Perf: releases endpoint (#13178)

2 files changed, 29 insertions, 28 deletions

diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/sca/ScaDependenciesDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/sca/ScaDependenciesDaoIT.java
index 67546dd215f..f122c8eefb8 100644
--- a/server/sonar-db-dao/src/it/java/org/sonar/db/sca/ScaDependenciesDaoIT.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/sca/ScaDependenciesDaoIT.java
@@ -41,7 +41,7 @@ class ScaDependenciesDaoIT {
 
   @Test
   void insert_shouldPersistScaDependencies() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaDependencyDto scaDependencyDto = db.getScaDependenciesDbTester().insertScaDependency(componentDto.uuid(), "scaReleaseUuid", "1", true);
 
     List<Map<String, Object>> select = db.select(db.getSession(), "select * from sca_dependencies");
@@ -63,7 +63,7 @@ class ScaDependenciesDaoIT {
 
   @Test
   void deleteByUuid_shouldDeleteScaDependencies() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaDependencyDto scaDependencyDto = db.getScaDependenciesDbTester().insertScaDependency(componentDto.uuid(), "scaReleaseUuid", "1", true);
 
     List<Map<String, Object>> select = db.select(db.getSession(), "select * from sca_dependencies");
@@ -77,7 +77,7 @@ class ScaDependenciesDaoIT {
 
   @Test
   void selectByUuid_shouldLoadScaDependency() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaDependencyDto scaDependencyDto = db.getScaDependenciesDbTester().insertScaDependency(componentDto.uuid(), "scaReleaseUuid", "1", true);
 
     var loadedOptional = scaDependenciesDao.selectByUuid(db.getSession(), scaDependencyDto.uuid());
@@ -87,7 +87,7 @@ class ScaDependenciesDaoIT {
 
   @Test
   void selectByReleaseUuids_shouldReturnScaDependencies() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaDependencyDto scaDependencyDto1a = db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto.uuid(), "1a", true, PackageManager.MAVEN, "foo.bar1");
     // same release, different dependency
     ScaDependencyDto scaDependencyDto1b = db.getScaDependenciesDbTester().insertScaDependency(componentDto.uuid(), scaDependencyDto1a.scaReleaseUuid(), "1b", false);
@@ -103,7 +103,7 @@ class ScaDependenciesDaoIT {
 
   @Test
   void selectByQuery_shouldReturnScaDependencies_whenQueryByBranchUuid() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaDependencyDto scaDependencyDto1 = db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto.uuid(), "1", true, PackageManager.MAVEN, "foo.bar");
     // same release, different dependency
     ScaDependencyDto scaDependencyDto2 = db.getScaDependenciesDbTester().insertScaDependency(componentDto.uuid(), scaDependencyDto1.scaReleaseUuid(), "2", false);
@@ -116,7 +116,7 @@ class ScaDependenciesDaoIT {
 
   @Test
   void selectByQuery_shouldReturnPaginatedScaDependencies() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaDependencyDto scaDependencyDto1 = db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto.uuid(), "1", true, PackageManager.MAVEN, "foo.bar");
     ScaDependencyDto scaDependencyDto2 = db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto.uuid(), "2", true, PackageManager.MAVEN, "foo.bar");
     ScaDependencyDto scaDependencyDto3 = db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto.uuid(), "3", true, PackageManager.MAVEN, "something");
@@ -135,7 +135,7 @@ class ScaDependenciesDaoIT {
 
   @Test
   void selectByQuery_shouldPartiallyMatchPackageName_whenQueriedByText() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaDependencyDto scaDependencyDto1 = db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto.uuid(), "1", true, PackageManager.MAVEN, "foo.bar");
     @SuppressWarnings("unused")
     ScaDependencyDto scaDependencyDto2 = db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto.uuid(), "2", true, PackageManager.MAVEN, "bar.mee");
@@ -160,7 +160,7 @@ class ScaDependenciesDaoIT {
 
   @Test
   void selectByQuery_shouldReturnScaDependencies_whenQueryByDirect() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaDependencyDto scaDependencyDto1 = db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto.uuid(), "1", true, PackageManager.MAVEN, "foo.bar");
     ScaDependencyDto scaDependencyDto2 = db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto.uuid(), "2", false, PackageManager.MAVEN, "foo.bar");
 
@@ -179,7 +179,7 @@ class ScaDependenciesDaoIT {
 
   @Test
   void selectByQuery_shouldReturnScaDependencies_whenQueryByPackageManager() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaDependencyDto scaDependencyDto1 = db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto.uuid(), "1", true, PackageManager.MAVEN, "foo.bar");
     ScaDependencyDto scaDependencyDto2 = db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto.uuid(), "2", true, PackageManager.NPM, "foo.bar");
     ScaDependencyDto scaDependencyDto3 = db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto.uuid(), "3", true, PackageManager.CARGO, "foo.bar");
@@ -201,7 +201,7 @@ class ScaDependenciesDaoIT {
 
   @Test
   void update_shouldUpdateScaDependency() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaDependencyDto scaDependencyDto = db.getScaDependenciesDbTester().insertScaDependency(componentDto.uuid(), "scaReleaseUuid", "1", true);
     ScaDependencyDto updatedScaDependency = scaDependencyDto.toBuilder().setUpdatedAt(scaDependencyDto.updatedAt() + 1).setDirect(false).setLockfileDependencyFilePath("lockfile2")
       .build();
@@ -227,7 +227,7 @@ class ScaDependenciesDaoIT {
 
   @Test
   void countByQuery_shouldReturnTheTotalOfDependencies() {
-    ComponentDto componentDto1 = prepareComponentDto("1");
+    ComponentDto componentDto1 = prepareComponentDto();
     db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto1.uuid(), "1", true, PackageManager.MAVEN, "foo.bar");
     db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto1.uuid(), "2", true, PackageManager.MAVEN, "foo.bar.mee");
     db.getScaDependenciesDbTester().insertScaDependencyWithRelease(componentDto1.uuid(), "3", true, PackageManager.MAVEN, "bar.foo");
@@ -239,8 +239,8 @@ class ScaDependenciesDaoIT {
     assertThat(scaDependenciesDao.countByQuery(db.getSession(), new ScaDependenciesQuery("another_branch_uuid", null, null, null))).isZero();
   }
 
-  private ComponentDto prepareComponentDto(String suffix) {
+  private ComponentDto prepareComponentDto() {
     ProjectData projectData = db.components().insertPublicProject();
-    return db.getScaDependenciesDbTester().insertComponent(projectData.mainBranchUuid(), suffix);
+    return projectData.getMainBranchComponent();
   }
 }
diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/sca/ScaReleasesDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/sca/ScaReleasesDaoIT.java
index 42ffcfd2c7a..e29c0f54521 100644
--- a/server/sonar-db-dao/src/it/java/org/sonar/db/sca/ScaReleasesDaoIT.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/sca/ScaReleasesDaoIT.java
@@ -45,7 +45,7 @@ class ScaReleasesDaoIT {
 
   @Test
   void insert_shouldPersistScaReleases() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaReleaseDto scaReleaseDto = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "1");
 
     List<Map<String, Object>> select = db.select(db.getSession(), "select * from sca_releases");
@@ -68,7 +68,7 @@ class ScaReleasesDaoIT {
 
   @Test
   void deleteByUuid_shouldDeleteScaReleases() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaReleaseDto scaReleaseDto = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "1");
 
     List<Map<String, Object>> select = db.select(db.getSession(), "select * from sca_releases");
@@ -82,7 +82,7 @@ class ScaReleasesDaoIT {
 
   @Test
   void selectByUuid_shouldLoadScaRelease() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaReleaseDto scaReleaseDto = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "1");
 
     var loadedOptional = scaReleasesDao.selectByUuid(db.getSession(), scaReleaseDto.uuid());
@@ -92,7 +92,7 @@ class ScaReleasesDaoIT {
 
   @Test
   void selectByUuid_shouldLoadScaReleases() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaReleaseDto scaReleaseDto1 = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "1");
     db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "2");
     ScaReleaseDto scaReleaseDto3 = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "3");
@@ -105,7 +105,7 @@ class ScaReleasesDaoIT {
 
   @Test
   void selectByUuid_shouldLoadEmptyScaReleases() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "1");
     db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "2");
     db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "3");
@@ -117,8 +117,9 @@ class ScaReleasesDaoIT {
 
   @Test
   void selectByQuery_shouldReturnScaReleases_whenQueryByBranchUuid() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaReleaseDto scaReleaseDto = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "1");
+    System.out.println("componentDto = " + componentDto);
 
     ScaReleasesQuery scaReleasesQuery = new ScaReleasesQuery(componentDto.branchUuid(), null, null, null, null);
     List<ScaReleaseDto> results = scaReleasesDao.selectByQuery(db.getSession(), scaReleasesQuery, Pagination.all());
@@ -129,7 +130,7 @@ class ScaReleasesDaoIT {
 
   @Test
   void selectByQuery_shouldReturnPaginatedScaReleases() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaReleaseDto scaReleaseDto1 = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "1");
     ScaReleaseDto scaReleaseDto2 = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "2");
     ScaReleaseDto scaReleaseDto3 = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "3");
@@ -148,7 +149,7 @@ class ScaReleasesDaoIT {
 
   @Test
   void selectByQuery_shouldPartiallyMatchPackageName_whenQueriedByText() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaReleaseDto scaReleaseDto1 = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "1", PackageManager.MAVEN, "foo.bar");
     db.getScaDependenciesDbTester().insertScaDependency(componentDto.uuid(), scaReleaseDto1, "1", true);
     db.getScaDependenciesDbTester().insertScaDependency(componentDto.uuid(), scaReleaseDto1, "2", false);
@@ -187,7 +188,7 @@ class ScaReleasesDaoIT {
 
   @Test
   void selectByQuery_shouldReturnScaReleases_whenQueryByDirect() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaReleaseDto scaReleaseDto1 = db.getScaReleasesDbTester().insertScaReleaseWithDependency(componentDto.uuid(), "1", 2, true, PackageManager.MAVEN, "foo.bar");
     ScaReleaseDto scaReleaseDto2 = db.getScaReleasesDbTester().insertScaReleaseWithDependency(componentDto.uuid(), "2", 3, false, PackageManager.MAVEN, "foo.bar");
 
@@ -206,7 +207,7 @@ class ScaReleasesDaoIT {
 
   @Test
   void selectByQuery_shouldReturnScaReleases_whenQueryByPackageManager() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaReleaseDto scaReleaseDto1 = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "1", PackageManager.MAVEN, "foo.bar");
     ScaReleaseDto scaReleaseDto2 = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "2", PackageManager.NPM, "foo.bar");
     ScaReleaseDto scaReleaseDto3 = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "3", PackageManager.CARGO, "foo.bar");
@@ -228,7 +229,7 @@ class ScaReleasesDaoIT {
 
   @Test
   void update_shouldUpdateScaRelease() {
-    ComponentDto componentDto = prepareComponentDto("1");
+    ComponentDto componentDto = prepareComponentDto();
     ScaReleaseDto scaReleaseDto = db.getScaReleasesDbTester().insertScaRelease(componentDto.uuid(), "1", PackageManager.MAVEN, "foo.bar");
     ScaReleaseDto updatedScaRelease = scaReleaseDto.toBuilder().setUpdatedAt(scaReleaseDto.updatedAt() + 1).setVersion("newVersion").build();
 
@@ -254,7 +255,7 @@ class ScaReleasesDaoIT {
 
   @Test
   void countByQuery_shouldReturnTheTotalOfReleases() {
-    ComponentDto componentDto1 = prepareComponentDto("1");
+    ComponentDto componentDto1 = prepareComponentDto();
     db.getScaReleasesDbTester().insertScaReleaseWithDependency(componentDto1.uuid(), "1", 1, true, PackageManager.MAVEN, "foo.bar");
     db.getScaReleasesDbTester().insertScaReleaseWithDependency(componentDto1.uuid(), "2", 2, true, PackageManager.MAVEN, "foo.bar.mee");
     db.getScaReleasesDbTester().insertScaReleaseWithDependency(componentDto1.uuid(), "3", 3, true, PackageManager.MAVEN, "bar.fo");
@@ -266,14 +267,14 @@ class ScaReleasesDaoIT {
     assertThat(scaReleasesDao.countByQuery(db.getSession(), new ScaReleasesQuery("another_branch_uuid", null, null, null, null))).isZero();
   }
 
-  private ComponentDto prepareComponentDto(String suffix) {
+  private ComponentDto prepareComponentDto() {
     ProjectData projectData = db.components().insertPublicProject();
-    return db.getScaReleasesDbTester().insertComponent(projectData.mainBranchUuid(), suffix);
+    return projectData.getMainBranchComponent();
   }
 
   @Test
   void countByPlatformQuery_shouldReturnPlatforms() {
-    ComponentDto componentDto1 = prepareComponentDto("1");
+    ComponentDto componentDto1 = prepareComponentDto();
     db.getScaReleasesDbTester().insertScaReleaseWithDependency(componentDto1.uuid(), "1", 1, true, PackageManager.MAVEN, "foo.bar");
     db.getScaReleasesDbTester().insertScaReleaseWithDependency(componentDto1.uuid(), "2", 2, true, PackageManager.NPM, "foo.bar.mee");
     db.getScaReleasesDbTester().insertScaReleaseWithDependency(componentDto1.uuid(), "3", 3, true, PackageManager.MAVEN, "bar.foo");