refactor: Inline account class delegations

lib/Account.php

@@ -9,71 +9,13 @@
  */
 namespace OCA\Mail;
 
-use JsonSerializable;
 use OCA\Mail\Db\MailAccount;
-use OCA\Mail\Service\Quota;
-use ReturnTypeWillChange;
 
-class Account implements JsonSerializable {
+class Account {
 	public function __construct(private MailAccount $account) {
 	}
 
 	public function getMailAccount(): MailAccount {
 		return $this->account;
 	}
-
-	/**
-	 * @return int
-	 */
-	public function getId() {
-		return $this->account->getId();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return $this->account->getName();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEMailAddress() {
-		return $this->account->getEmail();
-	}
-
-	#[ReturnTypeWillChange]
-	public function jsonSerialize() {
-		return $this->account->toJson();
-	}
-
-	public function getEmail(): string {
-		return $this->account->getEmail();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getUserId() {
-		return $this->account->getUserId();
-	}
-
-	/**
-	 * Set the quota percentage
-	 * @param Quota $quota
-	 * @return void
-	 */
-	public function calculateAndSetQuotaPercentage(Quota $quota): void {
-		if ($quota->getLimit() === 0) {
-			$this->account->setQuotaPercentage(0);
-			return;
-		}
-		$percentage = (int)round($quota->getUsage() / $quota->getLimit() * 100);
-		$this->account->setQuotaPercentage($percentage);
-	}
-
-	public function getQuotaPercentage(): ?int {
-		return $this->account->getQuotaPercentage();
-	}
 }

lib/BackgroundJob/PreviewEnhancementProcessingJob.php

@@ -62,12 +62,12 @@ public function run($argument) {
 			return;
 		}
 
-		$user = $this->userManager->get($account->getUserId());
+		$user = $this->userManager->get($account->getMailAccount()->getUserId());
 		if ($user === null || !$user->isEnabled()) {
 			$this->logger->debug(sprintf(
 				'Account %d of user %s could not be found or was disabled, skipping preprocessing of messages',
-				$account->getId(),
-				$account->getUserId()
+				$account->getMailAccount()->getId(),
+				$account->getMailAccount()->getUserId()
 			));
 			return;
 		}

lib/BackgroundJob/QuotaJob.php

@@ -18,6 +18,7 @@
 use OCP\IUserManager;
 use OCP\Notification\IManager;
 use Psr\Log\LoggerInterface;
+use function round;
 use function sprintf;
 
 class QuotaJob extends TimedJob {
@@ -67,38 +68,43 @@ protected function run($argument): void {
 			return;
 		}
 
-		$user = $this->userManager->get($account->getUserId());
+		$user = $this->userManager->get($account->getMailAccount()->getUserId());
 		if ($user === null || !$user->isEnabled()) {
 			$this->logger->debug(sprintf(
 				'Account %d of user %s could not be found or was disabled, skipping quota query',
-				$account->getId(),
-				$account->getUserId()
+				$account->getMailAccount()->getId(),
+				$account->getMailAccount()->getUserId()
 			));
 			return;
 		}
 
 		$quota = $this->mailManager->getQuota($account);
 		if ($quota === null) {
-			$this->logger->debug('Could not get quota information for account <' . $account->getEmail() . '>', ['app' => 'mail']);
+			$this->logger->debug('Could not get quota information for account <' . $account->getMailAccount()->getEmail() . '>', ['app' => 'mail']);
 			return;
 		}
 		$previous = $account->getMailAccount()->getQuotaPercentage();
-		$account->calculateAndSetQuotaPercentage($quota);
+		if ($quota->getLimit() === 0) {
+			$account->getMailAccount()->setQuotaPercentage(0);
+		} else {
+			$percentage = (int)round($quota->getUsage() / $quota->getLimit() * 100);
+			$account->getMailAccount()->setQuotaPercentage($percentage);
+		}
 		$this->accountService->update($account->getMailAccount());
-		$current = $account->getQuotaPercentage();
+		$current = $account->getMailAccount()->getQuotaPercentage();
 
 		// Only notify if we've reached the rising edge
 		if ($previous < $current && $previous <= 90 && $current > 90) {
-			$this->logger->debug('New quota information for <' . $account->getEmail() . '> - previous: ' . $previous . ', current: ' . $current);
+			$this->logger->debug('New quota information for <' . $account->getMailAccount()->getEmail() . '> - previous: ' . $previous . ', current: ' . $current);
 			$time = $this->time->getDateTime('now');
 			$notification = $this->notificationManager->createNotification();
 			$notification
 				->setApp('mail')
-				->setUser($account->getUserId())
+				->setUser($account->getMailAccount()->getUserId())
 				->setObject('quota', (string)$accountId)
 				->setSubject('quota_depleted', [
 					'id' => $accountId,
-					'account_email' => $account->getEmail()
+					'account_email' => $account->getMailAccount()->getEmail()
 				])
 				->setDateTime($time)
 				->setMessage('percentage', [

lib/BackgroundJob/SyncJob.php

@@ -78,12 +78,12 @@ protected function run($argument) {
 			return;
 		}
 
-		$user = $this->userManager->get($account->getUserId());
+		$user = $this->userManager->get($account->getMailAccount()->getUserId());
 		if ($user === null || !$user->isEnabled()) {
 			$this->logger->debug(sprintf(
 				'Account %d of user %s could not be found or was disabled, skipping background sync',
-				$account->getId(),
-				$account->getUserId()
+				$account->getMailAccount()->getId(),
+				$account->getMailAccount()->getUserId()
 			));
 			return;
 		}

lib/BackgroundJob/TrainImportanceClassifierJob.php

@@ -63,7 +63,7 @@ protected function run($argument) {
 			return;
 		}
 
-		if (!$this->classificationSettingsService->isClassificationEnabled($account->getUserId())) {
+		if (!$this->classificationSettingsService->isClassificationEnabled($account->getMailAccount()->getUserId())) {
 			$this->logger->debug("classification is turned off for account $accountId");
 			return;
 		}

lib/BackgroundJob/TrashRetentionJob.php

@@ -60,8 +60,8 @@ public function run($argument) {
 			} catch (ServiceException|ClientException $e) {
 				$this->logger->error('Could not clean trash mailbox', [
 					'exception' => $e,
-					'userId' => $account->getUserId(),
-					'accountId' => $account->getId(),
+					'userId' => $account->getMailAccount()->getUserId(),
+					'accountId' => $account->getMailAccount()->getId(),
 					'trashMailboxId' => $account->getMailAccount()->getTrashMailboxId(),
 				]);
 			}

lib/Command/DeleteAccount.php

@@ -51,22 +51,22 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$output->writeLn('<error>This account does not exist</error>');
 			return 1;
 		}
-		$output->writeLn('<info>Found account with email: ' . $account->getEmail() . '</info>');
+		$output->writeLn('<info>Found account with email: ' . $account->getMailAccount()->getEmail() . '</info>');
 
 		if (!is_null($account->getMailAccount()->getProvisioningId())) {
 			$output->writeLn('<error>This is a provisioned account which can not be deleted from CLI. Use the Provisioning UI instead.</error>');
 			return 2;
 		}
-		$output->writeLn('<info>Deleting ' . $account->getEmail() . '</info>');
+		$output->writeLn('<info>Deleting ' . $account->getMailAccount()->getEmail() . '</info>');
 		$this->delete($account, $output);
 
 		return 0;
 	}
 
 	private function delete(Account $account, OutputInterface $output): void {
-		$id = $account->getId();
+		$id = $account->getMailAccount()->getId();
 		try {
-			$this->accountService->deleteByAccountId($account->getId());
+			$this->accountService->deleteByAccountId($account->getMailAccount()->getId());
 		} catch (ClientException $e) {
 			throw $e;
 		}

lib/Command/ExportAccount.php

@@ -41,7 +41,7 @@ protected function configure() {
 
 	private function getAccountsData($accounts) {
 		$accountsData = [];
-	
+
 		foreach ($accounts as $account) {
 			$accountsData[] = [
 				'id' => $account->getId(),
@@ -65,7 +65,7 @@ private function getAccountsData($accounts) {
 				]
 			];
 		}
-	
+
 		return $accountsData;
 	}
 
@@ -80,9 +80,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$output->writeln(json_encode($this->getAccountsData($accounts), JSON_PRETTY_PRINT));
 		} else {
 			foreach ($accounts as $account) {
-				$output->writeln('<info>Account ' . $account->getId() . ':</info>');
-				$output->writeln('- E-Mail: ' . $account->getEmail());
-				$output->writeln('- Name: ' . $account->getName());
+				$output->writeln('<info>Account ' . $account->getMailAccount()->getId() . ':</info>');
+				$output->writeln('- E-Mail: ' . $account->getMailAccount()->getEmail());
+				$output->writeln('- Name: ' . $account->getMailAccount()->getName());
 				$output->writeln('- Provision: ' . ($account->getMailAccount()->getProvisioningId() ? 'set' : 'none'). ' ID: ' . ($account->getMailAccount()->getProvisioningId() ?: 'N/A'));
 				$output->writeln('- IMAP user: ' . $account->getMailAccount()->getInboundUser());
 				$output->writeln('- IMAP host: ' . $account->getMailAccount()->getInboundHost() . ':' . $account->getMailAccount()->getInboundPort() . ', security: ' . $account->getMailAccount()->getInboundSslMode());

lib/Command/TrainAccount.php

@@ -62,7 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$output->writeln("<error>account $accountId does not exist</error>");
 			return 1;
 		}
-		if (!$this->classificationSettingsService->isClassificationEnabled($account->getUserId())) {
+		if (!$this->classificationSettingsService->isClassificationEnabled($account->getMailAccount()->getUserId())) {
 			$output->writeln("<info>classification is turned off for account $accountId</info>");
 			return 2;
 		}

lib/Controller/AccountsController.php

@@ -11,6 +11,7 @@
 namespace OCA\Mail\Controller;
 
 use Horde_Imap_Client;
+use OCA\Mail\Account;
 use OCA\Mail\AppInfo\Application;
 use OCA\Mail\Contracts\IMailManager;
 use OCA\Mail\Contracts\IMailTransmission;
@@ -92,7 +93,7 @@ public function index(): JSONResponse {
 
 		$json = [];
 		foreach ($mailAccounts as $mailAccount) {
-			$conf = $mailAccount->jsonSerialize();
+			$conf = $mailAccount->getMailAccount()->jsonSerialize();
 			$conf['aliases'] = $this->aliasesService->findAll($conf['accountId'], $this->currentUserId);
 			$json[] = $conf;
 		}
@@ -177,7 +178,7 @@ public function update(int $id,
 
 		try {
 			return MailJsonResponse::success(
-				$this->setup->createNewAccount($accountName, $emailAddress, $imapHost, $imapPort, $imapSslMode, $imapUser, $imapPassword, $smtpHost, $smtpPort, $smtpSslMode, $smtpUser, $smtpPassword, $this->currentUserId, $authMethod, $id)
+				$this->setup->createNewAccount($accountName, $emailAddress, $imapHost, $imapPort, $imapSslMode, $imapUser, $imapPassword, $smtpHost, $smtpPort, $smtpSslMode, $smtpUser, $smtpPassword, $this->currentUserId, $authMethod, $id)->getMailAccount()
 			);
 		} catch (CouldNotConnectException $e) {
 			$data = [
@@ -398,7 +399,7 @@ public function create(string $accountName,
 			}
 		}
 		return MailJsonResponse::success(
-			$account, Http::STATUS_CREATED
+			$account->getMailAccount(), Http::STATUS_CREATED
 		);
 	}
 

lib/Controller/MailboxesController.php

@@ -73,7 +73,7 @@ public function index(int $accountId): JSONResponse {
 		$mailboxes = $this->mailManager->getMailboxes($account);
 		return new JSONResponse([
 			'id' => $accountId,
-			'email' => $account->getEmail(),
+			'email' => $account->getMailAccount()->getEmail(),
 			'mailboxes' => $mailboxes,
 			'delimiter' => reset($mailboxes)->getDelimiter(),
 		]);

lib/Controller/MessageApiController.php

@@ -7,6 +7,7 @@
  */
 namespace OCA\Mail\Controller;
 
+use OCA\Mail\Account;
 use OCA\Mail\Contracts\IDkimService;
 use OCA\Mail\Db\LocalMessage;
 use OCA\Mail\Exception\ClientException;
@@ -126,7 +127,7 @@ public function send(
 			return new DataResponse('Account not found.', Http::STATUS_NOT_FOUND);
 		}
 
-		if ($fromEmail !== $mailAccount->getEmail()) {
+		if ($fromEmail !== $mailAccount->getMailAccount()->getEmail()) {
 			try {
 				$alias = $this->aliasesService->findByAliasAndUserId($fromEmail, $this->userId);
 			} catch (DoesNotExistException $e) {

lib/Controller/MessagesController.php

@@ -229,7 +229,7 @@ public function getBody(int $id): JSONResponse {
 				$a
 			);
 		}, $json['attachments']);
-		$json['accountId'] = $account->getId();
+		$json['accountId'] = $account->getMailAccount()->getId();
 		$json['mailboxId'] = $mailbox->getId();
 		$json['databaseId'] = $message->getId();
 		$json['isSenderTrusted'] = $this->isSenderTrusted($message);

lib/Controller/OutOfOfficeController.php

@@ -49,7 +49,7 @@ public function getState(int $accountId): JsonResponse {
 		}
 
 		$account = $this->accountService->findById($accountId);
-		if ($account->getUserId() !== $user->getUID()) {
+		if ($account->getMailAccount()->getUserId() !== $user->getUID()) {
 			return JsonResponse::fail([], Http::STATUS_NOT_FOUND);
 		}
 
@@ -72,7 +72,7 @@ public function followSystem(int $accountId) {
 		}
 
 		$account = $this->accountService->findById($accountId);
-		if ($account->getUserId() !== $user->getUID()) {
+		if ($account->getMailAccount()->getUserId() !== $user->getUID()) {
 			return JsonResponse::fail([], Http::STATUS_NOT_FOUND);
 		}
 
@@ -104,7 +104,7 @@ public function update(
 		}
 
 		$account = $this->accountService->findById($accountId);
-		if ($account->getUserId() !== $user->getUID()) {
+		if ($account->getMailAccount()->getUserId() !== $user->getUID()) {
 			return JsonResponse::fail([], Http::STATUS_NOT_FOUND);
 		}
 

lib/Controller/PageController.php

@@ -149,8 +149,8 @@ public function index(): TemplateResponse {
 		$mailAccounts = $this->accountService->findByUserId($this->currentUserId);
 		$accountsJson = [];
 		foreach ($mailAccounts as $mailAccount) {
-			$json = $mailAccount->jsonSerialize();
-			$json['aliases'] = $this->aliasesService->findAll($mailAccount->getId(),
+			$json = $mailAccount->getMailAccount()->jsonSerialize();
+			$json['aliases'] = $this->aliasesService->findAll($mailAccount->getMailAccount()->getId(),
 				$this->currentUserId);
 			try {
 				$mailboxes = $this->mailManager->getMailboxes($mailAccount);

lib/Db/MailAccount.php

@@ -8,6 +8,7 @@
 
 namespace OCA\Mail\Db;
 
+use JsonSerializable;
 use OCP\AppFramework\Db\Entity;
 
 /**
@@ -102,7 +103,7 @@
  * @method bool|null getOooFollowsSystem()
  * @method void setOooFollowsSystem(bool $oooFollowsSystem)
  */
-class MailAccount extends Entity {
+class MailAccount extends Entity implements JSONSerializable {
 	public const SIGNATURE_MODE_PLAIN = 0;
 	public const SIGNATURE_MODE_HTML = 1;
 
@@ -278,6 +279,7 @@ public function canAuthenticateImap(): bool {
 	}
 
 	/**
+	 * @deprecated
 	 * @return array
 	 */
 	public function toJson() {
@@ -328,4 +330,8 @@ public function toJson() {
 
 		return $result;
 	}
+
+	public function jsonSerialize(): mixed {
+		return $this->toJson();
+	}
 }