fix: add support for gitlabRepos in git v2 migration [CM-696]

Author: mbani01

backend/src/services/integrationService.ts

@@ -1288,7 +1288,7 @@ export default class IntegrationService {
         options || this.options,
         transaction,
         integration.id,
-        true, // inheritFromGithubRepos = true during migration until all repos are migrated then git.repositories can be used as source of truth instead of githubRepos
+        // inheritFromExistingRepos defaults to true during migration until all repos are migrated then git.repositories can be used as source of truth instead of existing repo tables
       )
 
       await SequelizeRepository.commitTransaction(transaction)
@@ -1306,19 +1306,19 @@ export default class IntegrationService {
    * @param options Repository options
    * @param transaction Database transaction
    * @param integrationId The integration ID from the git integration
-   * @param inheritFromGithubRepos If true, queries githubRepos for IDs; if false, generates new UUIDs
+   * @param inheritFromExistingRepos If true, queries githubRepos and gitlabRepos for IDs; if false, generates new UUIDs
    *
    * TODO: @Mouad After migration is complete, simplify this function by:
    * 1. Using an object parameter instead of multiple parameters for better maintainability
-   * 2. Removing the inheritFromGithubRepos parameter since git.repositories will be the source of truth
+   * 2. Removing the inheritFromExistingRepos parameter since git.repositories will be the source of truth
    * 3. Simplifying the logic to only handle git.repositories operations
    */
   private async syncRepositoriesToGitV2(
     remotes: string[],
     options: IRepositoryOptions,
     transaction: Transaction,
     integrationId: string,
-    inheritFromGithubRepos: boolean,
+    inheritFromExistingRepos: boolean = true,
   ) {
     const seq = SequelizeRepository.getSequelize(options)
 
@@ -1329,14 +1329,25 @@ export default class IntegrationService {
       segmentId: string
     }> = []
 
-    if (inheritFromGithubRepos) {
-      // Query from githubRepos records to inherit their IDs for smoother migration into git-integration V2
-      const githubRepos = await seq.query(
+    if (inheritFromExistingRepos) {
+      // check GitHub repos first, fallback to GitLab repos if none found
+      const existingRepos: Array<{
+        id: string
+        url: string
+      }> = await seq.query(
         `
-          SELECT id, url
-          FROM "githubRepos" 
-          WHERE url IN (:urls)
-          AND "deletedAt" IS NULL
+          WITH github_repos AS (
+            SELECT id, url FROM "githubRepos" 
+            WHERE url IN (:urls) AND "deletedAt" IS NULL
+          ),
+          gitlab_repos AS (
+            SELECT id, url FROM "gitlabRepos" 
+            WHERE url IN (:urls) AND "deletedAt" IS NULL
+          )
+          SELECT id, url FROM github_repos
+          UNION ALL
+          SELECT id, url FROM gitlab_repos
+          WHERE NOT EXISTS (SELECT 1 FROM github_repos)
         `,
         {
           replacements: {
@@ -1347,15 +1358,17 @@ export default class IntegrationService {
         },
       )
 
-      repositoriesToSync = (githubRepos as any[]).map((repo) => ({
+      repositoriesToSync = existingRepos.map((repo) => ({
         id: repo.id,
         url: repo.url,
         integrationId,
         segmentId: options.currentSegments[0].id,
       }))
 
       if (repositoriesToSync.length === 0) {
-        this.options.log.warn('No githubRepos found - skipping repository sync to git v2')
+        this.options.log.warn(
+          'No existing repos found in githubRepos or gitlabRepos - skipping repository sync to git v2',
+        )
         return
       }
     } else {
@@ -2467,7 +2480,7 @@ export default class IntegrationService {
         for (const [segmentId, urls] of Object.entries(repos)) {
           let isGitintegrationConfigured
           const segmentOptions: IRepositoryOptions = {
-            ...this.options,
+            ...txOptions,
             currentSegments: [
               {
                 ...this.options.currentSegments[0],
@@ -2490,14 +2503,14 @@ export default class IntegrationService {
               {
                 remotes: Array.from(new Set([...gitRemotes, ...urls])),
               },
-              segmentOptions,
+              { ...segmentOptions, transaction },
             )
           } else {
             await this.gitConnectOrUpdate(
               {
                 remotes: urls,
               },
-              segmentOptions,
+              { ...segmentOptions, transaction },
             )
           }
         }