From 700abb3e4767ce5574a7067ce0cdacce0965bcd7 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Tue, 11 Apr 2023 13:49:45 +0200
Subject: [PATCH 1/2] fix: deletes worker deleting projects with console team

---
 app/workers/deletes.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index 1b43bf66b..42ec0d256 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -58,6 +58,9 @@ class DeletesV1 extends Worker
                         break;
                     case DELETE_TYPE_TEAMS:
                         $this->deleteMemberships($document, $project->getId());
+                        if ($project->getId() === 'console') {
+                            $this->deleteProjectsByTeam($document);
+                        }
                         break;
                     case DELETE_TYPE_BUCKETS:
                         $this->deleteBucket($document, $project->getId());
@@ -263,6 +266,24 @@ class DeletesV1 extends Worker
         ], $this->getProjectDB($projectId));
     }
 
+    /**
+     * @param \Utopia\Database\Document $document
+     * @return void
+     * @throws \Exception
+     */
+    protected function deleteProjectsByTeam(Document $document): void
+    {
+        $dbForConsole = $this->getConsoleDB();
+
+        $projects = $dbForConsole->find('projects', [
+            Query::equal('teamInternalId', [$document->getInternalId()])
+        ]);
+
+        foreach ($projects as $project) {
+            $this->deleteProject($project);
+        }
+    }
+
     /**
      * @param Document $document project document
      * @throws Exception

From fdd18fdc7d64debde5b1d50d4f00d945d81cf7d6 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Tue, 11 Apr 2023 13:52:01 +0200
Subject: [PATCH 2/2] fix: update changelog

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index b5059a8f4..c19edaa0c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@
 ## Bugs
 - Fix not storing function's response on response codes 5xx [#4610](https://github.com/appwrite/appwrite/pull/4610)
 - Fix expire to formatTz in create account session [#4985](https://github.com/appwrite/appwrite/pull/4985)
+- Fix deleting projects when organization is deleted [#5335](https://github.com/appwrite/appwrite/pull/5335)
 
 # Version 1.2.1
 ## Changes