From 9d8289221925ddf7eeebbd42f56ba9be311dd2a0 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Thu, 20 Mar 2025 11:32:06 +0000
Subject: [PATCH] chore: update logic

---
 app/worker.php                            | 10 +++++++++-
 src/Appwrite/Platform/Workers/Deletes.php | 15 ++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/worker.php b/app/worker.php
index 5d7bd4de41..18b51eda25 100644
--- a/app/worker.php
+++ b/app/worker.php
@@ -219,7 +219,15 @@ Server::setResource('abuseRetention', function () {
 });
 
 Server::setResource('auditRetention', function () {
-    return System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 'project=1209600,console=15778800'); // project = 14 days, console = 6 months
+    return array_map(
+        function ($part) {
+            [$key, $value] = explode('=', $part);
+            return [
+                $key => DateTime::addSeconds(new \DateTime(), -1 * (int)$value)
+            ];
+        },
+        explode(',', System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 'project=1209600,console=15778800'))
+    );
 });
 
 Server::setResource('executionRetention', function () {
diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php
index 75380ed3fe..93f8748e49 100644
--- a/src/Appwrite/Platform/Workers/Deletes.php
+++ b/src/Appwrite/Platform/Workers/Deletes.php
@@ -57,7 +57,7 @@ class Deletes extends Action
             ->inject('auditRetention')
             ->inject('log')
             ->callback(
-                fn ($message, Document $project, Database $dbForPlatform, callable $getProjectDB, callable $getLogsDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $executionRetention, string $auditRetention, Log $log) =>
+                fn ($message, Document $project, Database $dbForPlatform, callable $getProjectDB, callable $getLogsDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $executionRetention, array $auditRetention, Log $log) =>
                     $this->action($message, $project, $dbForPlatform, $getProjectDB, $getLogsDB, $deviceForFiles, $deviceForFunctions, $deviceForBuilds, $deviceForCache, $certificates, $executionRetention, $auditRetention, $log)
             );
     }
@@ -66,7 +66,7 @@ class Deletes extends Action
      * @throws Exception
      * @throws Throwable
      */
-    public function action(Message $message, Document $project, Database $dbForPlatform, callable $getProjectDB, callable $getLogsDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $executionRetention, string $auditRetention, Log $log): void
+    public function action(Message $message, Document $project, Database $dbForPlatform, callable $getProjectDB, callable $getLogsDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $executionRetention, array $auditRetention, Log $log): void
     {
         $payload = $message->getPayload() ?? [];
 
@@ -746,21 +746,14 @@ class Deletes extends Action
      * @return void
      * @throws Exception
      */
-    private function deleteAuditLogs(Document $project, callable $getProjectDB, string $auditRetention): void
+    private function deleteAuditLogs(Document $project, callable $getProjectDB, array $auditRetention): void
     {
         $projectId = $project->getId();
         $dbForProject = $getProjectDB($project);
 
-        [$projectAuditRetention, $consoleAuditRetention] = array_map(
-            function ($part) {
-                return DateTime::addSeconds(new \DateTime(), -1 * (int)explode('=', $part)[1]);
-            },
-            explode(',', $auditRetention)
-        );
-
         try {
             $this->deleteByGroup(Audit::COLLECTION, [
-                Query::lessThan('time', ($projectId === 'console' ? $consoleAuditRetention : $projectAuditRetention)),
+                Query::lessThan('time', ($projectId === 'console' ? $auditRetention['console'] : $auditRetention['project'])),
                 Query::orderDesc('time'),
                 Query::orderDesc('$internalId'),
             ], $dbForProject);