From 847dfb0eb804c480cb6ae36eb083f5a7ecfefb33 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 17 Apr 2019 13:40:48 +0200 Subject: [PATCH] avoids users searches on backend, faster processing Signed-off-by: Arthur Schiwon --- apps/dav/lib/CardDAV/SyncService.php | 2 +- apps/dav/lib/Command/SyncBirthdayCalendar.php | 2 +- apps/dav/lib/Controller/BirthdayCalendarController.php | 2 +- apps/dav/lib/Migration/RegenerateBirthdayCalendars.php | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/dav/lib/CardDAV/SyncService.php b/apps/dav/lib/CardDAV/SyncService.php index 6f6fa0ba37..4a713daeba 100644 --- a/apps/dav/lib/CardDAV/SyncService.php +++ b/apps/dav/lib/CardDAV/SyncService.php @@ -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(); diff --git a/apps/dav/lib/Command/SyncBirthdayCalendar.php b/apps/dav/lib/Command/SyncBirthdayCalendar.php index 88f85a9881..3d1bcab6c3 100644 --- a/apps/dav/lib/Command/SyncBirthdayCalendar.php +++ b/apps/dav/lib/Command/SyncBirthdayCalendar.php @@ -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(); diff --git a/apps/dav/lib/Controller/BirthdayCalendarController.php b/apps/dav/lib/Controller/BirthdayCalendarController.php index 244111e3ae..4964de0b21 100644 --- a/apps/dav/lib/Controller/BirthdayCalendarController.php +++ b/apps/dav/lib/Controller/BirthdayCalendarController.php @@ -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(), ]); diff --git a/apps/dav/lib/Migration/RegenerateBirthdayCalendars.php b/apps/dav/lib/Migration/RegenerateBirthdayCalendars.php index 2c2b4eb0e9..263e6d00db 100644 --- a/apps/dav/lib/Migration/RegenerateBirthdayCalendars.php +++ b/apps/dav/lib/Migration/RegenerateBirthdayCalendars.php @@ -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'); } -} \ No newline at end of file +}