Skip to content

fix: keep LFX organizations as primary in merge suggestions #4106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skwowet merged 4 commits into from
May 13, 2026
+13 −7
Merged

fix: keep LFX organizations as primary in merge suggestions #4106

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64da245
fix: keep LFX organizations as primary in merge suggestions
skwowet May 12, 2026
924ed5a
fix: ensure correct organization order for LFX membership in merge su…
skwowet May 12, 2026
297f3b0
fix: resolve pr review comments
skwowet May 12, 2026
359a056
fix: resolve pr review comments
skwowet May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions services/apps/merge_suggestions_worker/src/activities/organizationMergeSuggestions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,15 +347,21 @@ export async function getOrganizationMergeSuggestions(
continue
}

// Calculate similarity score between organizations
const secondaryOrg = opensearchToFullOrg(organizationToMerge._source)

const similarityConfidenceScore = OrganizationSimilarityCalculator.calculateSimilarity(
fullOrg,
opensearchToFullOrg(organizationToMerge._source),
secondaryOrg,
)

// Sort organizations: primary has more identities/activity, secondary is the one to merge
const organizationsSorted = [fullOrg, opensearchToFullOrg(organizationToMerge._source)].sort(
(a, b) => {
let organizationsSorted: IOrganizationFullAggregatesOpensearch[]
if (secondaryOrgWithLfxMembership && !primaryOrgWithLfxMembership) {
organizationsSorted = [secondaryOrg, fullOrg]
} else if (primaryOrgWithLfxMembership && !secondaryOrgWithLfxMembership) {
organizationsSorted = [fullOrg, secondaryOrg]
} else {
// Sort organizations: primary has more identities/activity, secondary is the one to merge
organizationsSorted = [fullOrg, secondaryOrg].sort((a, b) => {
if (
a.identities.length > b.identities.length ||
Comment thread
skwowet marked this conversation as resolved.
(a.identities.length === b.identities.length && a.activityCount > b.activityCount)
Expand All @@ -368,8 +374,8 @@ export async function getOrganizationMergeSuggestions(
return 1
}
return 0
},
)
})
}
Comment thread
skwowet marked this conversation as resolved.

mergeSuggestions.push({
similarity: similarityConfidenceScore,
Expand Down
Loading