fix(cohort): defer membership sync for unlinked targets and reconcile on link#373
Open
jorisjonkers-dev-agents[bot] wants to merge 2 commits into
Open
fix(cohort): defer membership sync for unlinked targets and reconcile on link#373jorisjonkers-dev-agents[bot] wants to merge 2 commits into
jorisjonkers-dev-agents[bot] wants to merge 2 commits into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Cohort membership
ADDfor a cohort with no linked external target failed terminally withCohortTargetNotLinkedException, so every manual member-add to an unlinked cohort (e.g. "Members 2024-2025" / "Members 2025-2026", which have no Brevo list linked) became a red failed job, and the members never converged even after a target was later linked.ADDfor a cohort with no linked target is now a benign, deferred no-op: it logs a warning and returns instead of failing the job. The desiredcohort_memberrow stays unsynced and converges later, rather than flooding the execution monitor with failures.linkExistingnow enqueues aReconcileListfor the cohort after recording the target id. The reconcile path already re-enqueuesSyncCohortMembership ADDfor desired-but-absent members (enqueueFollowUpsForMissing), so once an operator links a target to a previously-unbound cohort, its already-desired members are pushed automatically.Together: a not-yet-linked cohort no longer produces failed jobs, and linking its target makes the pending members converge on their own. No API surface changes.
Verification
./gradlew :services:api:test --tests '*CohortMembershipSyncServiceTest' --tests '*CohortTargetingServiceTest' --tests '*CohortRemediationServiceTest' --tests '*cohort*'— 111 passed./gradlew :services:api:compileKotlin :services:api:compileTestKotlingit diff --exit-code -- services/api/openapi.json— cleanThe change was reproduced first with failing tests (the membership add asserted no exception;
linkExistingasserted a reconcile enqueue), then fixed.