fixup! feat: check connection performance of mail service

Signed-off-by: SebastianKrupinski <[email protected]>

lib/Db/MailAccountMapper.php

@@ -234,4 +234,21 @@ public function getAllUserIdsWithAccounts(): array {
 
 		return $this->findEntities($query);
 	}
+
+	public function getRandomAccountIdsByImapHost(string $host, int $limit = 3): array {
+		$query = $this->db->getQueryBuilder();
+		$query->select('id')
+			->from($this->getTableName())
+			->where($query->expr()->eq('inbound_host', $query->createNamedParameter($host), IQueryBuilder::PARAM_STR))
+			->setMaxResults(1000);
+		$result = $query->executeQuery();
+		$ids = $result->fetchAll(\PDO::FETCH_COLUMN);
+		$result->closeCursor();
+		// Pick 3 random accounts or any available
+		if (count($ids) >= $limit) {
+			$rids = array_rand($ids, $limit);
+			return array_intersect_key($ids, array_flip($rids));
+		}
+		return $ids;
+	}
 }

lib/Db/ProvisioningMapper.php

@@ -138,4 +138,17 @@ public function get(int $id): ?Provisioning {
 			return null;
 		}
 	}
+
+	/**
+	 * @since 4.2.0
+	 */
+	public function uniqueImapHosts(): array {
+		$query = $this->db->getQueryBuilder();
+		$query->selectDistinct('imap_host')
+			  ->from('mail_provisionings');
+		$result = $query->executeQuery();
+		$data = $result->fetchAll(\PDO::FETCH_COLUMN);
+		$result->closeCursor();
+		return $data;
+	}
 }

lib/SetupChecks/MailConnectionPerformance.php

@@ -11,6 +11,7 @@
 
 use OCA\Mail\Account;
 use OCA\Mail\Db\MailAccountMapper;
+use OCA\Mail\Db\ProvisioningMapper;
 use OCA\Mail\IMAP\FolderMapper;
 use OCA\Mail\IMAP\IMAPClientFactory;
 use OCP\DB\QueryBuilder\IQueryBuilder;
@@ -26,6 +27,7 @@ public function __construct(
 		private IL10N $l10n,
 		private LoggerInterface $logger,
 		private IDBConnection $db,
+		private ProvisioningMapper $provisioningMapper,
 		private MailAccountMapper $accountMapper,
 		private IMAPClientFactory $clientFactory,
 		private FolderMapper $folderMapper,
@@ -41,29 +43,15 @@ public function getCategory(): string {
 	}
 
 	public function run(): SetupResult {
-
-		// retrieve distinct host(s)
-		$query = $this->db->getQueryBuilder();
-		$query->selectDistinct('imap_host')
-			->from('mail_provisionings');
-		$hosts = $query->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
-		// retrieve random accounts for each host
-		$query = $this->db->getQueryBuilder();
-		$query->select('id')
-			->from('mail_accounts')
-			->where($query->expr()->eq('inbound_host', $query->createParameter('host'), IQueryBuilder::PARAM_STR))
-			->setMaxResults(1000);
+		// retrieve unique imap hosts for provisionings and abort if none exists
+		$hosts = $this->provisioningMapper->uniqueImapHosts();
+		if (empty($hosts)) {
+			return SetupResult::success();
+		}
+		// retrieve random account ids for each host
 		$accounts = [];
 		foreach ($hosts as $host) {
-			$query->setParameter('host', $host, IQueryBuilder::PARAM_STR);
-			$ids = $query->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
-			// Pick 3 random accounts or any available
-			if (count($ids) >= 3) {
-				$rids = array_rand($ids, 3);
-				$accounts[$host] = array_intersect_key($ids, array_flip($rids));
-			} else {
-				$accounts[$host] = $ids;
-			}
+			$accounts[$host] = $this->accountMapper->getRandomAccountIdsByImapHost($host);
 		}
 		// test accounts
 		$tests = [];
@@ -84,7 +72,7 @@ public function run(): SetupResult {
 
 					$tests[$host][$accountId] = ['start' => $tStart, 'login' => $tLogin, 'operation' => $tOperation];
 				} catch (Throwable $e) {
-					$this->logger->warning('Error occurred while performing system check on mail account');
+					$this->logger->warning('Error occurred while performing system check on mail account: ' . $account->getId());
 				} finally {
 					$client->close();
 				}