SONAR-26264 Allow Slack app multiple workspace installation and assign correct userType

Author: bogdanakushnir

server/sonar-db-dao/src/schema/schema-sq.ddl

@@ -1415,8 +1415,8 @@ CREATE TABLE "USER_BINDINGS"(
     "UPDATED_AT" BIGINT NOT NULL
 );
 ALTER TABLE "USER_BINDINGS" ADD CONSTRAINT "PK_USER_BINDINGS" PRIMARY KEY("UUID");
-CREATE UNIQUE NULLS NOT DISTINCT INDEX "UB_USER_INTEGRATION_CONFIG" ON "USER_BINDINGS"("USER_UUID" NULLS FIRST, "INTEGRATION_CONFIG_UUID" NULLS FIRST);
 CREATE INDEX "UB_INTEGRATION_CONFIG_UUID" ON "USER_BINDINGS"("INTEGRATION_CONFIG_UUID" NULLS FIRST);
+CREATE INDEX "USER_BINDINGS_USER_UUID" ON "USER_BINDINGS"("USER_UUID" NULLS FIRST);
 
 CREATE TABLE "USER_BINDINGS_SLACK"(
     "UUID" CHARACTER VARYING(40) NOT NULL,

server/sonar-db-migration/src/it/java/org/sonar/server/platform/db/migration/version/v202506/CreateIndexOnUserBindingsUserUuidIT.java

@@ -0,0 +1,57 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2025 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.server.platform.db.migration.version.v202506;
+
+import java.sql.SQLException;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.sonar.db.MigrationDbTester;
+import org.sonar.server.platform.db.migration.step.DdlChange;
+
+import static org.sonar.server.platform.db.migration.version.v202506.CreateIndexOnUserBindingsUserUuid.COLUMN_NAME_USER_UUID;
+import static org.sonar.server.platform.db.migration.version.v202506.CreateIndexOnUserBindingsUserUuid.INDEX_NAME;
+import static org.sonar.server.platform.db.migration.version.v202506.CreateIndexOnUserBindingsUserUuid.TABLE_NAME;
+
+class CreateIndexOnUserBindingsUserUuidIT {
+
+  @RegisterExtension
+  public final MigrationDbTester db = MigrationDbTester.createForMigrationStep(CreateIndexOnUserBindingsUserUuid.class);
+  private final DdlChange underTest = new CreateIndexOnUserBindingsUserUuid(db.database());
+
+  @Test
+  void execute_shouldCreateIndex() throws SQLException {
+    db.assertIndexDoesNotExist(TABLE_NAME, INDEX_NAME);
+
+    underTest.execute();
+
+    db.assertIndex(TABLE_NAME, INDEX_NAME, COLUMN_NAME_USER_UUID);
+  }
+
+  @Test
+  void execute_shouldBeReentrant() throws SQLException {
+    db.assertIndexDoesNotExist(TABLE_NAME, INDEX_NAME);
+
+    underTest.execute();
+    // should not fail when executed twice
+    underTest.execute();
+
+    db.assertIndex(TABLE_NAME, INDEX_NAME, COLUMN_NAME_USER_UUID);
+  }
+}

server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v202506/CreateIndexOnUserBindingsUserUuid.java

@@ -0,0 +1,55 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2025 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.server.platform.db.migration.version.v202506;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import org.sonar.db.Database;
+import org.sonar.db.DatabaseUtils;
+import org.sonar.server.platform.db.migration.sql.CreateIndexBuilder;
+import org.sonar.server.platform.db.migration.step.DdlChange;
+
+public class CreateIndexOnUserBindingsUserUuid extends DdlChange {
+
+  static final String TABLE_NAME = "user_bindings";
+  static final String INDEX_NAME = "user_bindings_user_uuid";
+  static final String COLUMN_NAME_USER_UUID = "user_uuid";
+
+  public CreateIndexOnUserBindingsUserUuid(Database db) {
+    super(db);
+  }
+
+  @Override
+  public void execute(Context context) throws SQLException {
+    try (Connection connection = getDatabase().getDataSource().getConnection()) {
+      createIndex(context, connection);
+    }
+  }
+
+  private void createIndex(Context context, Connection connection) {
+    if (!DatabaseUtils.indexExistsIgnoreCase(TABLE_NAME, INDEX_NAME, connection)) {
+      context.execute(new CreateIndexBuilder(getDialect())
+        .setTable(TABLE_NAME)
+        .setName(INDEX_NAME)
+        .addColumn(COLUMN_NAME_USER_UUID, false)
+        .build());
+    }
+  }
+}

server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v202506/DbVersion202506.java

@@ -44,6 +44,8 @@ public void addSteps(MigrationStepRegistry registry) {
       .add(2025_06_014, "Populate 'issue_stats_by_rule_key'", PopulateIssueStatsByRuleKey.class)
       .add(2025_06_015, "Add 'created_by' column to 'jira_work_items' table", AddCreatedByColumnToJiraWorkItemsTable.class)
       .add(2025_06_016, "Add index based on 'resource_id' and 'resource_type' to 'jira_work_items_resources' table", AddResourceIndexForJiraWorkItemsResourcesTable.class)
+      .add(2025_06_017, "Remove unique index from 'user_bindings' table", RemoveUniqueIndexFromUserBindingsTable.class)
+      .add(2025_06_018, "Create index on 'user_uuid' column in 'user_bindings' table", CreateIndexOnUserBindingsUserUuid.class)
     ;
   }
 

server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v202506/RemoveUniqueIndexFromUserBindingsTable.java

@@ -0,0 +1,34 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2025 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.server.platform.db.migration.version.v202506;
+
+import org.sonar.db.Database;
+import org.sonar.server.platform.db.migration.step.DropIndexChange;
+
+public class RemoveUniqueIndexFromUserBindingsTable extends DropIndexChange {
+
+  private static final String TABLE_NAME = "user_bindings";
+  private static final String INDEX_NAME = "ub_user_integration_config";
+
+  public RemoveUniqueIndexFromUserBindingsTable(Database db) {
+    super(db, INDEX_NAME, TABLE_NAME);
+  }
+
+}

server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v202506/RemoveUniqueIndexFromUserBindingsTableTest.java

@@ -0,0 +1,59 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2025 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.server.platform.db.migration.version.v202506;
+
+import java.sql.SQLException;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.sonar.db.MigrationDbTester;
+
+import static org.sonar.server.platform.db.migration.version.v202506.CreateUserBindingsTable.COLUMN_INTEGRATION_CONFIG_UUID;
+import static org.sonar.server.platform.db.migration.version.v202506.CreateUserBindingsTable.COLUMN_USER_UUID;
+import static org.sonar.server.platform.db.migration.version.v202506.CreateUserBindingsTable.USER_BINDINGS_TABLE_NAME;
+
+class RemoveUniqueIndexFromUserBindingsTableTest {
+
+  @RegisterExtension
+  public final MigrationDbTester db = MigrationDbTester.createForMigrationStep(RemoveUniqueIndexFromUserBindingsTable.class);
+
+  private final CreateUserBindingsTable createTableMigration = new CreateUserBindingsTable(db.database());
+  private final RemoveUniqueIndexFromUserBindingsTable underTest = new RemoveUniqueIndexFromUserBindingsTable(db.database());
+
+  @Test
+  void migration_should_remove_unique_index() throws SQLException {
+    createTableMigration.execute();
+    db.assertUniqueIndex(USER_BINDINGS_TABLE_NAME, "ub_user_integration_config", COLUMN_USER_UUID, COLUMN_INTEGRATION_CONFIG_UUID);
+
+    underTest.execute();
+
+    db.assertIndexDoesNotExist(USER_BINDINGS_TABLE_NAME, "ub_user_integration_config");
+  }
+
+  @Test
+  void migration_should_be_reentrant() throws SQLException {
+    createTableMigration.execute();
+
+    underTest.execute();
+    underTest.execute();
+
+    db.assertIndexDoesNotExist(USER_BINDINGS_TABLE_NAME, "ub_user_integration_config");
+  }
+
+}