Merge branch 'main' into error-handling-CM-2097

Author: skwowet

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

@@ -286,6 +286,7 @@ export async function getMembers(
         MemberField.DISPLAY_NAME,
         MemberField.ATTRIBUTES,
       ],
+      orderBy: `${MemberField.ID} asc`,
       limit: batchSize,
     })
 

services/apps/merge_suggestions_worker/src/memberSimilarityCalculator.ts

@@ -46,13 +46,6 @@ class MemberSimilarityCalculator {
       return 0.2
     }
 
-    // check displayName match
-    if (
-      similarMember.keyword_displayName.toLowerCase() === primaryMember.displayName.toLowerCase()
-    ) {
-      return this.decideMemberSimilarityUsingAdditionalChecks(primaryMember, similarMember)
-    }
-
     // We check if there are any verified<->unverified email matches between primary & similar members
     if (
       (similarMemberUnverifiedEmails &&
@@ -114,6 +107,13 @@ class MemberSimilarityCalculator {
       }
     }
 
+    // check displayName match
+    if (
+      similarMember.keyword_displayName.toLowerCase() === primaryMember.displayName.toLowerCase()
+    ) {
+      return this.decideMemberSimilarityUsingAdditionalChecks(primaryMember, similarMember)
+    }
+
     // calculate similarity percentage
     const identityLength = similarPrimaryIdentity?.value.length || 0
 

services/libs/data-access-layer/src/old/apps/profiles_worker/index.ts

@@ -440,8 +440,7 @@ export async function updateAffiliationsLastCheckedAt(db: DbStore): Promise<void
   try {
     await db.connection().any(
       `
-        update tenants set "affiliationsLastCheckedAt" = now()
-        limit 1
+        update tenants set "affiliationsLastCheckedAt" = now();
       `,
     )
   } catch (err) {