Skip to content

fix(user_status): clean up orphaned backup statuses in background job #59912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
miaulalala wants to merge 1 commit into from
Closed

fix(user_status): clean up orphaned backup statuses in background job #59912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/user_status/lib/BackgroundJob/ClearOldStatusesBackgroundJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,6 @@ protected function run($argument) {

$this->mapper->clearOlderThanClearAt($now);
$this->mapper->clearStatusesOlderThan($now - StatusService::INVALIDATE_STATUS_THRESHOLD, $now);
$this->mapper->cleanOrphanedBackups($now - 86400);
}
}
8 changes: 8 additions & 0 deletions apps/user_status/lib/Db/UserStatusMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,14 @@ public function createBackupStatus(string $userId): bool {
return $qb->executeStatement() > 0;
}

public function cleanOrphanedBackups(int $olderThan): void {
$qb = $this->db->getQueryBuilder();
$qb->delete($this->tableName)
->where($qb->expr()->eq('is_backup', $qb->createNamedParameter(true, IQueryBuilder::PARAM_BOOL)))
->andWhere($qb->expr()->lte('status_timestamp', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)));
$qb->executeStatement();
}

public function restoreBackupStatuses(array $ids): void {
$qb = $this->db->getQueryBuilder();
$qb->update($this->tableName)
Expand Down
54 changes: 54 additions & 0 deletions apps/user_status/tests/Unit/Db/UserStatusMapperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,4 +329,58 @@ public function testRestoreBackupStatuses(): void {
$this->assertEquals(true, $user3Status->getIsBackup());
$this->assertEquals('Vacationing', $user3Status->getCustomMessage());
}

public function testCleanOrphanedBackups(): void {
// Recent backup — should survive
$recentBackup = new UserStatus();
$recentBackup->setUserId('_user1');
$recentBackup->setStatus('dnd');
$recentBackup->setStatusTimestamp(9000);
$recentBackup->setIsUserDefined(true);
$recentBackup->setIsBackup(true);
$this->mapper->insert($recentBackup);

// Old backup — should be deleted
$oldBackup = new UserStatus();
$oldBackup->setUserId('_user2');
$oldBackup->setStatus('away');
$oldBackup->setStatusTimestamp(1000);
$oldBackup->setIsUserDefined(false);
$oldBackup->setIsBackup(true);
$this->mapper->insert($oldBackup);

// Active (non-backup) status with old timestamp — must not be deleted
$activeStatus = new UserStatus();
$activeStatus->setUserId('user3');
$activeStatus->setStatus('online');
$activeStatus->setStatusTimestamp(1000);
$activeStatus->setIsUserDefined(true);
$activeStatus->setIsBackup(false);
$this->mapper->insert($activeStatus);

$this->mapper->cleanOrphanedBackups(5000);

// Recent backup survives
$surviving = $this->mapper->findByUserId('user1', true);
$this->assertEquals('_user1', $surviving->getUserId());

// Old backup is gone
$this->expectException(DoesNotExistException::class);
$this->mapper->findByUserId('user2', true);
}

public function testCleanOrphanedBackupsDoesNotTouchActiveStatuses(): void {
$activeStatus = new UserStatus();
$activeStatus->setUserId('user1');
$activeStatus->setStatus('online');
$activeStatus->setStatusTimestamp(1000);
$activeStatus->setIsUserDefined(true);
$activeStatus->setIsBackup(false);
$this->mapper->insert($activeStatus);

$this->mapper->cleanOrphanedBackups(5000);

$found = $this->mapper->findByUserId('user1', false);
$this->assertEquals('user1', $found->getUserId());
}
}
Loading