From b1d5e0b3bb757d215b2b12feea0c06b97db1d665 Mon Sep 17 00:00:00 2001
From: Pierre Guillot <pierre.guillot@sonarsource.com>
Date: Thu, 17 Oct 2019 10:25:22 +0200
Subject: [PATCH] SONAR-12512 Decorate PR using configuration from new
 ALM_SETTINGS tables

---
 .../org/sonar/db/alm/setting/AlmSettingDao.java |  5 +++++
 .../sonar/db/alm/setting/AlmSettingMapper.java  |  2 ++
 .../db/alm/setting/ProjectAlmSettingDao.java    |  6 +++++-
 .../sonar/db/alm/setting/AlmSettingMapper.xml   |  8 ++++++++
 .../sonar/db/alm/setting/AlmSettingDaoTest.java | 17 ++++++++++++++++-
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/AlmSettingDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/AlmSettingDao.java
index d416dcb72f7..db743855005 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/AlmSettingDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/AlmSettingDao.java
@@ -57,6 +57,11 @@ public class AlmSettingDao implements Dao {
     return Optional.ofNullable(getMapper(dbSession).selectByKey(key));
   }
 
+  public List<AlmSettingDto> selectByAlm(DbSession dbSession, ALM alm) {
+    return getMapper(dbSession).selectByAlm(alm.getId());
+  }
+
+
   public List<AlmSettingDto> selectAll(DbSession dbSession) {
     return getMapper(dbSession).selectAll();
   }
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/AlmSettingMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/AlmSettingMapper.java
index 584cd4a648c..7686c99b9e8 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/AlmSettingMapper.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/AlmSettingMapper.java
@@ -31,6 +31,8 @@ public interface AlmSettingMapper {
   @CheckForNull
   AlmSettingDto selectByKey(@Param("key") String key);
 
+  List<AlmSettingDto> selectByAlm(String alm);
+
   List<AlmSettingDto> selectAll();
 
   void insert(@Param("dto") AlmSettingDto almSettingDto, @Param("uuid") String uuid, @Param("now") long now);
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ProjectAlmSettingDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ProjectAlmSettingDao.java
index d809f549b36..6926e1cb85b 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ProjectAlmSettingDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ProjectAlmSettingDao.java
@@ -62,7 +62,11 @@ public class ProjectAlmSettingDao implements Dao {
   }
 
   public Optional<ProjectAlmSettingDto> selectByProject(DbSession dbSession, ComponentDto project) {
-    return Optional.ofNullable(getMapper(dbSession).selectByProjectUuid(project.uuid()));
+    return selectByProject(dbSession, project.uuid());
+  }
+
+  public Optional<ProjectAlmSettingDto> selectByProject(DbSession dbSession, String projectUuid) {
+    return Optional.ofNullable(getMapper(dbSession).selectByProjectUuid(projectUuid));
   }
 
   private static ProjectAlmSettingMapper getMapper(DbSession dbSession) {
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/alm/setting/AlmSettingMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/alm/setting/AlmSettingMapper.xml
index bf66e2983fe..17e8c548b52 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/alm/setting/AlmSettingMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/alm/setting/AlmSettingMapper.xml
@@ -31,6 +31,14 @@
       a.kee = #{key, jdbcType=VARCHAR}
   </select>
 
+  <select id="selectByAlm" parameterType="string" resultType="org.sonar.db.alm.setting.AlmSettingDto">
+    select <include refid="sqlColumns"/>
+    from
+      alm_settings a
+    where
+      a.alm_id = #{almId, jdbcType=VARCHAR}
+  </select>
+
   <select id="selectAll" resultType="org.sonar.db.alm.setting.AlmSettingDto">
     select <include refid="sqlColumns"/>
     from alm_settings a
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/setting/AlmSettingDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/alm/setting/AlmSettingDaoTest.java
index 5fae5cd4eb6..d459e6a1550 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/setting/AlmSettingDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/alm/setting/AlmSettingDaoTest.java
@@ -86,6 +86,21 @@ public class AlmSettingDaoTest {
     assertThat(underTest.selectByKey(dbSession, "foo")).isNotPresent();
   }
 
+  @Test
+  public void selectByAlm() {
+    when(uuidFactory.create()).thenReturn(A_UUID);
+    when(system2.now()).thenReturn(NOW);
+    AlmSettingDto gitHubAlmSetting1 = db.almSettings().insertGitHubAlmSetting();
+    AlmSettingDto gitHubAlmSetting2 = db.almSettings().insertGitHubAlmSetting();
+    AlmSettingDto azureAlmSetting2 = db.almSettings().insertAzureAlmSetting();
+
+    List<AlmSettingDto> almSettings = underTest.selectByAlm(dbSession, ALM.GITHUB);
+
+    assertThat(almSettings)
+      .extracting(AlmSettingDto::getUuid)
+      .containsExactlyInAnyOrder(gitHubAlmSetting1.getUuid(), gitHubAlmSetting2.getUuid());
+  }
+
   @Test
   public void selectAll() {
     when(uuidFactory.create()).thenReturn(A_UUID);
@@ -95,7 +110,7 @@ public class AlmSettingDaoTest {
     underTest.insert(dbSession, newGithubAlmSettingDto());
 
     List<AlmSettingDto> almSettings = underTest.selectAll(dbSession);
-    assertThat(almSettings).isNotNull();
+
     assertThat(almSettings).size().isEqualTo(2);
   }
 
-- 
2.39.5