Introduce single user and seen users sync #30485
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -234,7 +234,7 @@ public function callForAllUsers($callback, $search, $onlySeen) { | |
| } | ||
| $stmt = $qb->execute(); | ||
| while ($row = $stmt->fetch()) { | ||
| $return = $callback($this->mapRowToEntity($row)); | ||
| if ($return === false) { | ||
| break; | ||
| } | ||
|
|
@@ -243,4 +243,38 @@ public function callForAllUsers($callback, $search, $onlySeen) { | |
| $stmt->closeCursor(); | ||
| } | ||
|
|
||
| /** | ||
| * @param string $backend | ||
| * @param bool $hasLoggedIn | ||
| * @param integer $limit | ||
| * @param integer $offset | ||
| * @return string[] | ||
| */ | ||
| public function findUserIds($backend = null, $hasLoggedIn = null, $limit = null, $offset = null) { | ||
| $qb = $this->db->getQueryBuilder(); | ||
| $qb->select('user_id') | ||
| ->from($this->getTableName()) | ||
| ->orderBy('user_id'); // needed for predictable limit & offset | ||
|
|
||
| if ($backend !== null) { | ||
| $qb->andWhere($qb->expr()->eq('backend', $qb->createNamedParameter($backend))); | ||
| } | ||
| if ($hasLoggedIn === true) { | ||
| $qb->andWhere($qb->expr()->gt('last_login', new Literal(0))); | ||
| } else if ($hasLoggedIn === false) { | ||
| $qb->andWhere($qb->expr()->eq('last_login', new Literal(0))); | ||
|
There was a problem hiding this comment. Is all fine here? In both cases you have Literal(0) @butonic There was a problem hiding this comment. ohh, sorry just noticed gt and eq. |
||
| } | ||
| if ($limit !== null) { | ||
| $qb->setMaxResults($limit); | ||
| } | ||
| if ($offset !== null) { | ||
| $qb->setFirstResult($offset); | ||
| } | ||
|
|
||
| $stmt = $qb->execute(); | ||
| $rows = $stmt->fetchAll(\PDO::FETCH_COLUMN); | ||
| $stmt->closeCursor(); | ||
| return $rows; | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| <?php | ||
| /** | ||
| * @author Jörn Friedrich Dreyer <jfd@butonic.de> | ||
| * | ||
| * @copyright Copyright (c) 2018, ownCloud GmbH | ||
| * @license AGPL-3.0 | ||
| * | ||
| * This code is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License, version 3, | ||
| * as published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License, version 3, | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/> | ||
| * | ||
| */ | ||
| namespace OC\User\Sync; | ||
|
|
||
| use OCP\UserInterface; | ||
|
|
||
| class AllUsersIterator extends UsersIterator { | ||
| /** | ||
| * @var UserInterface | ||
| */ | ||
| private $backend; | ||
|
|
||
| public function __construct(UserInterface $backend) { | ||
| $this->backend = $backend; | ||
| } | ||
|
|
||
| public function rewind() { | ||
| parent::rewind(); | ||
| $this->data = $this->backend->getUsers('', self::LIMIT, 0); | ||
| } | ||
|
|
||
| public function next() { | ||
| $this->position++; | ||
| if ($this->currentDataPos() === 0) { | ||
| $this->page++; | ||
| $offset = $this->page * self::LIMIT; | ||
| $this->data = $this->backend->getUsers('', self::LIMIT, $offset); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