fix: gitlab fixes (CM-1298) (#4272)

Signed-off-by: Joana Maia <jmaia@contractor.linuxfoundation.org>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>

Author: 2 people

backend/src/services/integrationService.ts

@@ -315,6 +315,11 @@ export default class IntegrationService {
   async destroyAll(ids) {
     const toRemoveRepo = new Set<string>()
     let segmentId
+    // Collect GitLab webhook info before opening the transaction so external HTTP calls
+    // don't hold the DB connection idle long enough to trigger a connection timeout.
+    const gitlabWebhookRemovals: Array<{ token: string; projectIds: number[]; hookIds: number[] }> =
+      []
+
     const transaction = await SequelizeRepository.createTransaction(this.options)
 
     try {
@@ -446,11 +451,11 @@ export default class IntegrationService {
         }
 
         if (integration.platform === PlatformType.GITLAB && integration.settings.webhooks) {
-          await removeGitlabWebhooks(
-            integration.token,
-            integration.settings.webhooks.map((hook) => hook.projectId),
-            integration.settings.webhooks.map((hook) => hook.hookId),
-          )
+          gitlabWebhookRemovals.push({
+            token: integration.token,
+            projectIds: integration.settings.webhooks.map((hook) => hook.projectId),
+            hookIds: integration.settings.webhooks.map((hook) => hook.hookId),
+          })
         }
 
         if (integration.platform === PlatformType.GIT) {
@@ -495,6 +500,14 @@ export default class IntegrationService {
       await SequelizeRepository.rollbackTransaction(transaction)
       throw error
     }
+
+    // Remove GitLab webhooks after the transaction commits — these are external HTTP calls
+    // and must not hold a DB connection open.
+    await Promise.all(
+      gitlabWebhookRemovals.map(({ token, projectIds, hookIds }) =>
+        removeGitlabWebhooks(token, projectIds, hookIds),
+      ),
+    )
   }
 
   async findById(id) {

services/libs/tinybird/pipes/pull_request_analysis_baseline_merge_MV.pipe

@@ -115,7 +115,11 @@ SQL >
         argMin(
             updatedAt,
             if(
-                type IN ('pull_request-reviewed', 'merge_request-review-changes-requested')
+                type IN (
+                    'pull_request-reviewed',
+                    'merge_request-review-changes-requested',
+                    'merge_request-review-approved'
+                )
                 OR (
                     type = 'patchset_approval-created'
                     AND splitByChar('-', sourceParentId)[1] = prSourceId
@@ -126,7 +130,11 @@ SQL >
         ) AS reviewedUpdatedAt,
         min(
             if(
-                type IN ('pull_request-reviewed', 'merge_request-review-changes-requested')
+                type IN (
+                    'pull_request-reviewed',
+                    'merge_request-review-changes-requested',
+                    'merge_request-review-approved'
+                )
                 OR (
                     type = 'patchset_approval-created'
                     AND splitByChar('-', sourceParentId)[1] = prSourceId

services/libs/tinybird/pipes/pull_request_analysis_initial_snapshot.pipe

@@ -98,6 +98,7 @@ SQL >
         and (
             type = 'pull_request-reviewed'
             OR type = 'merge_request-review-changes-requested'
+            OR type = 'merge_request-review-approved'
             OR type = 'patchset_approval-created'
         )
         {% if defined(bucket_id) %}