From 8fbc517b17ad1014de25b93e296f8011f8c7095f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 2 Apr 2025 16:47:37 +0200
Subject: [PATCH] Fix rules cleanup

---
 src/Appwrite/Platform/Workers/Deletes.php | 34 ++---------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php
index 4b5b11bce7..d22cdaee3b 100644
--- a/src/Appwrite/Platform/Workers/Deletes.php
+++ b/src/Appwrite/Platform/Workers/Deletes.php
@@ -831,7 +831,6 @@ class Deletes extends Action
             $this->deleteBuildFiles($deviceForBuilds, $document);
             $this->deleteDeploymentFiles($deviceForSites, $document);
             $this->deleteDeploymentScreenshots($deviceForFiles, $dbForPlatform, $document);
-            $this->deleteDeploymentRules($dbForPlatform, $document, $project, $certificates);
         });
 
         /**
@@ -846,20 +845,6 @@ class Deletes extends Action
             });
         }
 
-        /**
-         * Delete rules for all deployments of the site
-         */
-        foreach ($deploymentIds as $deploymentId) {
-            Console::info("Deleting rules for site " . $siteId .  "'s deployment " . $deploymentId);
-            $this->deleteByGroup('rules', [
-                Query::equal('type', ['deployment']),
-                Query::equal('value', [$deploymentId]),
-                Query::equal('projectInternalId', [$project->getInternalId()])
-            ], $dbForPlatform, function (Document $document) use ($dbForPlatform, $certificates) {
-                $this->deleteRule($dbForPlatform, $document, $certificates);
-            });
-        }
-
         /**
          * Delete VCS Repositories and VCS Comments
          */
@@ -900,7 +885,7 @@ class Deletes extends Action
         Console::info("Deleting rules for function " . $functionId);
         $this->deleteByGroup('rules', [
             Query::equal('type', ['deployment']),
-            Query::equal('deploymentResourceType', ['site']),
+            Query::equal('deploymentResourceType', ['function']),
             Query::equal('deploymentResourceInternalId', [$functionInternalId]),
             Query::equal('projectInternalId', [$project->getInternalId()])
         ], $dbForPlatform, function (Document $document) use ($project, $dbForPlatform, $certificates) {
@@ -928,7 +913,6 @@ class Deletes extends Action
             $deploymentInternalIds[] = $document->getInternalId();
             $this->deleteDeploymentFiles($deviceForFunctions, $document);
             $this->deleteBuildFiles($deviceForBuilds, $document);
-            $this->deleteDeploymentRules($dbForPlatform, $document, $project, $certificates);
         });
 
         /**
@@ -963,18 +947,6 @@ class Deletes extends Action
         $this->deleteRuntimes($getProjectDB, $document, $project);
     }
 
-    private function deleteDeploymentRules(Database $dbForPlatform, Document $deployment, Document $project, CertificatesAdapter $certificates): void
-    {
-        Console::info("Deleting rules for site " . $deployment->getId());
-        $this->deleteByGroup('rules', [
-            Query::equal('type', ['deployment']),
-            Query::equal('deploymentInternalId', [$deployment->getInternalId()]),
-            Query::equal('projectInternalId', [$project->getInternalId()])
-        ], $dbForPlatform, function (Document $document) use ($dbForPlatform, $certificates) {
-            $this->deleteRule($dbForPlatform, $document, $certificates);
-        });
-    }
-
     private function deleteDeploymentScreenshots(Device $deviceForFiles, Database $dbForPlatform, Document $deployment): void
     {
         $screenshotIds = [];
@@ -1125,9 +1097,9 @@ class Deletes extends Action
          */
         Console::info("Deleting rules for deployment " . $deploymentId);
         $this->deleteByGroup('rules', [
-            Query::equal('trigger', ['manual']),
+            Query::equal('trigger', ['deployment']),
             Query::equal('type', ['deployment']),
-            Query::equal('deploymentResourceInternalId', [$deploymentInternalId]),
+            Query::equal('deploymentInternalId', [$deploymentInternalId]),
             Query::equal('projectInternalId', [$project->getInternalId()])
         ], $dbForPlatform, function (Document $document) use ($dbForPlatform, $certificates) {
             $this->deleteRule($dbForPlatform, $document, $certificates);