fix: clarify org affiliation policy comments for member unmerge and role merge

Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>

Author: skwowet

services/libs/common_services/src/services/member/unmerge.ts

@@ -543,6 +543,9 @@ export async function unmergeMember(
       const newRoleId = await addMemberRole(tx, { ...role, memberId: secondaryId })
       if (newRoleId) {
         const isBlocked = orgAffiliationPolicies.get(role.organizationId) ?? false
+        // Only org-level policy blocks are restored here. Pre-merge manual row-level
+        // blocks and isPrimaryWorkExperience flags are not restored because the unmerge
+        // backup does not carry override data.
         if (isBlocked) {
           await changeMemberOrganizationAffiliationOverrides(tx, [
             {

services/libs/data-access-layer/src/members/organizations.ts

@@ -1102,11 +1102,13 @@ export async function mergeRoles(
       secondaryAffiliationOverrides.some((s) => s.memberOrganizationId === r.role.id),
     )
     if (!newRoleId) {
+      // Use targetOrganizationId so the comparison works in both member-merge
+      // (org unchanged) and org-merge (secondary org -> primary org) contexts.
       const directSecondaryRole = secondaryRoles.find((role) =>
         secondaryAffiliationOverrides.some(
           (override) =>
             override.memberOrganizationId === role.id &&
-            role.organizationId === addRole.organizationId &&
+            mergeStrat.targetOrganizationId(role) === addRole.organizationId &&
             role.title === addRole.title,
         ),
       )