fix mergeWithLLM workflow for members and organizations when it fails find data

services/apps/merge_suggestions_worker/src/activities.ts

@@ -12,6 +12,7 @@ import {
   getMembers,
   getMembersForLLMConsumption,
   getRawMemberMergeSuggestions,
+  removeRawMemberMergeSuggestions,
   updateMemberMergeSuggestionsLastGeneratedAt,
 } from './activities/memberMergeSuggestions'
 import {
@@ -21,6 +22,7 @@ import {
   getOrganizations,
   getOrganizationsForLLMConsumption,
   getRawOrganizationMergeSuggestions,
+  removeRawOrganizationMergeSuggestions,
   updateOrganizationMergeSuggestionsLastGeneratedAt,
 } from './activities/organizationMergeSuggestions'
 
@@ -40,7 +42,9 @@ export {
   getMembersForLLMConsumption,
   getOrganizationsForLLMConsumption,
   getRawOrganizationMergeSuggestions,
+  removeRawOrganizationMergeSuggestions,
   getRawMemberMergeSuggestions,
+  removeRawMemberMergeSuggestions,
   saveLLMVerdict,
   mergeMembers,
   mergeOrganizations,

services/apps/merge_suggestions_worker/src/activities/memberMergeSuggestions.ts

@@ -350,3 +350,11 @@ export async function getRawMemberMergeSuggestions(
   )
   return memberMergeSuggestionsRepo.getRawMemberSuggestions(similarityFilter, limit)
 }
+
+export async function removeRawMemberMergeSuggestions(suggestion: string[]): Promise<void> {
+  const memberMergeSuggestionsRepo = new MemberMergeSuggestionsRepository(
+    svc.postgres.writer.connection(),
+    svc.log,
+  )
+  await memberMergeSuggestionsRepo.removeRawMemberSuggestions(suggestion)
+}

services/apps/merge_suggestions_worker/src/activities/organizationMergeSuggestions.ts

@@ -427,3 +427,11 @@ export async function getRawOrganizationMergeSuggestions(
 
   return suggestions
 }
+
+export async function removeRawOrganizationMergeSuggestions(suggestion: string[]): Promise<void> {
+  const organizationMergeSuggestionsRepo = new OrganizationMergeSuggestionsRepository(
+    svc.postgres.writer.connection(),
+    svc.log,
+  )
+  await organizationMergeSuggestionsRepo.removeRawOrganizationMergeSuggestions(suggestion)
+}

services/apps/merge_suggestions_worker/src/workflows/mergeMembersWithLLM.ts

@@ -63,6 +63,7 @@ export async function mergeMembersWithLLM(
 
     if (members.length !== 2) {
       console.log(`Failed getting members data in suggestion. Skipping suggestion: ${suggestion}`)
+      await memberActivitiesProxy.removeRawMemberMergeSuggestions(suggestion)
       continue
     }
 

services/apps/merge_suggestions_worker/src/workflows/mergeOrganizationsWithLLM.ts

@@ -51,6 +51,7 @@ export async function mergeOrganizationsWithLLM(
       console.log(
         `Failed getting organization data in suggestion. Skipping suggestion: ${suggestion}`,
       )
+      await organizationActivitiesProxy.removeRawOrganizationMergeSuggestions(suggestion)
       continue
     }
 

services/libs/data-access-layer/src/old/apps/merge_suggestions_worker/memberMergeSuggestions.repo.ts

@@ -283,6 +283,28 @@ class MemberMergeSuggestionsRepository {
 
     return results.map((r) => [r.memberId, r.toMergeId])
   }
+
+  async removeRawMemberSuggestions(suggestion: string[]): Promise<void> {
+    const query = `
+      delete from "memberToMergeRaw" 
+      where 
+        ("memberId" = $(memberId) and "toMergeId" = $(toMergeId))
+        or 
+        ("memberId" = $(toMergeId) and "toMergeId" = $(memberId))
+    `
+
+    const replacements = {
+      memberId: suggestion[0],
+      toMergeId: suggestion[1],
+    }
+
+    try {
+      await this.connection.none(query, replacements)
+    } catch (error) {
+      this.log.error('Error removing raw member suggestions', error)
+      throw error
+    }
+  }
 }
 
 export default MemberMergeSuggestionsRepository

services/libs/data-access-layer/src/old/apps/merge_suggestions_worker/organizationMergeSuggestions.repo.ts

@@ -300,6 +300,28 @@ class OrganizationMergeSuggestionsRepository {
 
     return results.map((r) => [r.organizationId, r.toMergeId])
   }
+
+  async removeRawOrganizationMergeSuggestions(suggestion: string[]): Promise<void> {
+    const query = `
+      delete from "organizationToMergeRaw" 
+      where 
+        ("organizationId" = $(organizationId) and "toMergeId" = $(toMergeId))
+        or 
+        ("organizationId" = $(toMergeId) and "toMergeId" = $(organizationId))
+    `
+
+    const replacements = {
+      organizationId: suggestion[0],
+      toMergeId: suggestion[1],
+    }
+
+    try {
+      await this.connection.none(query, replacements)
+    } catch (error) {
+      this.log.error('Error removing raw organization suggestions', error)
+      throw error
+    }
+  }
 }
 
 export default OrganizationMergeSuggestionsRepository