Reset user status based on message ID only

Since some statuses (call) can occure with different status
(away and dnd) we need to reset only based on the message id.
But as it can not be set by the user this is still save and okay.

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

diff --git a/apps/user_status/lib/Connector/UserStatusProvider.php b/apps/user_status/lib/Connector/UserStatusProvider.php
index 46b89739f7c35f955786f5bcfb19c23c1fdd4b60..cc674c9967eed9df180f488fe7b782ec6e21b96b 100644 (file)
--- a/apps/user_status/lib/Connector/UserStatusProvider.php
+++ b/apps/user_status/lib/Connector/UserStatusProvider.php
@@ -62,10 +62,10 @@ class UserStatusProvider implements IProvider, ISettableProvider {
        }
 
        public function revertUserStatus(string $userId, string $messageId, string $status): void {
-               $this->service->revertUserStatus($userId, $messageId, $status);
+               $this->service->revertUserStatus($userId, $messageId);
        }
 
        public function revertMultipleUserStatus(array $userIds, string $messageId, string $status): void {
-               $this->service->revertMultipleUserStatus($userIds, $messageId, $status);
+               $this->service->revertMultipleUserStatus($userIds, $messageId);
        }
 }

diff --git a/apps/user_status/lib/Db/UserStatusMapper.php b/apps/user_status/lib/Db/UserStatusMapper.php
index 10939116a53132ba5f9b67998073749fade8fad3..4f48ea4681892009f2cb2bfc744f58f407936c1f 100644 (file)
--- a/apps/user_status/lib/Db/UserStatusMapper.php
+++ b/apps/user_status/lib/Db/UserStatusMapper.php
@@ -160,15 +160,13 @@ class UserStatusMapper extends QBMapper {
         *
         * @param string $userId
         * @param string $messageId
-        * @param string $status
         * @return bool True if an entry was deleted
         */
-       public function deleteCurrentStatusToRestoreBackup(string $userId, string $messageId, string $status): bool {
+       public function deleteCurrentStatusToRestoreBackup(string $userId, string $messageId): bool {
                $qb = $this->db->getQueryBuilder();
                $qb->delete($this->tableName)
                        ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)))
                        ->andWhere($qb->expr()->eq('message_id', $qb->createNamedParameter($messageId)))
-                       ->andWhere($qb->expr()->eq('status', $qb->createNamedParameter($status)))
                        ->andWhere($qb->expr()->eq('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)));
                return $qb->executeStatement() > 0;
        }

diff --git a/apps/user_status/lib/Service/StatusService.php b/apps/user_status/lib/Service/StatusService.php
index 858db48f31fea73e26fdbe677e696aab486c3ef2..1b7b44d95d37b11408e527192fda8a3c1bb2c286 100644 (file)
--- a/apps/user_status/lib/Service/StatusService.php
+++ b/apps/user_status/lib/Service/StatusService.php
@@ -496,7 +496,7 @@ class StatusService {
                }
        }
 
-       public function revertUserStatus(string $userId, string $messageId, string $status): void {
+       public function revertUserStatus(string $userId, string $messageId): void {
                try {
                        /** @var UserStatus $userStatus */
                        $backupUserStatus = $this->mapper->findByUserId($userId, true);
@@ -505,7 +505,7 @@ class StatusService {
                        return;
                }
 
-               $deleted = $this->mapper->deleteCurrentStatusToRestoreBackup($userId, $messageId, $status);
+               $deleted = $this->mapper->deleteCurrentStatusToRestoreBackup($userId, $messageId);
                if (!$deleted) {
                        // Another status is set automatically or no status, do nothing
                        return;
@@ -517,7 +517,7 @@ class StatusService {
                $this->mapper->update($backupUserStatus);
        }
 
-       public function revertMultipleUserStatus(array $userIds, string $messageId, string $status): void {
+       public function revertMultipleUserStatus(array $userIds, string $messageId): void {
                // Get all user statuses and the backups
                $findById = $userIds;
                foreach ($userIds as $userId) {
@@ -528,8 +528,7 @@ class StatusService {
                $backups = $restoreIds = $statuesToDelete = [];
                foreach ($userStatuses as $userStatus) {
                        if (!$userStatus->getIsBackup()
-                               && $userStatus->getMessageId() === $messageId
-                               && $userStatus->getStatus() === $status) {
+                               && $userStatus->getMessageId() === $messageId) {
                                $statuesToDelete[$userStatus->getUserId()] = $userStatus->getId();
                        } else if ($userStatus->getIsBackup()) {
                                $backups[$userStatus->getUserId()] = $userStatus->getId();

diff --git a/apps/user_status/tests/Unit/Service/StatusServiceTest.php b/apps/user_status/tests/Unit/Service/StatusServiceTest.php
index df31cf0d5ad80689eb59eb2319ee97a0a6abf936..413cecce5954fe166767801e6e4b7170836a7576 100644 (file)
--- a/apps/user_status/tests/Unit/Service/StatusServiceTest.php
+++ b/apps/user_status/tests/Unit/Service/StatusServiceTest.php
@@ -795,24 +795,34 @@ class StatusServiceTest extends TestCase {
                $backupOnly->setUserId('_backuponly');
                $backupOnly->setIsBackup(true);
 
+               $noBackupDND = new UserStatus();
+               $noBackupDND->setId(5);
+               $noBackupDND->setStatus(IUserStatus::DND);
+               $noBackupDND->setStatusTimestamp(1337);
+               $noBackupDND->setIsUserDefined(false);
+               $noBackupDND->setMessageId('call');
+               $noBackupDND->setUserId('nobackupanddnd');
+               $noBackupDND->setIsBackup(false);
+
                $this->mapper->expects($this->once())
                        ->method('findByUserIds')
-                       ->with(['john', 'nobackup', 'backuponly', '_john', '_nobackup', '_backuponly'])
+                       ->with(['john', 'nobackup', 'backuponly', 'nobackupanddnd', '_john', '_nobackup', '_backuponly', '_nobackupanddnd'])
                        ->willReturn([
                                $john,
                                $johnBackup,
                                $noBackup,
                                $backupOnly,
+                               $noBackupDND,
                        ]);
 
                $this->mapper->expects($this->once())
                        ->method('deleteByIds')
-                       ->with([1, 3]);
+                       ->with([1, 3, 5]);
 
                $this->mapper->expects($this->once())
                        ->method('restoreBackupStatuses')
                        ->with([2]);
 
-               $this->service->revertMultipleUserStatus(['john', 'nobackup', 'backuponly'], 'call', IUserStatus::AWAY);
+               $this->service->revertMultipleUserStatus(['john', 'nobackup', 'backuponly', 'nobackupanddnd'], 'call');
        }
 }