From 7e95f529a619adbaa36ae6afd8c0e37c9da5179e Mon Sep 17 00:00:00 2001 From: shimon Date: Tue, 13 Jun 2023 14:33:26 +0300 Subject: [PATCH] cache deletion bug fix --- app/controllers/api/storage.php | 8 +------- app/workers/deletes.php | 3 ++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php index 7d64f752f3..a4063d7fa3 100644 --- a/app/controllers/api/storage.php +++ b/app/controllers/api/storage.php @@ -359,8 +359,7 @@ App::post('/v1/storage/buckets/:bucketId/files') ->inject('mode') ->inject('deviceFiles') ->inject('deviceLocal') - ->inject('deletes') - ->action(function (string $bucketId, string $fileId, mixed $file, ?array $permissions, Request $request, Response $response, Database $dbForProject, Document $user, Event $events, string $mode, Device $deviceFiles, Device $deviceLocal, Delete $deletes) { + ->action(function (string $bucketId, string $fileId, mixed $file, ?array $permissions, Request $request, Response $response, Database $dbForProject, Document $user, Event $events, string $mode, Device $deviceFiles, Device $deviceLocal) { $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId)); @@ -1336,11 +1335,6 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId') $file = Authorization::skip(fn() => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file)); } - $deletes - ->setType(DELETE_TYPE_CACHE_BY_RESOURCE) - ->setResource('file/' . $file->getId()) - ; - $events ->setParam('bucketId', $bucket->getId()) ->setParam('fileId', $file->getId()) diff --git a/app/workers/deletes.php b/app/workers/deletes.php index e2a314ee98..fbd851ebf7 100644 --- a/app/workers/deletes.php +++ b/app/workers/deletes.php @@ -136,8 +136,9 @@ class DeletesV1 extends Worker */ protected function deleteCacheByResource(Document $project, string $resource): void { - $dbForProject = $this->getProjectDB($project); + $projectId = $project->getId(); + $dbForProject = $this->getProjectDB($project->getId()); $document = $dbForProject->findOne('cache', [Query::equal('resource', [$resource])]); if ($document) {