chore: improve error messages (CM-855) (CM-561) (#3713)

Signed-off-by: Efren Lim <elim@linuxfoundation.org>
Co-authored-by: emlimlf <52259294+emlimlf@users.noreply.github.com>

Author: joanagmaia

backend/src/database/repositories/githubReposRepository.ts

@@ -81,7 +81,7 @@ export default class GithubReposRepository {
         )
         throw new Error400(
           options.language,
-          'errors.integrations.githubRepoAlreadyMapped',
+          'errors.integrations.repoAlreadyMapped',
           row.url,
           integrationId,
           row.integrationId,

backend/src/database/repositories/gitlabReposRepository.ts

@@ -1,7 +1,7 @@
 import trim from 'lodash/trim'
 import { QueryTypes } from 'sequelize'
 
-import { DEFAULT_TENANT_ID } from '@crowd/common'
+import { DEFAULT_TENANT_ID, Error400 } from '@crowd/common'
 import { RedisCache } from '@crowd/redis'
 
 import { IRepositoryOptions } from './IRepositoryOptions'
@@ -51,6 +51,35 @@ export default class GitlabReposRepository {
   }
 
   static async updateMapping(integrationId, mapping, options: IRepositoryOptions) {
+    const transaction = SequelizeRepository.getTransaction(options)
+
+    // Check for repositories already mapped to other integrations
+    for (const url of Object.keys(mapping)) {
+      const existingRows = await options.database.sequelize.query(
+        `SELECT * FROM "gitlabRepos" WHERE url = :url AND "deletedAt" IS NULL`,
+        {
+          replacements: { url },
+          type: QueryTypes.SELECT,
+          transaction,
+        },
+      )
+
+      for (const row of existingRows as any[]) {
+        if (!row.deletedAt && row.integrationId !== integrationId) {
+          options.log.warn(
+            `Trying to update gitlab repo ${row.url} mapping with integrationId ${integrationId} but it is already mapped to integration ${row.integrationId}!`,
+          )
+
+          throw new Error400(
+            options.language,
+            'errors.integrations.repoAlreadyMapped',
+            row.url,
+            integrationId,
+            row.integrationId,
+          )
+        }
+      }
+    }
     await GitlabReposRepository.bulkInsert(
       'gitlabRepos',
       ['tenantId', 'integrationId', 'segmentId', 'url'],

backend/src/database/repositories/segmentRepository.ts

@@ -401,6 +401,35 @@ class SegmentRepository extends RepositoryBase<
     return this.findById(records[0].id)
   }
 
+  async findByName(name: string, level: SegmentLevel) {
+    const transaction = this.transaction
+
+    let findByNameQuery = `SELECT * FROM segments WHERE name = :name AND "tenantId" = :tenantId`
+
+    if (level === SegmentLevel.SUB_PROJECT) {
+      findByNameQuery += ` and "parentSlug" is not null and "grandparentSlug" is not null`
+    } else if (level === SegmentLevel.PROJECT) {
+      findByNameQuery += ` and "parentSlug" is not null and "grandparentSlug" is null`
+    } else if (level === SegmentLevel.PROJECT_GROUP) {
+      findByNameQuery += ` and "parentSlug" is null and "grandparentSlug" is null`
+    }
+
+    const records = await this.options.database.sequelize.query(findByNameQuery, {
+      replacements: {
+        name,
+        tenantId: this.options.currentTenant.id,
+      },
+      type: QueryTypes.SELECT,
+      transaction,
+    })
+
+    if (records.length === 0) {
+      return null
+    }
+
+    return this.findById(records[0].id)
+  }
+
   async findInIds(ids: string[]): Promise<SegmentData[]> {
     if (ids.length === 0) {
       return []

backend/src/services/integrationService.ts

@@ -4,7 +4,7 @@ import { request } from '@octokit/request'
 import axios, { AxiosRequestConfig, AxiosResponse } from 'axios'
 import lodash from 'lodash'
 import moment from 'moment'
-import { Transaction } from 'sequelize'
+import { QueryTypes, Transaction } from 'sequelize'
 
 import { EDITION, Error400, Error404, Error542, encryptData } from '@crowd/common'
 import { CommonIntegrationService, getGithubInstallationToken } from '@crowd/common_services'
@@ -1391,6 +1391,38 @@ export default class IntegrationService {
         options,
       )
 
+      // Check for repositories already mapped to other integrations
+      const seq = SequelizeRepository.getSequelize({ ...(options || this.options), transaction })
+      const urls = remotes.map((r) => r.url)
+
+      const existingRows = await seq.query(
+        `
+          SELECT url, "integrationId" FROM git.repositories 
+          WHERE url IN (:urls) AND "deletedAt" IS NULL
+        `,
+        {
+          replacements: { urls },
+          type: QueryTypes.SELECT,
+          transaction,
+        },
+      )
+
+      for (const row of existingRows as any[]) {
+        if (row.integrationId !== integration.id) {
+          this.options.log.warn(
+            `Trying to update git repo ${row.url} mapping with integrationId ${integration.id} but it is already mapped to integration ${row.integrationId}!`,
+          )
+
+          throw new Error400(
+            (options || this.options).language,
+            'errors.integrations.repoAlreadyMapped',
+            row.url,
+            integration.id,
+            row.integrationId,
+          )
+        }
+      }
+
       // upsert repositories to git.repositories in order to be processed by git-integration V2
       const qx = SequelizeRepository.getQueryExecutor({
         ...(options || this.options),
@@ -1681,6 +1713,54 @@ export default class IntegrationService {
         host = orgUrl
       }
 
+      const stripGit = (url: string) => {
+        if (url.endsWith('.git')) {
+          return url.slice(0, -4)
+        }
+        return url
+      }
+
+      // Build full repository URLs from orgURL and repo names
+      const remotes = integrationData.remote.repoNames.map((repoName) => {
+        const fullUrl = stripGit(`${integrationData.remote.orgURL}/${repoName}`)
+        return { url: fullUrl, forkedFrom: null }
+      })
+
+      // Check for conflicts with existing Gerrit integrations
+      for (const remote of remotes) {
+        const existingGerritIntegrations = await this.options.database.sequelize.query(
+          `SELECT id, settings FROM integrations 
+           WHERE platform = 'gerrit' AND "deletedAt" IS NULL`,
+          {
+            type: QueryTypes.SELECT,
+            transaction,
+          },
+        )
+
+        for (const existingIntegration of existingGerritIntegrations as any[]) {
+          const settings = existingIntegration.settings
+          if (settings?.remote?.repoNames && settings?.remote?.orgURL) {
+            const existingRemotes = settings.remote.repoNames.map((repoName) =>
+              stripGit(`${settings.remote.orgURL}/${repoName}`),
+            )
+
+            if (existingRemotes.includes(remote.url)) {
+              this.options.log.warn(
+                `Trying to map Gerrit repository ${remote.url} with integrationId ${integration?.id || connectionId} but it is already mapped to integration ${existingIntegration.id}!`,
+              )
+
+              throw new Error400(
+                this.options.language,
+                'errors.integrations.repoAlreadyMapped',
+                remote.url,
+                integration?.id || connectionId,
+                existingIntegration.id,
+              )
+            }
+          }
+        }
+      }
+
       const res = await IntegrationService.getGerritServerRepos(orgUrl)
       if (integrationData.remote.enableAllRepos) {
         integrationData.remote.repoNames = res
@@ -1711,13 +1791,6 @@ export default class IntegrationService {
       )
 
       if (integrationData.remote.enableGit) {
-        const stripGit = (url: string) => {
-          if (url.endsWith('.git')) {
-            return url.slice(0, -4)
-          }
-          return url
-        }
-
         const segmentOptions: IRepositoryOptions = {
           ...this.options,
           transaction,
@@ -1728,12 +1801,6 @@ export default class IntegrationService {
           ],
         }
 
-        // Build full repository URLs from orgURL and repo names
-        const remotes = integrationData.remote.repoNames.map((repoName) => {
-          const fullUrl = stripGit(`${integrationData.remote.orgURL}/${repoName}`)
-          return { url: fullUrl, forkedFrom: null }
-        })
-
         await this.gitConnectOrUpdate(
           {
             remotes,