Don't use rainloop classes (369145e4) · Commits · e / infra / ecloud / nextcloud-apps / Ecloud Accounts

lib/Command/MigrateWebmailAddressbooks.php

+8 −6

Original line number	Diff line number	Diff line
		@@ -73,17 +73,19 @@ class MigrateWebmailAddressbooks extends Command {
		* @return void
		*/
		private function migrateUsers(int $limit, int $offset = 0, array $usernames = []) : void {
		$emails = [];
		$users = [];
		if (!empty($usernames)) {
		$emails = [];
		foreach ($usernames as $username) {
		$user = $this->userManager->getUser($username);
		$emails[] = $user->getEMailAddress();
		$user = $this->userManager->get($username);
		$email = $user->getEMailAddress();
		$emails[] = $email;
		}

		$users = $this->webmailMapper->getUsers($limit, $offset, $emails);
		$this->webmailMapper->migrateContacts($emails);
		return;
		}
		$emails = $this->webmailMapper->getUserEmails($limit, $offset);
		$this->webmailMapper->migrateContacts($emails);
		$users = $this->webmailMapper->getUsers($limit, $offset);
		$this->webmailMapper->migrateContacts($users);
		}
		}

lib/Db/WebmailMapper.php

+26 −26

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ use OCP\ILogger;
		use Doctrine\DBAL\DriverManager;
		use Doctrine\DBAL\Connection;
		use OCA\EcloudAccounts\Exception\DbConnectionParamsException;
		use \RainLoop\Providers\AddressBook\PdoAddressBook;
		use Sabre\VObject\UUIDUtil;
		use \Sabre\VObject\Reader;
		use OCP\IUserManager;
		use OCP\IUser;
		use OCA\DAV\CardDAV\CardDavBackend;
		@@ -49,35 +49,45 @@ class WebmailMapper {
		&& isset($config['db_port']) ;
		}

		public function getUserEmails(int $limit, int $offset = 0) : array {

		public function getUsers(int $limit, int $offset = 0, array $emails = []) : array {
		$qb = $this->conn->createQueryBuilder();
		$qb->select('rl_email')
		$qb->select('rl_email, id_user')
		->from(self::USERS_TABLE)
		->setFirstResult($offset)
		// We can set max to $limit without default as NULL => all results
		->setMaxResults($limit);

		if (!empty($emails)) {
		$qb->where('rl_email IN :emails')
		->setParameter('emails', $emails);
		}
		$result = $qb->execute();

		$emails = [];
		$users = [];
		while ($row = $result->fetch()) {
		$emails[] = $row['rl_email'];
		$user = [
		'email' => $row['rl_email'],
		'id' => $row['id_user']
		];
		$users[] = $user;
		}
		return $emails;
		return $users;
		}

		private function getUserContactIds(string $uid) : array {
		private function getUserContacts(string $uid) : array {
		$qb = $this->conn->createQueryBuilder();

		$qb->select('id_contact')
		$qb->select('id_contact,jcard')
		->from('rainloop_ab_contacts')
		->where('id_user = :uid')
		->setParameter('uid', $uid);
		$result = $qb->execute();
		$contactIds = [];
		$contacts = [];
		while ($row = $result->fetch()) {
		$contactIds[] = $row['id_contact'];
		$contacts[] = Reader::readJson($row['jcard']);
		}
		return $contactIds;
		return $contacts;
		}

		private function createCloudAddressBook(array $contacts, string $email) {
		@@ -112,23 +122,13 @@ class WebmailMapper {
		}
		}

		public function migrateContacts(array $emails) {
		$rainloopContactsProvider = new PdoAddressBook();
		foreach ($emails as $email) {
		$uid = $rainloopContactsProvider->setEmail($email);
		$contactIds = $this->getUserContactIds($uid);

		if (!count($contactIds)) {
		public function migrateContacts(array $users) {
		foreach ($users as $user) {
		$contacts = $this->getUserContacts($user['id']);
		if (!count($contacts)) {
		return;
		}
		$contacts = [];
		foreach ($contactIds as $id) {
		$contact = $rainloopContactsProvider->GetContactByID($id, false, $uid);

		$contacts[] = $contact->vCard->serialize();
		}

		$this->createCloudAddressBook($contacts, $email);
		$this->createCloudAddressBook($contacts, $user['email']);
		}
		}