Skip to content

fix(policies): preserve entityId when re-generating a policy #2382

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
Marfuen merged 3 commits into from
Apr 2, 2026
+10 −1
Merged

fix(policies): preserve entityId when re-generating a policy #2382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b14e209
fix(policies): preserve entityId when re-generating a policy
tofikwest Mar 30, 2026
fdf1209
Merge branch 'main' into eng-90-fix-policy-entityid-null
tofikwest Apr 2, 2026
71f0637
Merge branch 'main' into eng-90-fix-policy-entityid-null
Marfuen Apr 2, 2026
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
5 changes: 5 additions & 0 deletions apps/api/src/trigger/policies/update-policy-helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,12 @@ export async function updatePolicyInDatabase(
}

await db.$transaction(async (tx) => {
// Clear version references first to avoid FK constraint issues during deletion
if (policy.versions.length > 0) {
await tx.policy.update({
where: { id: policyId },
data: { currentVersionId: null, pendingVersionId: null },
});
await tx.policyVersion.deleteMany({ where: { policyId } });
}

Expand Down
6 changes: 5 additions & 1 deletion apps/app/src/trigger/tasks/onboarding/update-policies-helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,8 +561,12 @@ export async function updatePolicyInDatabase(

// Use transaction to ensure atomicity - if any step fails, all are rolled back
await db.$transaction(async (tx) => {
// Delete all existing versions
// Clear version references first to avoid FK constraint issues during deletion
if (policy.versions.length > 0) {
await tx.policy.update({
where: { id: policyId },
data: { currentVersionId: null, pendingVersionId: null },
});
await tx.policyVersion.deleteMany({
where: { policyId },
});
Expand Down
Loading