From c2ee935557c8cc2dd34c48761cc8eafbe75b50dc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Beno=C3=AEt=20Gianinetti?=
 <benoit.gianinetti@sonarsource.com>
Date: Fri, 28 Jun 2019 09:46:59 +0200
Subject: [PATCH] SC-764 Return alm organization type in
 /api/organizations/search

---
 .../org/sonar/db/alm/AlmAppInstallDao.java    |  7 ++++
 .../org/sonar/db/alm/AlmAppInstallMapper.java |  3 ++
 .../org/sonar/db/alm/AlmAppInstallMapper.xml  | 11 ++++++
 .../sonar/db/alm/AlmAppInstallDaoTest.java    | 38 ++++++++++++++++---
 .../server/organization/ws/SearchAction.java  | 24 +++++++++---
 .../organization/ws/SearchActionTest.java     |  1 +
 6 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallDao.java
index 7f43a45d2f6..ba309a409d7 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallDao.java
@@ -21,6 +21,8 @@ package org.sonar.db.alm;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.sonar.api.utils.System2;
 import org.sonar.core.util.UuidFactory;
@@ -31,6 +33,7 @@ import org.sonar.db.organization.OrganizationDto;
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 import static org.apache.commons.lang.StringUtils.isNotEmpty;
+import static org.sonar.db.DatabaseUtils.executeLargeInputs;
 
 /**
  * Store instances of installed app in external ALM like GitHub or Bitbucket Cloud.
@@ -68,6 +71,10 @@ public class AlmAppInstallDao implements Dao {
     return Optional.ofNullable(mapper.selectByOrganizationUuid(alm.getId(), organization.getUuid()));
   }
 
+  public List<AlmAppInstallDto> selectByOrganizations(DbSession dbSession, List<OrganizationDto> organizations) {
+    Set<String> organizationUuids = organizations.stream().map(OrganizationDto::getUuid).collect(Collectors.toSet());
+    return executeLargeInputs(organizationUuids, uuids -> getMapper(dbSession).selectByOrganizationUuids(organizationUuids));
+  }
 
   public List<AlmAppInstallDto> selectUnboundByUserExternalId(DbSession dbSession, String userExternalId) {
     return getMapper(dbSession).selectUnboundByUserExternalId(userExternalId);
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallMapper.java
index 9d5e6254522..f7fee75e02e 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallMapper.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallMapper.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.db.alm;
 
+import java.util.Collection;
 import java.util.List;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
@@ -47,4 +48,6 @@ public interface AlmAppInstallMapper {
     @Nullable @Param("isOwnerUser") Boolean isOwnerUser, @Param("installId") String installId, @Nullable @Param("userExternalId") String userExternalId, @Param("now") long now);
 
   void delete(@Param("alm") String alm, @Param("organizationAlmId") String organizationAlmId);
+
+  List<AlmAppInstallDto> selectByOrganizationUuids(@Param("organizationUuids") Collection<String> organizationUuids);
 }
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/alm/AlmAppInstallMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/alm/AlmAppInstallMapper.xml
index 7f4718b904b..96ef69dd550 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/alm/AlmAppInstallMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/alm/AlmAppInstallMapper.xml
@@ -50,6 +50,17 @@
     and oab.organization_uuid = #{organizationUuid, jdbcType=VARCHAR}
   </select>
 
+  <select id="selectByOrganizationUuids" parameterType="String" resultType="org.sonar.db.alm.AlmAppInstallDto">
+    select <include refid="sqlColumns"/>
+    from
+    alm_app_installs aai
+    inner join organization_alm_bindings oab on oab.alm_app_install_uuid = aai.uuid
+    where oab.organization_uuid in
+      <foreach collection="organizationUuids" open="(" close=")" item="organizationUuid" separator=",">
+        #{organizationUuid , jdbcType=VARCHAR}
+      </foreach>
+  </select>
+
   <select id="selectUnboundByUserExternalId" parameterType="Map" resultType="org.sonar.db.alm.AlmAppInstallDto">
     select <include refid="sqlColumns" />
     from
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/AlmAppInstallDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/alm/AlmAppInstallDaoTest.java
index 3f59bcee22d..9fa07f3629f 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/AlmAppInstallDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/alm/AlmAppInstallDaoTest.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.db.alm;
 
+import com.google.common.collect.ImmutableList;
 import java.util.Objects;
 import java.util.Optional;
 import org.assertj.core.api.AbstractAssert;
@@ -33,7 +34,9 @@ import org.sonar.db.DbTester;
 import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.user.UserDto;
 
+import static java.util.Collections.emptyList;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;
+import static org.apache.commons.lang.RandomStringUtils.randomNumeric;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -152,17 +155,42 @@ public class AlmAppInstallDaoTest {
   @Test
   public void selectByOrganization() {
     OrganizationDto organization = db.organizations().insert();
-    db.getDbClient().almAppInstallDao().insertOrUpdate(db.getSession(), ALM.GITHUB, "the-owner", false, "123456", null);
-    // could be improved, insertOrUpdate should return the DTO with its uuid
-    Optional<AlmAppInstallDto> install = db.getDbClient().almAppInstallDao().selectByOrganizationAlmId(db.getSession(), ALM.GITHUB, "the-owner");
-    db.getDbClient().organizationAlmBindingDao().insert(db.getSession(), organization, install.get(), "xxx", "xxx", true);
+    AlmAppInstallDto install = insertAlmAppInstall(organization);
     db.commit();
 
-    assertThat(underTest.selectByOrganization(db.getSession(), GITHUB, organization).get().getUuid()).isEqualTo(install.get().getUuid());
+    assertThat(underTest.selectByOrganization(db.getSession(), GITHUB, organization).get().getUuid()).isEqualTo(install.getUuid());
     assertThat(underTest.selectByOrganization(db.getSession(), BITBUCKETCLOUD, organization)).isEmpty();
     assertThat(underTest.selectByOrganization(db.getSession(), GITHUB, new OrganizationDto().setUuid("other-organization"))).isEmpty();
   }
 
+  @Test
+  public void selectByOrganizations() {
+    OrganizationDto org1 = db.organizations().insert();
+    AlmAppInstallDto install1 = insertAlmAppInstall(org1);
+    OrganizationDto org2 = db.organizations().insert();
+    AlmAppInstallDto install2 = insertAlmAppInstall(org2);
+    OrganizationDto org3 = db.organizations().insert();
+    db.commit();
+
+    assertThat(underTest.selectByOrganizations(db.getSession(), ImmutableList.of(org1, org2, org3)))
+      .extracting(AlmAppInstallDto::getUuid)
+      .containsOnly(install1.getUuid(), install2.getUuid());
+  }
+
+  @Test
+  public void selectByOrganizations_return_empty_list_if_list_of_orgs_is_empty() {
+    assertThat(underTest.selectByOrganizations(db.getSession(), emptyList())).isEmpty();
+  }
+
+  private AlmAppInstallDto insertAlmAppInstall(OrganizationDto organization) {
+    String organizationAlmId = randomAlphanumeric(10);
+    db.getDbClient().almAppInstallDao().insertOrUpdate(db.getSession(), ALM.GITHUB, organizationAlmId, false, randomNumeric(6), null);
+    // could be improved, insertOrUpdate should return the DTO with its uuid
+    Optional<AlmAppInstallDto> install = db.getDbClient().almAppInstallDao().selectByOrganizationAlmId(db.getSession(), ALM.GITHUB, organizationAlmId);
+    db.getDbClient().organizationAlmBindingDao().insert(db.getSession(), organization, install.get(), "xxx", "xxx", true);
+    return install.get();
+  }
+
   @Test
   public void insert_throws_NPE_if_alm_is_null() {
     expectAlmNPE();
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java
index d19e3ae109b..96df687d0ea 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java
@@ -32,6 +32,7 @@ import org.sonar.api.server.ws.WebService.Param;
 import org.sonar.core.util.stream.MoreCollectors;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
+import org.sonar.db.alm.AlmAppInstallDto;
 import org.sonar.db.alm.OrganizationAlmBindingDto;
 import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.organization.OrganizationQuery;
@@ -110,9 +111,11 @@ public class SearchAction implements OrganizationsWsAction {
       Set<String> provisionOrganizationUuids = searchOrganizationWithProvisionPermission(dbSession);
       Map<String, OrganizationAlmBindingDto> organizationAlmBindingByOrgUuid = dbClient.organizationAlmBindingDao().selectByOrganizations(dbSession, organizations)
         .stream().collect(MoreCollectors.uniqueIndex(OrganizationAlmBindingDto::getOrganizationUuid));
+      Map<String, AlmAppInstallDto> almAppInstallDtoByUuid = dbClient.almAppInstallDao().selectByOrganizations(dbSession, organizations)
+        .stream().collect(MoreCollectors.uniqueIndex(AlmAppInstallDto::getUuid));
 
       Organizations.SearchWsResponse wsResponse = buildOrganizations(organizations, adminOrganizationUuids, provisionOrganizationUuids, organizationAlmBindingByOrgUuid,
-        onlyMembershipOrganizations, paging);
+        almAppInstallDtoByUuid, onlyMembershipOrganizations, paging);
       writeProtobuf(wsResponse, request, response);
     }
   }
@@ -137,7 +140,8 @@ public class SearchAction implements OrganizationsWsAction {
   }
 
   private Organizations.SearchWsResponse buildOrganizations(List<OrganizationDto> organizations, Set<String> adminOrganizationUuids, Set<String> provisionOrganizationUuids,
-    Map<String, OrganizationAlmBindingDto> organizationAlmBindingByOrgUuid, boolean onlyMembershipOrganizations, Paging paging) {
+    Map<String, OrganizationAlmBindingDto> organizationAlmBindingByOrgUuid, Map<String, AlmAppInstallDto> almAppInstallDtoByUuid, boolean onlyMembershipOrganizations,
+    Paging paging) {
     Organizations.SearchWsResponse.Builder response = Organizations.SearchWsResponse.newBuilder();
     response.setPaging(paging);
     Organization.Builder wsOrganization = Organization.newBuilder();
@@ -150,13 +154,17 @@ public class SearchAction implements OrganizationsWsAction {
           .setAdmin(isAdmin)
           .setProvision(canProvision)
           .setDelete(isAdmin));
-        response.addOrganizations(toOrganization(wsOrganization, o, organizationAlmBindingByOrgUuid.get(o.getUuid()), onlyMembershipOrganizations));
+        OrganizationAlmBindingDto organizationAlmBinding = organizationAlmBindingByOrgUuid.get(o.getUuid());
+        AlmAppInstallDto almAppinstall = organizationAlmBinding == null
+          ? null
+          : almAppInstallDtoByUuid.get(organizationAlmBinding.getAlmAppInstallUuid());
+        response.addOrganizations(toOrganization(wsOrganization, o, organizationAlmBinding, almAppinstall, onlyMembershipOrganizations));
       });
     return response.build();
   }
 
   private static Organization.Builder toOrganization(Organization.Builder builder, OrganizationDto organization, @Nullable OrganizationAlmBindingDto organizationAlmBinding,
-    boolean onlyMembershipOrganizations) {
+    @Nullable AlmAppInstallDto almAppInstallDto, boolean onlyMembershipOrganizations) {
     builder
       .setName(organization.getName())
       .setKey(organization.getKey());
@@ -164,9 +172,13 @@ public class SearchAction implements OrganizationsWsAction {
     ofNullable(organization.getUrl()).ifPresent(builder::setUrl);
     ofNullable(organization.getAvatarUrl()).ifPresent(builder::setAvatar);
     if (onlyMembershipOrganizations && organizationAlmBinding != null) {
-      builder.setAlm(Organization.Alm.newBuilder()
+      Organization.Alm.Builder almBuilder = Organization.Alm.newBuilder()
         .setKey(organizationAlmBinding.getAlm().getId())
-        .setUrl(organizationAlmBinding.getUrl()));
+        .setUrl(organizationAlmBinding.getUrl());
+      if (almAppInstallDto != null) {
+        almBuilder.setPersonal(almAppInstallDto.isOwnerUser());
+      }
+      builder.setAlm(almBuilder.build());
     }
     if (onlyMembershipOrganizations) {
       builder.setSubscription(Organizations.Subscription.valueOf(organization.getSubscription().name()));
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java
index b190cb30202..7f141946b7a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java
@@ -272,6 +272,7 @@ public class SearchActionTest {
     Map<String, Organization> orgByKey = result.getOrganizationsList().stream().collect(toMap(Organization::getKey, identity()));
     assertThat(orgByKey.get(organization.getKey()).getAlm().getKey()).isEqualTo(organizationAlmBinding.getAlm().getId());
     assertThat(orgByKey.get(organization.getKey()).getAlm().getUrl()).isEqualTo(organizationAlmBinding.getUrl());
+    assertThat(orgByKey.get(organization.getKey()).getAlm().getPersonal()).isEqualTo(almAppInstall.isOwnerUser());
     assertThat(orgByKey.get(organizationNotBoundToAlm.getKey()).hasAlm()).isEqualTo(false);
   }
 
-- 
2.39.5