[skwowet]

Summary

When a merge is reverted, work-history roles with source ui that came from the secondary stay on the primary. The restored secondary also gets them back from its backup, so both end up with the same roles. This affects member and organization unmerge. The dissect workflow reverts a whole merge chain, so one profile's ui roles end up on every member it restores.

Example: member B has a ui role at Acme (acme.com). Merge B into A, then unmerge. Before this PR, A and B both have the Acme role. After it, only B does.

Cause

Two ui exceptions in the unmerge path:

• unmergeRoles keeps every ui role on the primary without checking where it came from.
• The cleanup that runs after the secondary is restored skips ui roles, so nothing removes them. Dissect posts the raw merge backup and never calls unmergeRoles, so this alone causes the leak there.

Changes

• unmergeRoles (used by both member and organization unmerge): a ui role is removed from the primary only if it matches a role in the secondary backup and none in the primary backup. ui roles the primary had before the merge, or that were added after it, stay. Other sources are unchanged.
• unmergeMember: the cleanup also deletes ui roles that are missing from the primary payload and are being restored to the secondary.
• OrganizationService.unmerge: the cleanup no longer skips ui roles. It already runs unmergeRoles on the organization's live roles, so the rule above decides which ones stay.
• roleExistsInArray compares dates by value. It is now used by both cleanups. The backend reads live roles through Sequelize as Date objects, while backups and payloads hold date strings, so the old === check never matched a dated role.

Roles are matched on organization (or member, for organization unmerge), title, dateStart and dateEnd.

Because dated roles never matched before, the cleanup deleted every dated role on the primary, from any source, whenever the secondary had roles. With the date fix, the primary keeps the dated roles it had before the merge.

Type of change

• Bug fix
• New feature
• Refactor / cleanup
• Performance improvement
• Chore / dependency update
• Documentation

Related issue

Refs linuxfoundation/lfx-cdp-insights-ops#855

[greptile-apps]

Confidence Score: 5/5

[Medium impact] The PR appears safe to merge; the previous date-matching issue is fixed.

Summary

Fixes work-history roles left on the primary after an unmerge.

• Unmerge returns secondary-only UI work-history roles to the restored profile.

_{Reviews (2) · Last reviewed commit: "fix: compare unmerge role dates by value" · Reviewed by Greptile}

[Copilot]

🟡 Changes recommended

Unmerge cleanup can delete primary role history from coalesced intervals, while strict Date-versus-string comparisons retain secondary-only history on both restored entities.

2 open issues

• Preserve primary UI-role history when deleting merged duplicates · New
• Normalize role dates before comparing restored backup records · New

What changed in this PR

This PR targets duplicated UI-entered work history during member and organization unmerge, including repeated restores through the dissect workflow.

Changes:

• Uses merge backups to identify UI roles belonging only to the secondary entity.
• Extends member cleanup to remove matching secondary UI roles absent from the primary payload.
• Allows organization cleanup to delete UI roles excluded by the shared unmerge logic.

File	Description
services/​libs/​common_services/​src/​services/​member/​unmerge.ts	Reuses role matching and extends stale-role cleanup to selected UI roles.
services/​libs/​common_services/​src/​services/​member-organization.ts	Exports the role comparator and adds backup-based UI-role ownership checks.
backend/​src/​services/​organizationService.ts	Removes the blanket UI-role exemption from organization unmerge cleanup.

_{Review effort: Balanced}

[Copilot]

🔵 Needs a closer look

The cleanup can misclassify a coalesced role as secondary-only and delete the primary’s original work history because neither unmerge path persists the restored primary stint.

2 open issues

• Preserve primary UI-role history when deleting merged duplicates
• Normalize role dates before comparing restored backup records

_{Review effort: Balanced}