From 486fa40be02bd72053f83b0f7ecb70675de202ac Mon Sep 17 00:00:00 2001
From: Artyom Savchenko <armisav@gmail.com>
Date: Wed, 20 Aug 2025 16:15:00 +0700
Subject: [PATCH] Merge installation ids with existing and skip old accounts 
 (#9702)

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 dev/tool/src/restoreGithub.ts | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/dev/tool/src/restoreGithub.ts b/dev/tool/src/restoreGithub.ts
index eba4af38bd..29ac134e1d 100644
--- a/dev/tool/src/restoreGithub.ts
+++ b/dev/tool/src/restoreGithub.ts
@@ -29,24 +29,45 @@ export async function restoreGithubIntegrations (dbUrl: string, dryrun: boolean)
 
     // Group by workspace and createdBy, collecting installationIds
     const uniqueSettings = groupIntegrationSettings(integrationSettings)
-    console.info('Start restoring GitHub installation IDs, count: ', uniqueSettings.length)
+    console.info('Start restoring GitHub installation IDs v3, count: ', uniqueSettings.length)
 
     let createdCount = 0
     let updatedCount = 0
     for (const setting of uniqueSettings) {
       try {
+        const isMigratedSocialId = !isNaN(parseInt(setting.createdBy, 10))
+        if (!isMigratedSocialId) {
+          // Integration should not be affected in this case, since in corrupted migration socialIds were also used to search integrations
+          console.info('Skip non-migrated integration:', setting.createdBy, setting.workspaceId)
+          continue
+        }
+
         const existingIntegration = await accountClient.getIntegration({
           workspaceUuid: setting.workspaceId,
           socialId: setting.createdBy,
           kind: GITHUB_INTEGRATION
         })
 
-        // Determine the installationId to use
-        const installationId =
-          setting.installationIds.length === 1 ? setting.installationIds[0] : setting.installationIds // Use array if multiple values
+        let installationId: number | number[]
 
         if (existingIntegration != null) {
           const existingInstallationId = existingIntegration?.data?.installationId
+
+          // Merge existing and new installation IDs
+          const allInstallationIds = new Set<number>()
+          if (existingInstallationId != null) {
+            if (Array.isArray(existingInstallationId)) {
+              existingInstallationId.forEach((id) => allInstallationIds.add(id))
+            } else {
+              allInstallationIds.add(existingInstallationId)
+            }
+          }
+          setting.installationIds.forEach((id) => allInstallationIds.add(id))
+
+          const mergedIds = Array.from(allInstallationIds)
+          installationId = mergedIds.length === 1 ? mergedIds[0] : mergedIds
+
+          // Check if the merged result is the same as existing
           const isSame = Array.isArray(installationId)
             ? Array.isArray(existingInstallationId) &&
               installationId.length === existingInstallationId.length &&
@@ -75,6 +96,7 @@ export async function restoreGithubIntegrations (dbUrl: string, dryrun: boolean)
           await accountClient.updateIntegration(updatedIntegration)
           updatedCount++
         } else {
+          installationId = setting.installationIds.length === 1 ? setting.installationIds[0] : setting.installationIds
           const integration: Integration = {
             workspaceUuid: setting.workspaceId,
             socialId: setting.createdBy,