From c6bb025fe88cd262391affb5bac9a303befddfdc Mon Sep 17 00:00:00 2001
From: Duarte Meneses <duarte.meneses@sonarsource.com>
Date: Tue, 15 Sep 2020 11:30:25 -0500
Subject: [PATCH] SONAR-13835 api/qualitygates/search is not returning
 deterministic results when many projects have same name

---
 .../ProjectQgateAssociationMapper.xml         |  2 +-
 .../ProjectQgateAssociationDaoTest.java       | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/ProjectQgateAssociationMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/ProjectQgateAssociationMapper.xml
index baa08b4dc62..6b31322cb80 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/ProjectQgateAssociationMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/ProjectQgateAssociationMapper.xml
@@ -25,7 +25,7 @@
     <if test="query.projectSearch() != null">
       and (proj.kee = #{query.projectSearch} or upper(proj.name) like #{query.projectSearchUpperLikeSql} escape '/')
     </if>
-    order by proj.name
+    order by proj.name, proj.kee
   </select>
 
   <select id="selectQGateUuidByProjectUuid" parameterType="String" resultType="string">
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest.java
index 890b72652cc..f2fe1826be1 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest.java
@@ -64,6 +64,26 @@ public class ProjectQgateAssociationDaoTest {
         tuple(project3.uuid(), project3.getKey(), project3.name(), null));
   }
 
+  @Test
+  public void select_all_projects_by_query_should_have_deterministic_order() {
+    OrganizationDto organization = db.organizations().insert();
+    QGateWithOrgDto qualityGate1 = db.qualityGates().insertQualityGate(organization);
+    ComponentDto project1 = db.components().insertPrivateProject(organization, d -> d.setName("p1").setDbKey("key1"));
+    ComponentDto project2 = db.components().insertPrivateProject(organization, d -> d.setName("p1").setDbKey("key2"));
+    ComponentDto project3 = db.components().insertPrivateProject(organization, d -> d.setName("p2").setDbKey("key3"));
+    db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project1), qualityGate1);
+    db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project2), qualityGate1);
+    db.qualityGates().associateProjectToQualityGate(db.components().getProjectDto(project3), qualityGate1);
+
+    List<ProjectQgateAssociationDto> result = underTest.selectProjects(dbSession, ProjectQgateAssociationQuery.builder()
+      .qualityGate(qualityGate1)
+      .build());
+
+    assertThat(result)
+      .extracting(ProjectQgateAssociationDto::getUuid)
+      .containsExactlyInAnyOrder(project1.uuid(), project2.uuid(), project3.uuid());
+  }
+
   @Test
   public void select_projects_by_query() {
     OrganizationDto organization = db.organizations().insert();
-- 
2.39.5