fix: prevent stale activityRelations in affiliations refresh (CM-1132) by skwowet · Pull Request #4088 · linuxfoundation/crowd.dev

skwowet · 2026-05-07T14:23:19Z

Summary

When a member had memberSegmentAffiliations (MSA) rows, the affiliation timeline builder mixed them together with memberOrganizations into a single timeline. selectPrimaryWorkExperience would pick the MSA as the primary org for any overlapping date range (MSAs have highest precedence), producing a TimelineItem with a segmentId.

processAffiliationActivities then applied WHERE segmentId = X for that item, so activities in other segments were never updated. This left stale organizationId values in activityRelations for the unprocessed segments.

What changed

The timeline is now split into two passes:

Base timeline
Built from memberOrganizations only, without a segmentId, and applies globally across all segments. When MSAs exist, each item is flagged with skipManualAffiliationSegments.
Manual timeline
Built per MSA group (grouped by segmentId), with each item scoped to its segment. Gap items (null org) are discarded since the base timeline already covers those date ranges.

In processAffiliationActivities, the skipManualAffiliationSegments flag adds a NOT EXISTS (SELECT 1 FROM memberSegmentAffiliations ...) condition so the base pass skips activity rows already covered by an MSA. Those rows are then handled by the manual pass.

This ensures every activityRelations row is updated exactly once, with no double updates and no missed rows.

Note

Medium Risk
Updates the affiliation refresh logic and SQL update criteria for activityRelations, which can affect large batches of rows and correctness of organization attribution across segments.

Overview
Fixes affiliation refresh so memberSegmentAffiliations no longer cause some segments’ activityRelations.organizationId to remain stale.

The timeline build is split into a base (global) pass from memberOrganizations and a manual (per-segment) pass from MSAs; buildTimeline now accepts a single affiliations list and can omit the fallback range. TimelineItem adds skipManualAffiliationSegments, and processAffiliationActivities uses it to add a NOT EXISTS guard so the base pass won’t overwrite rows covered by MSAs; SQL conditions were also updated to consistently use the ar alias.

^{Reviewed by Cursor Bugbot for commit ef5ebae. Bugbot is set up for automated code reviews on this repo. Configure here.}

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

github-actions · 2026-05-07T14:23:40Z

⚠️ Jira Issue Key Missing

Your PR title doesn't contain a Jira issue key. Consider adding it for better traceability.

Example:

feat: add user authentication (CM-123)
feat: add user authentication (IN-123)

Projects:

CM: Community Data Platform
IN: Insights

Please add a Jira issue key to your PR title.

github-actions · 2026-05-07T14:23:46Z

⚠️ Jira Issue Key Missing

Your PR title doesn't contain a Jira issue key. Consider adding it for better traceability.

Example:

feat: add user authentication (CM-123)
feat: add user authentication (IN-123)

Projects:

CM: Community Data Platform
IN: Insights

Please add a Jira issue key to your PR title.

github-actions · 2026-05-07T14:23:58Z

⚠️ Jira Issue Key Missing

Your PR title doesn't contain a Jira issue key. Consider adding it for better traceability.

Example:

feat: add user authentication (CM-123)
feat: add user authentication (IN-123)

Projects:

CM: Community Data Platform
IN: Insights

Please add a Jira issue key to your PR title.

github-actions · 2026-05-07T14:24:17Z

⚠️ Jira Issue Key Missing

Your PR title doesn't contain a Jira issue key. Consider adding it for better traceability.

Example:

feat: add user authentication (CM-123)
feat: add user authentication (IN-123)

Projects:

CM: Community Data Platform
IN: Insights

Please add a Jira issue key to your PR title.

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit b20038a. Configure here.}

Copilot

Pull request overview

This PR fixes a correctness issue in affiliation refresh where memberSegmentAffiliations (manual, segment-scoped) could prevent updates to activityRelations in other segments, leaving stale organizationId values. The approach splits affiliation processing into a global “base” pass (member organizations only) plus per-segment “manual” passes, and ensures the base pass skips rows covered by manual affiliations.

Changes:

Extend TimelineItem with skipManualAffiliationSegments to control base-pass skipping behavior.
Split timeline building into base (global) vs manual (per segment) passes, and discard manual “gap” items.
Update the activityRelations update query to use alias-qualified columns and add a NOT EXISTS guard to avoid overwriting rows covered by manual affiliations.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

File	Description
services/libs/data-access-layer/src/member-organization-affiliation/types.ts	Adds `skipManualAffiliationSegments` to timeline items to support multi-pass processing.
services/libs/data-access-layer/src/member-organization-affiliation/index.ts	Splits timeline generation into base/manual passes and updates the batch update query with manual-coverage skipping logic.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

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

