Fix org merge suggestions exceeding OpenSearch clause limit (#3004)

Author: skwowet

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

@@ -122,6 +122,13 @@ export async function getOrganizationMergeSuggestions(
     return []
   }
 
+  const noMergeIds = await organizationMergeSuggestionsRepo.findNoMergeIds(fullOrg.id)
+  const excludeIds = [fullOrg.id]
+
+  if (noMergeIds && noMergeIds.length > 0) {
+    excludeIds.push(...noMergeIds)
+  }
+
   const identitiesShould = []
   const identitiesPartialQuery = {
     should: [
@@ -145,8 +152,8 @@ export async function getOrganizationMergeSuggestions(
     minimum_should_match: 1,
     must_not: [
       {
-        term: {
-          uuid_organizationId: fullOrg.id,
+        terms: {
+          uuid_organizationId: excludeIds,
         },
       },
     ],
@@ -166,7 +173,7 @@ export async function getOrganizationMergeSuggestions(
   )
 
   // limit to prevent exceeding OpenSearch's maxClauseCount (1024)
-  for (const identity of identities.slice(0, 140)) {
+  for (const identity of identities.slice(0, 120)) {
     if (identity.value.length > 0) {
       // weak identity search
       identitiesShould.push({
@@ -236,18 +243,6 @@ export async function getOrganizationMergeSuggestions(
     identitiesPartialQuery.should.pop()
   }
 
-  const noMergeIds = await organizationMergeSuggestionsRepo.findNoMergeIds(fullOrg.id)
-
-  if (noMergeIds && noMergeIds.length > 0) {
-    for (const noMergeId of noMergeIds) {
-      identitiesPartialQuery.must_not.push({
-        term: {
-          uuid_organizationId: noMergeId,
-        },
-      })
-    }
-  }
-
   const similarOrganizationsQueryBody = {
     query: {
       bool: identitiesPartialQuery,