From bc3e1990d0fd6bb830823b14c57849a24e718988 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Tue, 10 Jun 2025 16:12:24 +0400
Subject: [PATCH] chore: update maintenance task to only iterate over active
 projects

---
 composer.lock                               | 12 +++++-----
 src/Appwrite/Platform/Tasks/Maintenance.php | 25 ++++++++++++++-------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/composer.lock b/composer.lock
index d7b9f22722..da740d8c72 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4807,16 +4807,16 @@
     "packages-dev": [
         {
             "name": "appwrite/sdk-generator",
-            "version": "0.41.1",
+            "version": "0.41.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/sdk-generator.git",
-                "reference": "6d9318abf4542a757c87abf056557d6afa1dc06b"
+                "reference": "07804269131f411576aac60c795a5ebc3afaa48a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/6d9318abf4542a757c87abf056557d6afa1dc06b",
-                "reference": "6d9318abf4542a757c87abf056557d6afa1dc06b",
+                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/07804269131f411576aac60c795a5ebc3afaa48a",
+                "reference": "07804269131f411576aac60c795a5ebc3afaa48a",
                 "shasum": ""
             },
             "require": {
@@ -4852,9 +4852,9 @@
             "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
             "support": {
                 "issues": "https://github.com/appwrite/sdk-generator/issues",
-                "source": "https://github.com/appwrite/sdk-generator/tree/0.41.1"
+                "source": "https://github.com/appwrite/sdk-generator/tree/0.41.4"
             },
-            "time": "2025-06-01T04:20:04+00:00"
+            "time": "2025-06-10T08:28:11+00:00"
         },
         {
             "name": "doctrine/annotations",
diff --git a/src/Appwrite/Platform/Tasks/Maintenance.php b/src/Appwrite/Platform/Tasks/Maintenance.php
index fd9d05dec9..b2496e813b 100644
--- a/src/Appwrite/Platform/Tasks/Maintenance.php
+++ b/src/Appwrite/Platform/Tasks/Maintenance.php
@@ -2,11 +2,13 @@
 
 namespace Appwrite\Platform\Tasks;
 
+use DateInterval;
+use DateTime;
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete;
 use Utopia\CLI\Console;
 use Utopia\Database\Database;
-use Utopia\Database\DateTime;
+use Utopia\Database\DateTime as DatabaseDateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Utopia\Platform\Action;
@@ -58,29 +60,36 @@ class Maintenance extends Action
         Console::info('Setting loop start time to ' . $next->format("Y-m-d H:i:s.v") . '. Delaying for ' . $delay . ' seconds.');
 
         Console::loop(function () use ($interval, $cacheRetention, $schedulesDeletionRetention, $usageStatsRetentionHourly, $dbForPlatform, $console, $queueForDeletes, $queueForCertificates) {
-            $time = DateTime::now();
+            $time = DatabaseDateTime::now();
 
             Console::info("[{$time}] Notifying workers with maintenance tasks every {$interval} seconds");
 
+            // Iterate through project only if it was accessed in last 24 hours
+            $interval  = DateInterval::createFromDateString('24 hours');
+            $before24h = (new DateTime())->sub($interval);
+
             $dbForPlatform->foreach(
                 'projects',
                 function (Document $project) use ($queueForDeletes, $usageStatsRetentionHourly) {
+                    Console::info('Project accessed at ' . $project->getId());
                     $queueForDeletes
                         ->setType(DELETE_TYPE_MAINTENANCE)
                         ->setProject($project)
-                        ->setUsageRetentionHourlyDateTime(DateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
+                        ->setUsageRetentionHourlyDateTime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
                         ->trigger();
                 },
                 [
                     Query::equal('region', [System::getEnv('_APP_REGION', 'default')]),
                     Query::limit(100),
+                    Query::greaterThanEqual('accessedAt', DatabaseDateTime::format($before24h)),
+                    Query::orderAsc('teamInternalId'),
                 ]
             );
 
             $queueForDeletes
                 ->setType(DELETE_TYPE_MAINTENANCE)
                 ->setProject($console)
-                ->setUsageRetentionHourlyDateTime(DateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
+                ->setUsageRetentionHourlyDateTime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
                 ->trigger();
 
             $this->notifyDeleteConnections($queueForDeletes);
@@ -94,13 +103,13 @@ class Maintenance extends Action
     {
         $queueForDeletes
             ->setType(DELETE_TYPE_REALTIME)
-            ->setDatetime(DateTime::addSeconds(new \DateTime(), -60))
+            ->setDatetime(DatabaseDateTime::addSeconds(new \DateTime(), -60))
             ->trigger();
     }
 
     private function renewCertificates(Database $dbForPlatform, Certificate $queueForCertificate): void
     {
-        $time = DateTime::now();
+        $time = DatabaseDateTime::now();
 
         $certificates = $dbForPlatform->find('certificates', [
             Query::lessThan('attempts', 5), // Maximum 5 attempts
@@ -129,7 +138,7 @@ class Maintenance extends Action
     {
         $queueForDeletes
             ->setType(DELETE_TYPE_CACHE_BY_TIMESTAMP)
-            ->setDatetime(DateTime::addSeconds(new \DateTime(), -1 * $interval))
+            ->setDatetime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $interval))
             ->trigger();
     }
 
@@ -137,7 +146,7 @@ class Maintenance extends Action
     {
         $queueForDeletes
             ->setType(DELETE_TYPE_SCHEDULES)
-            ->setDatetime(DateTime::addSeconds(new \DateTime(), -1 * $interval))
+            ->setDatetime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $interval))
             ->trigger();
     }
 }