From b5e9c1786ad1c97d4d500c5d69ccc3105b339b6c Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Fri, 16 Jan 2026 16:04:54 +0530
Subject: [PATCH] fix: maintenance logic.

---
 src/Appwrite/Platform/Workers/Deletes.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php
index 62230ed5c6..0dae78f31d 100644
--- a/src/Appwrite/Platform/Workers/Deletes.php
+++ b/src/Appwrite/Platform/Workers/Deletes.php
@@ -201,12 +201,11 @@ class Deletes extends Action
                 break;
             case DELETE_TYPE_MAINTENANCE:
                 $this->deleteExpiredTargets($project, $getProjectDB);
-                $this->deleteExecutionLogs($project, $getProjectDB, $executionRetention);
+                $this->deleteExecutionLogs($project, $getProjectDB, $executionRetention, $executionsRetentionCount);
                 $this->deleteAuditLogs($project, $getAudit, $auditRetention);
                 $this->deleteUsageStats($project, $getProjectDB, $getLogsDB, $hourlyUsageRetentionDatetime);
                 $this->deleteExpiredSessions($project, $getProjectDB);
                 $this->deleteExpiredTransactions($project, $getProjectDB);
-                $this->deleteExecutionsByLimit($project, $getProjectDB, $executionsRetentionCount);
                 break;
             default:
                 throw new \Exception('No delete operation for type: ' . \strval($type));
@@ -714,10 +713,11 @@ class Deletes extends Action
      * @param Document $project
      * @param callable $getProjectDB
      * @param string $datetime
+     * @param int|null $executionsRetentionCount
      * @return void
      * @throws Exception|DatabaseException
      */
-    private function deleteExecutionLogs(Document $project, callable $getProjectDB, string $datetime): void
+    private function deleteExecutionLogs(Document $project, callable $getProjectDB, string $datetime, ?int $executionsRetentionCount = 0): void
     {
         /** @var Database $dbForProject */
         $dbForProject = $getProjectDB($project);
@@ -731,7 +731,7 @@ class Deletes extends Action
         ], $dbForProject);
 
         /* delete based on custom retention, if any */
-        $this->deleteExecutionsByLimit($project, $getProjectDB);
+        $this->deleteExecutionsByLimit($project, $getProjectDB, $executionsRetentionCount);
     }
 
     /**