From 68b2706797319ea8e394fc70492584e18047ef22 Mon Sep 17 00:00:00 2001
From: Steven Nguyen <stnguyen90@users.noreply.github.com>
Date: Fri, 15 Sep 2023 17:04:56 -0700
Subject: [PATCH 1/2] Fix project deletion

The project deletion failed because old code for deleting domain was
still present. By removing the old code and replacing it with the new
delete rule code, the project deletion is now working.
---
 app/workers/deletes.php | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index f3968c07f2..4ef3bdde2c 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -71,7 +71,7 @@ class DeletesV1 extends Worker
                         $this->deleteInstallation($document, $project);
                         break;
                     case DELETE_TYPE_RULES:
-                        $this->deleteRule($document, $project);
+                        $this->deleteRule($document);
                         break;
                     default:
                         if (\str_starts_with($document->getCollection(), 'database_')) {
@@ -369,14 +369,6 @@ class DeletesV1 extends Worker
         // Delete project certificates
         $dbForConsole = $this->getConsoleDB();
 
-        $domains = $dbForConsole->find('domains', [
-            Query::equal('projectInternalId', [$projectInternalId])
-        ]);
-
-        foreach ($domains as $domain) {
-            $this->deleteCertificates($domain);
-        }
-
         // Delete project tables
         $dbForProject = $this->getProjectDB($document);
 
@@ -397,10 +389,12 @@ class DeletesV1 extends Worker
             Query::equal('projectInternalId', [$projectInternalId])
         ], $dbForConsole);
 
-        // Delete Domains
-        $this->deleteByGroup('domains', [
+        // Delete project and function rules
+        $this->deleteByGroup('rules', [
             Query::equal('projectInternalId', [$projectInternalId])
-        ], $dbForConsole);
+        ], $dbForConsole, function (Document $document) {
+            $this->deleteRule($document);
+        });
 
         // Delete Keys
         $this->deleteByGroup('keys', [
@@ -861,7 +855,7 @@ class DeletesV1 extends Worker
      * @param Document $document rule document
      * @param Document $project project document
      */
-    protected function deleteRule(Document $document, Document $project): void
+    protected function deleteRule(Document $document): void
     {
         $consoleDB = $this->getConsoleDB();
 

From d731d2b619be83fb2feb5f30693df91224232753 Mon Sep 17 00:00:00 2001
From: Steven Nguyen <stnguyen90@users.noreply.github.com>
Date: Thu, 21 Sep 2023 15:35:40 -0700
Subject: [PATCH 2/2] Remove legacy comment

---
 app/workers/deletes.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index 4ef3bdde2c..93df4e0a3a 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -366,7 +366,6 @@ class DeletesV1 extends Worker
         $projectId = $document->getId();
         $projectInternalId = $document->getInternalId();
 
-        // Delete project certificates
         $dbForConsole = $this->getConsoleDB();
 
         // Delete project tables