From 0bde633c5f585f1c958e601f43c73ac1ad0b0211 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 16 Jun 2026 23:52:22 +0000
Subject: [PATCH] chore: simplify policy rule update/delete lookups

---
 server/routers/resource/deleteResourceRule.ts |  6 ++++--
 server/routers/resource/updateResourceRule.ts | 14 +++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

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();