Refactor presence management to use userInternalId instead of userId for improved consistency and clarity. Updated relevant methods in PresenceState and Upsert classes to reflect this change, ensuring proper handling of user identifiers across the application.

This commit is contained in:
ArnabChatterjee20k committed 2026-04-30 18:50:46 +05:30
1 parent 6dae78a206
commit 8cef822e8f
3 files changed
+14 -10

No files matched your search

+1 -1
View File
@@ -1527,7 +1527,7 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
$database,
$presenceDocument,
$presenceId,
$userId,
(string) $user->getSequence(),
function () use ($project): void {
if ($project !== null && !$project->isEmpty()) {
triggerPresenceUsage(1, $project->getId());
+7 -7
View File
@@ -58,7 +58,7 @@ class PresenceState
Database $dbForProject,
Document $presenceDocument,
string $presenceId,
string $userId,
mixed $userInternalId,
?callable $onPresenceCreated = null
): Document {
if ($presenceId !== 'unique()') {
@@ -69,14 +69,14 @@ class PresenceState
try {
if ($dbForProject->getAdapter()->getSupportForUpsertOnUniqueIndex()) {
$presenceCreated = $dbForProject->findOne(self::COLLECTION_ID, [Query::equal('userId', [$userId])])->isEmpty();
$presenceCreated = $dbForProject->findOne(self::COLLECTION_ID, [Query::equal('userInternalId', [$userInternalId])])->isEmpty();
$presence = $dbForProject->upsertDocument(self::COLLECTION_ID, $presenceDocument);
} else {
$presence = $this->transactionalUpsertForUser(
$dbForProject,
$presenceDocument,
$presenceId,
$userId,
$userInternalId,
$presenceCreated
);
}
@@ -101,18 +101,18 @@ class PresenceState
Database $dbForProject,
Document $presenceDocument,
string $presenceId,
string $userId,
mixed $userInternalId,
?bool &$presenceCreated = null
): Document {
return $dbForProject->withTransaction(function () use ($dbForProject, $presenceDocument, $presenceId, $userId, &$presenceCreated) {
$existingPresence = $dbForProject->findOne(self::COLLECTION_ID, [Query::equal('userId', [$userId])]);
return $dbForProject->withTransaction(function () use ($dbForProject, $presenceDocument, $presenceId, $userInternalId, &$presenceCreated) {
$existingPresence = $dbForProject->findOne(self::COLLECTION_ID, [Query::equal('userInternalId', [$userInternalId])]);
if ($existingPresence->isEmpty()) {
$presenceCreated = true;
return $dbForProject->createDocument(self::COLLECTION_ID, $presenceDocument);
}
// Lock current state to avoid races while resolving upsert by userId.
// Lock current state to avoid races while resolving upsert by userInternalId.
$currentPresence = $dbForProject->getDocument(self::COLLECTION_ID, $existingPresence->getId(), forUpdate: true);
if ($currentPresence->isEmpty()) {
@@ -147,9 +147,13 @@ class Upsert extends PlatformAction
throw new Exception(Exception::USER_NOT_FOUND, params: [$userId]);
}
$userInternalId = $fetchedUser->getSequence();
$userInternalId = (string) $fetchedUser->getSequence();
$resolvedUserId = $fetchedUser->getId();
}
if (empty($userInternalId)) {
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to resolve valid user internal ID.');
}
$isGraphQL = $request->getHeader('x-appwrite-source') === 'graphql';
$presenceData = [
@@ -170,7 +174,7 @@ class Upsert extends PlatformAction
$dbForProject,
$presenceDocument,
$presenceId,
$resolvedUserId,
$userInternalId,
fn () => $usage->addMetric(METRIC_USERS_PRESENCE, 1)
);
$queueForEvents->setParam('presenceId', $presence->getId());