fixup! Fix: perform bulk message actions

Signed-off-by: SebastianKrupinski <[email protected]>
nextcloud · Dec 18, 2024 · 8a4525e · 8a4525e
1 parent def7d68
commit 8a4525e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 19 deletions.
diff --git a/lib/Db/MailAccountMapper.php b/lib/Db/MailAccountMapper.php
@@ -69,20 +69,24 @@ public function findById(int $id): MailAccount {
 	/**
 	 * Finds all mail accounts by account ids
 	 *
+	 * @param string $userId
 	 * @param array<int,int> $identifiers
 	 *
 	 * @return array<int,MailAccount>
 	 */
-	public function findByIds(array $identifiers): array {
+	public function findByIds(string $userId, array $identifiers): array {
 
-		$cmd = $this->db->getQueryBuilder();
-		$cmd->select('*')
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
 			->from($this->getTableName())
 			->where(
-				$cmd->expr()->in('id', $cmd->createNamedParameter($identifiers, IQueryBuilder::PARAM_STR_ARRAY), IQueryBuilder::PARAM_STR_ARRAY)
+				$qb->expr()->eq('user_id', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR), IQueryBuilder::PARAM_STR)
+			)
+			->andWhere(
+				$qb->expr()->in('id', $qb->createNamedParameter($identifiers, IQueryBuilder::PARAM_STR_ARRAY), IQueryBuilder::PARAM_STR_ARRAY)
 			);
 
-		return $this->findEntities($cmd);
+		return $this->findEntities($qb);
 	}
 
 	/**

diff --git a/lib/Db/MessageMapper.php b/lib/Db/MessageMapper.php
@@ -189,14 +189,14 @@ public function findMailboxAndUid(array $identifiers): array {
 			return [];
 		}
 
-		$cmd = $this->db->getQueryBuilder();
-		$cmd->select('id', 'mailbox_id', 'uid')
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('id', 'mailbox_id', 'uid')
 			->from($this->getTableName())
 			->where(
-				$cmd->expr()->in('id', $cmd->createNamedParameter($identifiers, IQueryBuilder::PARAM_STR_ARRAY), IQueryBuilder::PARAM_STR_ARRAY)
+				$qb->expr()->in('id', $qb->createNamedParameter($identifiers, IQueryBuilder::PARAM_STR_ARRAY), IQueryBuilder::PARAM_STR_ARRAY)
 			);
 
-		return $cmd->executeQuery()->fetchAll();
+		return $qb->executeQuery()->fetchAll();
 
 	}
 

diff --git a/lib/Service/MessageOperationService.php b/lib/Service/MessageOperationService.php
@@ -53,9 +53,9 @@ protected function groupByMailbox(array $collection): array {
 	 *
 	 * [mailbox] to [account_id => [mailbox]]
 	 *
-	 * @param array<MailBox> $collection
+	 * @param array<\OCA\Mail\Db\Mailbox> $collection
 	 *
-	 * @return array<int,array<MailBox>>
+	 * @return array<int,array<\OCA\Mail\Db\Mailbox>>
 	 */
 	protected function groupByAccount(array $collection) {
 		return array_reduce($collection, function ($carry, $entry) {
@@ -72,7 +72,7 @@ protected function groupByAccount(array $collection) {
 	 *
 	 * @param array<int,bool> &$results
 	 * @param bool $value
-	 * @param array<MailBox> $mailboxes
+	 * @param array<\OCA\Mail\Db\Mailbox> $mailboxes
 	 * @param array<int,array<array{id:int,uid:int}>> $messages
 	 */
 	protected function generateResult(array &$results, bool $value, array $mailboxes, array $messages) {
@@ -99,17 +99,11 @@ public function changeFlags(string $userId, array $identifiers, array $flags): a
 		// retrieve all mailboxes and group by account
 		$mailboxes = $this->groupByAccount($this->mailboxMapper->findByIds(array_keys($messages)));
 		// retrieve all accounts
-		$accounts = $this->accountMapper->findByIds(array_keys($mailboxes));
+		$accounts = $this->accountMapper->findByIds($userId, array_keys($mailboxes));
 		// process every account
 		$results = [];
 		foreach ($accounts as $account) {
 			$account = new Account($account);
-			// determine if account belongs to the user and skip if not
-			if ($account->getUserId() != $userId) {
-				// add messages to results as failed
-				$this->generateResult($results, false, $mailboxes[$account->getId()], $messages);
-				continue;
-			}
 			$client = $this->clientFactory->getClient($account);
 			// process every mailbox
 			foreach ($mailboxes[$account->getId()] as $mailbox) {