From cabe9895553c57b836fec177cb50a2f679d5be08 Mon Sep 17 00:00:00 2001
From: shimon <shimon@appwrite.io>
Date: Sun, 14 Aug 2022 22:42:20 +0300
Subject: [PATCH] some fixes

---
 app/controllers/api/storage.php            | 10 +++++-----
 tests/e2e/Services/Storage/StorageBase.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index ff5819c414..274137b779 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -1370,6 +1370,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
     ->param('bucketId', null, new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
     ->param('fileId', '', new UID(), 'File ID.')
     ->inject('response')
+    ->inject('request')
     ->inject('dbForProject')
     ->inject('events')
     ->inject('audits')
@@ -1377,7 +1378,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
     ->inject('mode')
     ->inject('deviceFiles')
     ->inject('project')
-    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, Event $events, Audit $audits, Stats $usage, string $mode, Device $deviceFiles, Document $project) {
+    ->action(function (string $bucketId, string $fileId, Response $response, Request $request, Database $dbForProject, Event $events, Audit $audits, Stats $usage, string $mode, Device $deviceFiles, Document $project) {
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
         if (
@@ -1416,10 +1417,9 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
         }
 
         if ($deviceDeleted) {
-            //delete related cache
-            $cacheDir = APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId() . DIRECTORY_SEPARATOR . $bucketId . DIRECTORY_SEPARATOR . $fileId;
-            $deviceLocal = new Local($cacheDir);
-            $deviceLocal->delete($cacheDir, true);
+            $key = md5($request->getURI() . implode('*', $request->getParams()));
+            $cache = new Cache(new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId()));
+            $cache->purge($key);
 
             if ($bucket->getAttribute('permission') === 'bucket') {
                 $deleted = Authorization::skip(fn () => $dbForProject->deleteDocument('bucket_' . $bucket->getInternalId(), $fileId));
diff --git a/tests/e2e/Services/Storage/StorageBase.php b/tests/e2e/Services/Storage/StorageBase.php
index 3e232283f0..edcaa0f8a6 100644
--- a/tests/e2e/Services/Storage/StorageBase.php
+++ b/tests/e2e/Services/Storage/StorageBase.php
@@ -524,7 +524,7 @@ trait StorageBase
         $imageAfter = new \Imagick();
         $imageAfter->readImageBlob($file3['body']);
 
-        //$this->assertNotEquals($imageBefore->getImageBlob(), $imageAfter->getImageBlob());
+        $this->assertNotEquals($imageBefore->getImageBlob(), $imageAfter->getImageBlob());
 
         return $data;
     }