Skip to content

fix: keep the lfx member as primary when merging orgs with llm #5042

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 1 commit into from
Oct 20, 2026
Merged

fix: keep the lfx member as primary when merging orgs with llm #5042

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 19 additions & 13 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 @@ -2,7 +2,10 @@
import uniqBy from 'lodash.uniqby'

import { OrganizationField, findOrgById, queryOrgs } from '@crowd/data-access-layer'
import { hasLfxMembership } from '@crowd/data-access-layer/src/lfx_memberships'
import {
findManyLfxMemberships,
hasLfxMembership,
} from '@crowd/data-access-layer/src/lfx_memberships'
import OrganizationMergeSuggestionsRepository from '@crowd/data-access-layer/src/old/apps/merge_suggestions_worker/organizationMergeSuggestions.repo'
import {
insertOrganizationNoMerge,
Expand Down Expand Up @@ -479,21 +482,24 @@ export async function getRawOrganizationMergeSuggestions(
onlyLFXMembers,
organizationIds,
)
if (onlyLFXMembers) {
// make sure primary is lfx member
for (let i = 0; i < suggestions.length; i++) {
const qx = pgpQx(svc.postgres.reader.connection())
const isPrimaryOrgInSuggestionLFXMember = await hasLfxMembership(qx, {
organizationId: suggestions[i][0],
})

if (!isPrimaryOrgInSuggestionLFXMember) {
suggestions[i] = [suggestions[i][1], suggestions[i][0]]
}
}
if (suggestions.length === 0) {
return suggestions
}

return suggestions
// Pair order is fixed when first queued, but LFX memberships can move later (e.g. re-imports).
// The merge API refuses to merge away an LFX member, so it must be the primary.
const qx = pgpQx(svc.postgres.reader.connection())
const lfxMemberships = await findManyLfxMemberships(qx, {
organizationIds: suggestions.flat(),
})
const lfxMemberIds = new Set(lfxMemberships.map((membership) => membership.organizationId))

return suggestions.map(([primaryId, secondaryId]) =>
lfxMemberIds.has(secondaryId) && !lfxMemberIds.has(primaryId)
? [secondaryId, primaryId]
: [primaryId, secondaryId],
)
}

export async function removeOrganizationMergePair(suggestion: string[]): Promise<void> {
Expand Down
Loading