diff --git a/server/routers/resource/deleteResourceRule.ts b/server/routers/resource/deleteResourceRule.ts index 7c21e30ea..babb14c77 100644 --- a/server/routers/resource/deleteResourceRule.ts +++ b/server/routers/resource/deleteResourceRule.ts @@ -74,13 +74,15 @@ export async function deleteResourceRule( } if (resource.resourcePolicyId !== null) { - const policyId = resource.resourcePolicyId; const [deletedRule] = await db .delete(resourcePolicyRules) .where( and( eq(resourcePolicyRules.ruleId, ruleId), - eq(resourcePolicyRules.resourcePolicyId, policyId) + eq( + resourcePolicyRules.resourcePolicyId, + resource.resourcePolicyId + ) ) ) .returning(); diff --git a/server/routers/resource/updateResourceRule.ts b/server/routers/resource/updateResourceRule.ts index bcfc87601..fd76d4add 100644 --- a/server/routers/resource/updateResourceRule.ts +++ b/server/routers/resource/updateResourceRule.ts @@ -151,16 +151,17 @@ export async function updateResourceRule( ); } - const policyId = resource.resourcePolicyId; - - if (policyId !== null) { + if (resource.resourcePolicyId !== null) { const [existingRule] = await db .select() .from(resourcePolicyRules) .where( and( eq(resourcePolicyRules.ruleId, ruleId), - eq(resourcePolicyRules.resourcePolicyId, policyId) + eq( + resourcePolicyRules.resourcePolicyId, + resource.resourcePolicyId + ) ) ) .limit(1); @@ -195,7 +196,10 @@ export async function updateResourceRule( .where( and( eq(resourcePolicyRules.ruleId, ruleId), - eq(resourcePolicyRules.resourcePolicyId, policyId) + eq( + resourcePolicyRules.resourcePolicyId, + resource.resourcePolicyId + ) ) ) .returning();