SONAR-15541 Create api/qualitygates/remove_user service

4 files changed, 25 insertions, 0 deletions

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDao.java
index 5d383b5f5b8..18c9440a847 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDao.java
@@ -64,6 +64,10 @@ public class QualityGateUserPermissionsDao implements Dao {
     return mapper(dbSession).countByQuery(query);
   }
 
+  public void deleteByQualityGateAndUser(DbSession dbSession, QualityGateDto qualityGate, UserDto user) {
+    mapper(dbSession).delete(qualityGate.getUuid(), user.getUuid());
+  }
+
   public void deleteByUser(DbSession dbSession, UserDto user) {
     mapper(dbSession).deleteByUser(user.getUuid());
   }
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateUserPermissionsMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateUserPermissionsMapper.java
index 8f3a7c8e268..5edf1c3aa13 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateUserPermissionsMapper.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/qualitygate/QualityGateUserPermissionsMapper.java
@@ -35,6 +35,8 @@ public interface QualityGateUserPermissionsMapper {
 
   int countByQuery(@Param("query") SearchPermissionQuery query);
 
+  void delete(@Param("qualityGateUuid") String qualityGateUuid, @Param("userUuid") String userUuid);
+
   void deleteByUser(@Param("userUuid") String userUuid);
 
   void deleteByQualityGate(@Param("qualityGateUuid") String qualityGateUuid);
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateUserPermissionsMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateUserPermissionsMapper.xml
index 628a828f1f7..149fc766cfb 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateUserPermissionsMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateUserPermissionsMapper.xml
@@ -92,6 +92,12 @@
     </where>
   </sql>
 
+  <delete id="delete">
+    delete from qgate_user_permissions
+    where quality_gate_uuid = #{qualityGateUuid}
+    and user_uuid = #{userUuid}
+  </delete>
+
   <delete id="deleteByUser">
     delete from qgate_user_permissions
     where user_uuid = #{userUuid}
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoTest.java
index 048be73e898..0c956d9bdca 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoTest.java
@@ -208,6 +208,19 @@ public class QualityGateUserPermissionsDaoTest {
   }
 
   @Test
+  public void deleteByQualityGateAndUser() {
+    QualityGateDto qualityGate = db.qualityGates().insertQualityGate();
+    UserDto user = db.users().insertUser();
+    db.qualityGates().addUserPermission(qualityGate, user);
+
+    assertThat(underTest.exists(dbSession, qualityGate, user)).isTrue();
+
+    underTest.deleteByQualityGateAndUser(dbSession, qualityGate, user);
+
+    assertThat(underTest.exists(dbSession, qualityGate, user)).isFalse();
+  }
+
+  @Test
   public void deleteByUser() {
     QualityGateDto qualityGateDto1 = db.qualityGates().insertQualityGate();
     QualityGateDto qualityGateDto2 = db.qualityGates().insertQualityGate();