fix: comments

Signed-off-by: Uroš Marolt <uros@marolt.me>

Author: themarolt

services/apps/cron_service/src/jobs/incomingWebhooksCheck.job.ts

@@ -34,9 +34,33 @@ const job: IJobDefinition = {
 
     const dbConnection = await getDbConnection(WRITE_DB_CONFIG())
 
+    // Clean up orphaned webhooks whose integration was deleted (hard or soft).
+    // incomingWebhooks has no FK constraint on integrationId so these accumulate silently.
+    const deleted = await dbConnection.result(
+      `
+      delete from "incomingWebhooks" iw
+      where not exists (
+        select 1 from integrations i
+        where i.id = iw."integrationId"
+          and i."deletedAt" is null
+      )
+      `,
+    )
+    if (deleted.rowCount > 0) {
+      ctx.log.info(
+        `Deleted ${deleted.rowCount} orphaned webhooks with missing or deleted integrations!`,
+      )
+    }
+
     const count = (
       await dbConnection.one(
-        `select count(*)::int as count from "incomingWebhooks" where state = $(state) and "createdAt" < now() - interval '1 day'`,
+        `
+        select count(*)::int as count
+        from "incomingWebhooks" iw
+        join integrations i on iw."integrationId" = i.id and i."deletedAt" is null
+        where iw.state = $(state)
+          and iw."createdAt" < now() - interval '1 day'
+        `,
         { state: WebhookState.PENDING },
       )
     ).count
@@ -50,7 +74,7 @@ const job: IJobDefinition = {
       `
       select iw.id, i.platform
       from "incomingWebhooks" iw
-      join integrations i on iw."integrationId" = i.id
+      join integrations i on iw."integrationId" = i.id and i."deletedAt" is null
       where iw.state = $(state)
         and iw."createdAt" < now() - interval '1 day'
       order by iw."createdAt" asc

services/libs/data-access-layer/src/old/apps/data_sink_worker/repo/requestedForErasureMemberIdentities.repo.ts

@@ -1,4 +1,3 @@
-import { singleOrDefault } from '@crowd/common'
 import { DbStore, RepositoryBase } from '@crowd/database'
 import { Logger } from '@crowd/logging'
 import { IMemberIdentity, MemberIdentityType } from '@crowd/types'
@@ -75,13 +74,16 @@ export default class RequestedForErasureMemberIdentitiesRepository extends Repos
 
       if (identity.type === MemberIdentityType.EMAIL) {
         // SQL matches case-insensitively (lower(value) = lower(?)), so mirror that here.
-        const row = singleOrDefault(data, (r) => {
-          return (
-            r.type === identity.type &&
-            r.value.toLowerCase() === identity.value.toLowerCase() &&
-            r.platform === identity.platform
-          )
-        })
+        // Using find instead of singleOrDefault: case-insensitive matching could produce
+        // multiple hits if the DB has rows with differing casing for the same email,
+        // causing singleOrDefault to throw.
+        const row =
+          data.find(
+            (r) =>
+              r.type === identity.type &&
+              r.value.toLowerCase() === identity.value.toLowerCase() &&
+              r.platform === identity.platform,
+          ) ?? null
 
         if (row) {
           results.set(identity, true)