Merge pull request #15219 from nextcloud/backport/15141/stable16

[stable16] fix searching all users in repair regenerate birthday cal reparir job
This commit is contained in:
Roeland Jago Douma 2019-04-24 20:55:53 +02:00 committed by GitHub
commit 9dfea7ed32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 11 deletions

View File

@ -319,7 +319,7 @@ class SyncService {
public function syncInstance(\Closure $progressCallback = null) {
$systemAddressBook = $this->getLocalSystemAddressBook();
$this->userManager->callForAllUsers(function($user) use ($systemAddressBook, $progressCallback) {
$this->userManager->callForSeenUsers(function($user) use ($systemAddressBook, $progressCallback) {
$this->updateUser($user);
if (!is_null($progressCallback)) {
$progressCallback();

View File

@ -92,7 +92,7 @@ class SyncBirthdayCalendar extends Command {
$output->writeln("Start birthday calendar sync for all users ...");
$p = new ProgressBar($output);
$p->start();
$this->userManager->callForAllUsers(function($user) use ($p) {
$this->userManager->callForSeenUsers(function($user) use ($p) {
$p->advance();
$userId = $user->getUID();

View File

@ -93,7 +93,7 @@ class BirthdayCalendarController extends Controller {
$this->config->setAppValue($this->appName, 'generateBirthdayCalendar', 'yes');
// add background job for each user
$this->userManager->callForAllUsers(function(IUser $user) {
$this->userManager->callForSeenUsers(function(IUser $user) {
$this->jobList->add(GenerateBirthdayCalendarBackgroundJob::class, [
'userId' => $user->getUID(),
]);

View File

@ -72,7 +72,7 @@ class RegenerateBirthdayCalendars implements IRepairStep {
}
$output->info('Adding background jobs to regenerate birthday calendar');
$this->userManager->callForAllUsers(function(IUser $user) {
$this->userManager->callForSeenUsers(function(IUser $user) {
$this->jobList->add(GenerateBirthdayCalendarBackgroundJob::class, [
'userId' => $user->getUID(),
'purgeBeforeGenerating' => true
@ -82,4 +82,4 @@ class RegenerateBirthdayCalendars implements IRepairStep {
// if all were done, no need to redo the repair during next upgrade
$this->config->setAppValue('dav', 'regeneratedBirthdayCalendarsForYearFix', 'yes');
}
}
}

View File

@ -78,7 +78,7 @@ class BirthdayCalendarControllerTest extends TestCase {
->with('dav', 'generateBirthdayCalendar', 'yes');
$this->userManager->expects($this->once())
->method('callForAllUsers')
->method('callForSeenUsers')
->will($this->returnCallback(function($closure) {
$user1 = $this->createMock(IUser::class);
$user1->method('getUID')->will($this->returnValue('uid1'));

View File

@ -76,7 +76,7 @@ class RegenerateBirthdayCalendarsTest extends TestCase {
->with('Adding background jobs to regenerate birthday calendar');
$this->userManager->expects($this->once())
->method('callForAllUsers')
->method('callForSeenUsers')
->will($this->returnCallback(function($closure) {
$user1 = $this->createMock(IUser::class);
$user1->method('getUID')->will($this->returnValue('uid1'));
@ -128,10 +128,10 @@ class RegenerateBirthdayCalendarsTest extends TestCase {
->with('Repair step already executed');
$this->userManager->expects($this->never())
->method('callForAllUsers');
->method('callForSeenUsers');
$this->migration->run($output);
}
}
}

View File

@ -59,7 +59,6 @@ namespace OC\User;
use OC\Cache\CappedMemoryCache;
use OCP\IDBConnection;
use OCP\ILogger;
use OCP\User\Backend\ABackend;
use OCP\User\Backend\ICheckPasswordBackend;
use OCP\User\Backend\ICountUsersBackend;
@ -68,7 +67,6 @@ use OCP\User\Backend\IGetDisplayNameBackend;
use OCP\User\Backend\IGetHomeBackend;
use OCP\User\Backend\ISetDisplayNameBackend;
use OCP\User\Backend\ISetPasswordBackend;
use OCP\Util;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\GenericEvent;