Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: update Dockerfile to remove composer stage and adjust presence handling in tests

Browse Source
This commit is contained in:
ArnabChatterjee20k
2026-05-12 15:49:59 +05:30
parent cad35c7d5c
commit 95dd44115d
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/collections/projects.php
-1
View File
@@ -2815,7 +2815,6 @@ return [
'array' => false,
'filters' => [],
],
// TODO: the current pod? Shall we make it the region? instead of the hostname? So that when its restarted it can delete all the presence?
[
'$id' => ID::custom('hostname'),
'type' => Database::VAR_STRING,
src/Appwrite/Databases/PresenceState.php
+7 -2
View File
@@ -69,9 +69,14 @@ class PresenceState
try {
if ($dbForProject->getAdapter()->getSupportForUpsertOnUniqueIndex()) {
// $id will not be updated if new id provided. id is always stable
// in v2 use permsmd5 in the queries as well to find the doc
$existingPresence = $dbForProject->findOne(self::COLLECTION_ID, [Query::equal('userInternalId', [$userInternalId])]);
if ($existingPresence->isEmpty()) {
$presenceCreated = true;
} else {
$presenceDocument->setAttribute('$id', $existingPresence->getId());
}
$presence = $dbForProject->upsertDocument(self::COLLECTION_ID, $presenceDocument);
$presenceCreated = $presence->getCreatedAt() === $presence->getUpdatedAt();
} else {
$presence = $this->transactionalUpsertForUser(
$dbForProject,
tests/e2e/Services/Presences/PresenceRealtimeClientTest.php
+9 -4
View File
@@ -342,7 +342,9 @@ class PresenceRealtimeClientTest extends Scope
$secondMetadata,
$this->getPresencePermissions(Role::any())
);
$this->collectPresenceOutcome($publisher, $secondPresenceId, 'busy', $secondMetadata, $user['$id']);
// The server keeps one row per user keyed by userInternalId and anchors $id to the
// first claim, so the second upsert's response/event come back under $firstPresenceId.
$this->collectPresenceOutcome($publisher, $firstPresenceId, 'busy', $secondMetadata, $user['$id']);
$list = $this->client->call(
Client::METHOD_GET,
@@ -543,12 +545,15 @@ class PresenceRealtimeClientTest extends Scope
$metadataOwner,
$this->getPresencePermissions(Role::user($user1['$id']))
);
$this->collectPresenceOutcome($publisher, $presenceIdOwner, 'busy', $metadataOwner, $user1['$id']);
$this->receivePresenceEvent($listener1, $presenceIdOwner, 'upsert', 'busy', $metadataOwner, $user1['$id']);
// Same user, so the server reuses the original record's $id ($presenceIdAny);
// only permissions/status/metadata change — which is what permission routing should filter on.
$this->collectPresenceOutcome($publisher, $presenceIdAny, 'busy', $metadataOwner, $user1['$id']);
$this->receivePresenceEvent($listener1, $presenceIdAny, 'upsert', 'busy', $metadataOwner, $user1['$id']);
$this->assertQuietFor(
$listener2,
fn (array $frame): bool => ($frame['type'] ?? null) === 'event'
&& ($frame['data']['payload']['$id'] ?? null) === $presenceIdOwner
&& ($frame['data']['payload']['$id'] ?? null) === $presenceIdAny
&& ($frame['data']['payload']['metadata']['visibility'] ?? null) === 'owner'
);
} finally {
$publisher->close();