Skip to content

Commit 34e1d48

Browse files
joanagmaiaskwowet
andauthored
Fix issues with merge suggestions (#2909)
Co-authored-by: Yeganathan S <hilariousengineer@protonmail.com>
1 parent 7faccc9 commit 34e1d48

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ export async function getMembers(
286286
MemberField.DISPLAY_NAME,
287287
MemberField.ATTRIBUTES,
288288
],
289+
orderBy: `${MemberField.ID} asc`,
289290
limit: batchSize,
290291
})
291292

services/apps/merge_suggestions_worker/src/memberSimilarityCalculator.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ class MemberSimilarityCalculator {
4646
return 0.2
4747
}
4848

49-
// check displayName match
50-
if (
51-
similarMember.keyword_displayName.toLowerCase() === primaryMember.displayName.toLowerCase()
52-
) {
53-
return this.decideMemberSimilarityUsingAdditionalChecks(primaryMember, similarMember)
54-
}
55-
5649
// We check if there are any verified<->unverified email matches between primary & similar members
5750
if (
5851
(similarMemberUnverifiedEmails &&
@@ -114,6 +107,13 @@ class MemberSimilarityCalculator {
114107
}
115108
}
116109

110+
// check displayName match
111+
if (
112+
similarMember.keyword_displayName.toLowerCase() === primaryMember.displayName.toLowerCase()
113+
) {
114+
return this.decideMemberSimilarityUsingAdditionalChecks(primaryMember, similarMember)
115+
}
116+
117117
// calculate similarity percentage
118118
const identityLength = similarPrimaryIdentity?.value.length || 0
119119

0 commit comments

Comments
 (0)