Allow to revert the user status of multiple users in 3 queries instead of 3*n

Signed-off-by: Joas Schilling <coding@schilljs.com>

2 files changed, 110 insertions, 0 deletions

diff --git a/apps/user_status/tests/Unit/Db/UserStatusMapperTest.php b/apps/user_status/tests/Unit/Db/UserStatusMapperTest.php
index ddb067b862b..c48805b57af 100644
--- a/apps/user_status/tests/Unit/Db/UserStatusMapperTest.php
+++ b/apps/user_status/tests/Unit/Db/UserStatusMapperTest.php
@@ -251,4 +251,56 @@ class UserStatusMapperTest extends TestCase {
 		$this->mapper->insert($userStatus2);
 		$this->mapper->insert($userStatus3);
 	}
+
+	public function testRestoreBackupStatuses(): void {
+		$userStatus1 = new UserStatus();
+		$userStatus1->setUserId('_user1');
+		$userStatus1->setStatus('online');
+		$userStatus1->setStatusTimestamp(5000);
+		$userStatus1->setIsUserDefined(true);
+		$userStatus1->setIsBackup(true);
+		$userStatus1->setCustomIcon('🚀');
+		$userStatus1->setCustomMessage('Releasing');
+		$userStatus1->setClearAt(50000);
+		$userStatus1 = $this->mapper->insert($userStatus1);
+
+		$userStatus2 = new UserStatus();
+		$userStatus2->setUserId('_user2');
+		$userStatus2->setStatus('away');
+		$userStatus2->setStatusTimestamp(5000);
+		$userStatus2->setIsUserDefined(true);
+		$userStatus2->setIsBackup(true);
+		$userStatus2->setCustomIcon('💩');
+		$userStatus2->setCustomMessage('Do not disturb');
+		$userStatus2->setClearAt(50000);
+		$userStatus2 = $this->mapper->insert($userStatus2);
+
+		$userStatus3 = new UserStatus();
+		$userStatus3->setUserId('_user3');
+		$userStatus3->setStatus('away');
+		$userStatus3->setStatusTimestamp(5000);
+		$userStatus3->setIsUserDefined(true);
+		$userStatus3->setIsBackup(true);
+		$userStatus3->setCustomIcon('🏝️');
+		$userStatus3->setCustomMessage('Vacationing');
+		$userStatus3->setClearAt(50000);
+		$this->mapper->insert($userStatus3);
+
+		$this->mapper->restoreBackupStatuses([$userStatus1->getId(), $userStatus2->getId()]);
+
+		$user1Status = $this->mapper->findByUserId('user1', false);
+		$this->assertEquals('user1', $user1Status->getUserId());
+		$this->assertEquals(false, $user1Status->getIsBackup());
+		$this->assertEquals('Releasing', $user1Status->getCustomMessage());
+
+		$user2Status = $this->mapper->findByUserId('user2', false);
+		$this->assertEquals('user2', $user2Status->getUserId());
+		$this->assertEquals(false, $user2Status->getIsBackup());
+		$this->assertEquals('Do not disturb', $user2Status->getCustomMessage());
+
+		$user3Status = $this->mapper->findByUserId('user3', true);
+		$this->assertEquals('_user3', $user3Status->getUserId());
+		$this->assertEquals(true, $user3Status->getIsBackup());
+		$this->assertEquals('Vacationing', $user3Status->getCustomMessage());
+	}
 }
diff --git a/apps/user_status/tests/Unit/Service/StatusServiceTest.php b/apps/user_status/tests/Unit/Service/StatusServiceTest.php
index a7c183eae04..e5a39214b26 100644
--- a/apps/user_status/tests/Unit/Service/StatusServiceTest.php
+++ b/apps/user_status/tests/Unit/Service/StatusServiceTest.php
@@ -771,4 +771,62 @@ class StatusServiceTest extends TestCase {
 
 		$this->service->backupCurrentStatus('john');
 	}
+
+	public function testRevertMultipleUserStatus(): void {
+		$john = new UserStatus();
+		$john->setId(1);
+		$john->setStatus(IUserStatus::AWAY);
+		$john->setStatusTimestamp(1337);
+		$john->setIsUserDefined(false);
+		$john->setMessageId('call');
+		$john->setUserId('john');
+		$john->setIsBackup(false);
+
+		$johnBackup = new UserStatus();
+		$johnBackup->setId(2);
+		$johnBackup->setStatus(IUserStatus::ONLINE);
+		$johnBackup->setStatusTimestamp(1337);
+		$johnBackup->setIsUserDefined(true);
+		$johnBackup->setMessageId('hello');
+		$johnBackup->setUserId('_john');
+		$johnBackup->setIsBackup(true);
+
+		$noBackup = new UserStatus();
+		$noBackup->setId(3);
+		$noBackup->setStatus(IUserStatus::AWAY);
+		$noBackup->setStatusTimestamp(1337);
+		$noBackup->setIsUserDefined(false);
+		$noBackup->setMessageId('call');
+		$noBackup->setUserId('nobackup');
+		$noBackup->setIsBackup(false);
+
+		$backupOnly = new UserStatus();
+		$backupOnly->setId(4);
+		$backupOnly->setStatus(IUserStatus::ONLINE);
+		$backupOnly->setStatusTimestamp(1337);
+		$backupOnly->setIsUserDefined(true);
+		$backupOnly->setMessageId('hello');
+		$backupOnly->setUserId('_backuponly');
+		$backupOnly->setIsBackup(true);
+
+		$this->mapper->expects($this->once())
+			->method('findByUserIds')
+			->with(['john', 'nobackup', 'backuponly', '_john', '_nobackup', '_backuponly'])
+			->willReturn([
+				$john,
+				$johnBackup,
+				$noBackup,
+				$backupOnly,
+			]);
+
+		$this->mapper->expects($this->once())
+			->method('deleteByIds')
+			->with([1, 3]);
+
+		$this->mapper->expects($this->once())
+			->method('restoreBackupStatuses')
+			->with([2]);
+
+		$this->service->revertMultipleUserStatus(['john', 'nobackup', 'backuponly'], 'call', IUserStatus::AWAY);
+	}
 }