github-actions · 2026-05-07T14:48:06Z

⚠️ Jira Issue Key Missing

Your PR title doesn't contain a Jira issue key. Consider adding it for better traceability.

Example:

feat: add user authentication (CM-123)
feat: add user authentication (IN-123)

Projects:

CM: Community Data Platform
IN: Insights

Please add a Jira issue key to your PR title.

github-actions · 2026-05-07T14:55:27Z

⚠️ Jira Issue Key Missing

Your PR title doesn't contain a Jira issue key. Consider adding it for better traceability.

Example:

feat: add user authentication (CM-123)
feat: add user authentication (IN-123)

Projects:

CM: Community Data Platform
IN: Insights

Please add a Jira issue key to your PR title.

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

github-actions · 2026-05-07T14:57:35Z

⚠️ Jira Issue Key Missing

Your PR title doesn't contain a Jira issue key. Consider adding it for better traceability.

Example:

feat: add user authentication (CM-123)
feat: add user authentication (IN-123)

Projects:

CM: Community Data Platform
IN: Insights

Please add a Jira issue key to your PR title.

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

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

github-actions · 2026-05-07T15:43:25Z

⚠️ Jira Issue Key Missing

Your PR title doesn't contain a Jira issue key. Consider adding it for better traceability.

Example:

feat: add user authentication (CM-123)
feat: add user authentication (IN-123)

Projects:

CM: Community Data Platform
IN: Insights

Please add a Jira issue key to your PR title.

epipav

looks good 👍 added one comment

epipav · 2026-05-08T08:41:57Z

+          AND msa."segmentId" = ar."segmentId"
+          AND msa."organizationId" IS NOT NULL
+          AND (msa."dateStart" IS NULL OR ar."timestamp" >= msa."dateStart"::date)
+          AND (msa."dateEnd" IS NULL OR ar."timestamp" < msa."dateEnd"::date + interval '1 day')


Why do we have dateEnd + interval '1 day' here?

skwowet added 2 commits May 7, 2026 18:50

fix: separate base and msa timelines to prevent stale activityRelations

53cfac9

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

fix: filter out null organization IDs in affiliation activities query

f77174b

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

skwowet self-assigned this May 7, 2026

Copilot AI review requested due to automatic review settings May 7, 2026 14:23

Merge branch 'main' into hotfix-member-org-affiliation-timeline

b20038a

skwowet requested a review from epipav May 7, 2026 14:23

Copilot started reviewing on behalf of skwowet May 7, 2026 14:24 View session

cursor Bot reviewed May 7, 2026

View reviewed changes

Comment thread services/libs/data-access-layer/src/member-organization-affiliation/index.ts

Copilot AI reviewed May 7, 2026

View reviewed changes

Comment thread services/libs/data-access-layer/src/member-organization-affiliation/index.ts

Comment thread services/libs/data-access-layer/src/member-organization-affiliation/index.ts Outdated

Comment thread services/libs/data-access-layer/src/member-organization-affiliation/index.ts

fix: improve manual timeline handling

5c2352a

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

Merge branch 'main' into hotfix-member-org-affiliation-timeline

dcca1d3

Copilot AI review requested due to automatic review settings May 7, 2026 14:54

Copilot started reviewing on behalf of skwowet May 7, 2026 14:55 View session

revert: code comments we had before

e2453f3

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

Copilot AI reviewed May 7, 2026

View reviewed changes

Comment thread services/libs/data-access-layer/src/member-organization-affiliation/index.ts Outdated

fix: update dateEnd handling in prepareMemberOrganizationAffiliationT…

ef5ebae

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

skwowet changed the title ~~fix: prevent stale activityRelations in affiliations refresh~~ fix: prevent stale activityRelations in affiliations refresh (CM-1132) May 7, 2026

epipav reviewed May 8, 2026

View reviewed changes

Conversation

skwowet commented May 7, 2026 • edited by cursor Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

What changed

Uh oh!

github-actions Bot commented May 7, 2026

Uh oh!

github-actions Bot commented May 7, 2026

Uh oh!

github-actions Bot commented May 7, 2026

Uh oh!

github-actions Bot commented May 7, 2026

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented May 7, 2026

Uh oh!

github-actions Bot commented May 7, 2026

Uh oh!

github-actions Bot commented May 7, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

github-actions Bot commented May 7, 2026

Uh oh!

epipav left a comment

Choose a reason for hiding this comment

Uh oh!

epipav May 8, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

skwowet commented May 7, 2026 •

edited by cursor Bot

Loading