From ae950a19c79c9da08aaf0367ee98b89a0fbc67d6 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Wed, 25 Mar 2026 14:26:50 +1300
Subject: [PATCH] (refactor): Migrate to new Query methods (containsAny,
 createdBefore, createdAfter)

---
 src/Appwrite/Platform/Modules/Databases/Workers/Databases.php | 2 +-
 .../Platform/Modules/Teams/Http/Memberships/Delete.php        | 2 +-
 .../Platform/Modules/Teams/Http/Memberships/Update.php        | 2 +-
 src/Appwrite/Platform/Tasks/Interval.php                      | 2 +-
 src/Appwrite/Platform/Workers/Functions.php                   | 2 +-
 tests/e2e/Services/Databases/DatabasesBase.php                | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Appwrite/Platform/Modules/Databases/Workers/Databases.php b/src/Appwrite/Platform/Modules/Databases/Workers/Databases.php
index 60d70b7942..8be31e9f6c 100644
--- a/src/Appwrite/Platform/Modules/Databases/Workers/Databases.php
+++ b/src/Appwrite/Platform/Modules/Databases/Workers/Databases.php
@@ -571,7 +571,7 @@ class Databases extends Action
                 Query::equal('databaseInternalId', [$databaseInternalId]),
                 Query::equal('type', [Database::VAR_RELATIONSHIP]),
                 Query::notEqual('collectionInternalId', $collectionInternalId),
-                Query::contains('options', ['"relatedCollection":"'. $collectionId .'"']),
+                Query::containsAny('options', ['"relatedCollection":"'. $collectionId .'"']),
             ],
             $dbForProject,
             function ($attribute) use ($dbForProject, $databaseInternalId) {
diff --git a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Delete.php b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Delete.php
index 3b516c2d60..4e603f9baa 100644
--- a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Delete.php
+++ b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Delete.php
@@ -92,7 +92,7 @@ class Delete extends Action
             $ownersCount = $dbForProject->count(
                 collection: 'memberships',
                 queries: [
-                    Query::contains('roles', ['owner']),
+                    Query::containsAny('roles', ['owner']),
                     Query::equal('teamInternalId', [$team->getSequence()])
                 ],
                 max: 2
diff --git a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Update.php b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Update.php
index a935055163..943cf426f9 100644
--- a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Update.php
+++ b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Update.php
@@ -92,7 +92,7 @@ class Update extends Action
             $ownersCount = $dbForProject->count(
                 collection: 'memberships',
                 queries: [
-                    Query::contains('roles', ['owner']),
+                    Query::containsAny('roles', ['owner']),
                     Query::equal('teamInternalId', [$team->getSequence()])
                 ],
                 max: 2
diff --git a/src/Appwrite/Platform/Tasks/Interval.php b/src/Appwrite/Platform/Tasks/Interval.php
index a7d16e0a52..dad373f159 100644
--- a/src/Appwrite/Platform/Tasks/Interval.php
+++ b/src/Appwrite/Platform/Tasks/Interval.php
@@ -148,7 +148,7 @@ class Interval extends Action
 
                     $staleExecutions = $dbForProject->find('executions', [
                         Query::equal('status', ['processing']),
-                        Query::lessThan('$createdAt', $staleThreshold),
+                        Query::createdBefore($staleThreshold),
                         Query::limit(100),
                     ]);
 
diff --git a/src/Appwrite/Platform/Workers/Functions.php b/src/Appwrite/Platform/Workers/Functions.php
index 29ccb0ef09..aed1a9bcec 100644
--- a/src/Appwrite/Platform/Workers/Functions.php
+++ b/src/Appwrite/Platform/Workers/Functions.php
@@ -122,7 +122,7 @@ class Functions extends Action
             while ($sum >= $limit) {
                 $functions = $dbForProject->find('functions', [
                     Query::select(['$id', 'events']), // Skip variables subqueries
-                    Query::contains('events', $events),
+                    Query::containsAny('events', $events),
                     Query::limit($limit),
                     Query::offset($offset),
                     Query::orderAsc('$sequence'),
diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php
index 7f23f2966c..ba0f2e2e39 100644
--- a/tests/e2e/Services/Databases/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/DatabasesBase.php
@@ -3939,7 +3939,7 @@ trait DatabasesBase
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
             'queries' => [
-                Query::greaterThan('$createdAt', '1976-06-12')->toString(),
+                Query::createdAfter('1976-06-12')->toString(),
             ],
         ]);
 
@@ -3950,7 +3950,7 @@ trait DatabasesBase
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
             'queries' => [
-                Query::lessThan('$createdAt', '1976-06-12')->toString(),
+                Query::createdBefore('1976-06-12')->toString(),
             ],
         ]);