From 004bb82688e401385aebcc898fb24cf9129da469 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Thu, 12 Jan 2023 22:42:07 +1300
Subject: [PATCH] Fix functions + builds not deleted

---
 app/workers/deletes.php        | 12 +++++++++---
 src/Appwrite/Resque/Worker.php |  5 +++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index 605f989ee1..2fbaf73b18 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -253,8 +253,10 @@ class DeletesV1 extends Worker
      */
     protected function deleteProject(Document $document): void
     {
+        $projectId = $document->getId();
+
         // Delete project tables
-        $dbForProject = $this->getProjectDB($document->getId(), $document);
+        $dbForProject = $this->getProjectDB($projectId, $document);
 
         $limit = 50;
         $offset = 0;
@@ -282,10 +284,14 @@ class DeletesV1 extends Worker
         }
 
         // Delete all storage directories
-        $uploads = $this->getFilesDevice($document->getId());
-        $cache = new Local(APP_STORAGE_CACHE . '/app-' . $document->getId());
+        $uploads = $this->getFilesDevice($projectId);
+        $functions = $this->getFunctionsDevice($projectId);
+        $builds = $this->getBuildsDevice($projectId);
+        $cache = $this->getCacheDevice($projectId);
 
         $uploads->delete($uploads->getRoot(), true);
+        $functions->delete($functions->getRoot(), true);
+        $builds->delete($builds->getRoot(), true);
         $cache->delete($cache->getRoot(), true);
     }
 
diff --git a/src/Appwrite/Resque/Worker.php b/src/Appwrite/Resque/Worker.php
index 6de22c6441..bfaab0eeae 100644
--- a/src/Appwrite/Resque/Worker.php
+++ b/src/Appwrite/Resque/Worker.php
@@ -296,6 +296,11 @@ abstract class Worker
         return $this->getDevice(APP_STORAGE_BUILDS . '/app-' . $projectId);
     }
 
+    protected function getCacheDevice(string $projectId): Device
+    {
+        return $this->getDevice(APP_STORAGE_CACHE . '/app-' . $projectId);
+    }
+
     /**
      * Get Device based on selected storage environment
      * @param string $root path of the device