nextcloud / server

apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php

Indentation +69 added lines, -69 removed lines

@@ -42,84 +42,84 @@
  */
 class RetryJob extends Job {
 
-	/** @var  bool */
-	private $retainJob = true;
+    /** @var  bool */
+    private $retainJob = true;
 
-	/** @var Notifications */
-	private $notifications;
+    /** @var Notifications */
+    private $notifications;
 
-	/** @var int max number of attempts to send the request */
-	private $maxTry = 20;
+    /** @var int max number of attempts to send the request */
+    private $maxTry = 20;
 
-	/** @var int how much time should be between two tries (10 minutes) */
-	private $interval = 600;
+    /** @var int how much time should be between two tries (10 minutes) */
+    private $interval = 600;
 
 
-	public function __construct(Notifications $notifications,
-								ITimeFactory $time) {
-		parent::__construct($time);
-		$this->notifications = $notifications;
-	}
+    public function __construct(Notifications $notifications,
+                                ITimeFactory $time) {
+        parent::__construct($time);
+        $this->notifications = $notifications;
+    }
 
-	/**
-	 * run the job, then remove it from the jobList
-	 *
-	 * @param IJobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute(IJobList $jobList, ILogger $logger = null) {
-		if ($this->shouldRun($this->argument)) {
-			parent::execute($jobList, $logger);
-			$jobList->remove($this, $this->argument);
-			if ($this->retainJob) {
-				$this->reAddJob($jobList, $this->argument);
-			}
-		}
-	}
+    /**
+     * run the job, then remove it from the jobList
+     *
+     * @param IJobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute(IJobList $jobList, ILogger $logger = null) {
+        if ($this->shouldRun($this->argument)) {
+            parent::execute($jobList, $logger);
+            $jobList->remove($this, $this->argument);
+            if ($this->retainJob) {
+                $this->reAddJob($jobList, $this->argument);
+            }
+        }
+    }
 
-	protected function run($argument) {
-		$remote = $argument['remote'];
-		$remoteId = $argument['remoteId'];
-		$token = $argument['token'];
-		$action = $argument['action'];
-		$data = json_decode($argument['data'], true);
-		$try = (int)$argument['try'] + 1;
+    protected function run($argument) {
+        $remote = $argument['remote'];
+        $remoteId = $argument['remoteId'];
+        $token = $argument['token'];
+        $action = $argument['action'];
+        $data = json_decode($argument['data'], true);
+        $try = (int)$argument['try'] + 1;
 
-		$result = $this->notifications->sendUpdateToRemote($remote, $remoteId, $token, $action, $data, $try);
+        $result = $this->notifications->sendUpdateToRemote($remote, $remoteId, $token, $action, $data, $try);
 
-		if ($result === true || $try > $this->maxTry) {
-			$this->retainJob = false;
-		}
-	}
+        if ($result === true || $try > $this->maxTry) {
+            $this->retainJob = false;
+        }
+    }
 
-	/**
-	 * re-add background job with new arguments
-	 *
-	 * @param IJobList $jobList
-	 * @param array $argument
-	 */
-	protected function reAddJob(IJobList $jobList, array $argument) {
-		$jobList->add(RetryJob::class,
-			[
-				'remote' => $argument['remote'],
-				'remoteId' => $argument['remoteId'],
-				'token' => $argument['token'],
-				'data' => $argument['data'],
-				'action' => $argument['action'],
-				'try' => (int)$argument['try'] + 1,
-				'lastRun' => $this->time->getTime()
-			]
-		);
-	}
+    /**
+     * re-add background job with new arguments
+     *
+     * @param IJobList $jobList
+     * @param array $argument
+     */
+    protected function reAddJob(IJobList $jobList, array $argument) {
+        $jobList->add(RetryJob::class,
+            [
+                'remote' => $argument['remote'],
+                'remoteId' => $argument['remoteId'],
+                'token' => $argument['token'],
+                'data' => $argument['data'],
+                'action' => $argument['action'],
+                'try' => (int)$argument['try'] + 1,
+                'lastRun' => $this->time->getTime()
+            ]
+        );
+    }
 
-	/**
-	 * test if it is time for the next run
-	 *
-	 * @param array $argument
-	 * @return bool
-	 */
-	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
-		return (($this->time->getTime() - $lastRun) > $this->interval);
-	}
+    /**
+     * test if it is time for the next run
+     *
+     * @param array $argument
+     * @return bool
+     */
+    protected function shouldRun(array $argument) {
+        $lastRun = (int)$argument['lastRun'];
+        return (($this->time->getTime() - $lastRun) > $this->interval);
+    }
 }

apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php

Indentation +19 added lines, -19 removed lines

@@ -32,23 +32,23 @@
 
 class CleanupInvitationTokenJob extends TimedJob {
 
-	/** @var IDBConnection  */
-	private $db;
-
-	public function __construct(IDBConnection $db, ITimeFactory $time) {
-		parent::__construct($time);
-		$this->db = $db;
-
-		// Run once a day at off-peak time
-		$this->setInterval(24 * 60 * 60);
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-	}
-
-	public function run($argument) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('calendar_invitations')
-			->where($query->expr()->lt('expiration',
-				$query->createNamedParameter($this->time->getTime())))
-			->execute();
-	}
+    /** @var IDBConnection  */
+    private $db;
+
+    public function __construct(IDBConnection $db, ITimeFactory $time) {
+        parent::__construct($time);
+        $this->db = $db;
+
+        // Run once a day at off-peak time
+        $this->setInterval(24 * 60 * 60);
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+    }
+
+    public function run($argument) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('calendar_invitations')
+            ->where($query->expr()->lt('expiration',
+                $query->createNamedParameter($this->time->getTime())))
+            ->execute();
+    }
 }

apps/dav/lib/BackgroundJob/CalendarRetentionJob.php

Indentation +13 added lines, -13 removed lines

@@ -30,20 +30,20 @@
 use OCP\BackgroundJob\TimedJob;
 
 class CalendarRetentionJob extends TimedJob {
-	/** @var RetentionService */
-	private $service;
+    /** @var RetentionService */
+    private $service;
 
-	public function __construct(ITimeFactory $time,
-								RetentionService $service) {
-		parent::__construct($time);
-		$this->service = $service;
+    public function __construct(ITimeFactory $time,
+                                RetentionService $service) {
+        parent::__construct($time);
+        $this->service = $service;
 
-		// Run four times a day
-		$this->setInterval(6 * 60 * 60);
-		$this->setTimeSensitivity(self::TIME_SENSITIVE);
-	}
+        // Run four times a day
+        $this->setInterval(6 * 60 * 60);
+        $this->setTimeSensitivity(self::TIME_SENSITIVE);
+    }
 
-	protected function run($argument): void {
-		$this->service->cleanUp();
-	}
+    protected function run($argument): void {
+        $this->service->cleanUp();
+    }
 }

apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php

Indentation +409 added lines, -409 removed lines

@@ -42,413 +42,413 @@
 
 class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
 
-	/** @var IResourceManager */
-	private $resourceManager;
-
-	/** @var IRoomManager */
-	private $roomManager;
-
-	/** @var IDBConnection */
-	private $dbConnection;
-
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	public function __construct(ITimeFactory $time,
-								IResourceManager $resourceManager,
-								IRoomManager $roomManager,
-								IDBConnection $dbConnection,
-								CalDavBackend $calDavBackend) {
-		parent::__construct($time);
-		$this->resourceManager = $resourceManager;
-		$this->roomManager = $roomManager;
-		$this->dbConnection = $dbConnection;
-		$this->calDavBackend = $calDavBackend;
-
-		// Run once an hour
-		$this->setInterval(60 * 60);
-		$this->setTimeSensitivity(self::TIME_SENSITIVE);
-	}
-
-	/**
-	 * @param $argument
-	 */
-	public function run($argument): void {
-		$this->runForBackend(
-			$this->resourceManager,
-			'calendar_resources',
-			'calendar_resources_md',
-			'resource_id',
-			'principals/calendar-resources'
-		);
-		$this->runForBackend(
-			$this->roomManager,
-			'calendar_rooms',
-			'calendar_rooms_md',
-			'room_id',
-			'principals/calendar-rooms'
-		);
-	}
-
-	/**
-	 * Run background-job for one specific backendManager
-	 * either ResourceManager or RoomManager
-	 *
-	 * @param IResourceManager|IRoomManager $backendManager
-	 * @param string $dbTable
-	 * @param string $dbTableMetadata
-	 * @param string $foreignKey
-	 * @param string $principalPrefix
-	 */
-	private function runForBackend($backendManager,
-								   string $dbTable,
-								   string $dbTableMetadata,
-								   string $foreignKey,
-								   string $principalPrefix): void {
-		$backends = $backendManager->getBackends();
-
-		foreach ($backends as $backend) {
-			$backendId = $backend->getBackendIdentifier();
-
-			try {
-				if ($backend instanceof IResourceBackend) {
-					$list = $backend->listAllResources();
-				} else {
-					$list = $backend->listAllRooms();
-				}
-			} catch (BackendTemporarilyUnavailableException $ex) {
-				continue;
-			}
-
-			$cachedList = $this->getAllCachedByBackend($dbTable, $backendId);
-			$newIds = array_diff($list, $cachedList);
-			$deletedIds = array_diff($cachedList, $list);
-			$editedIds = array_intersect($list, $cachedList);
-
-			foreach ($newIds as $newId) {
-				try {
-					if ($backend instanceof IResourceBackend) {
-						$resource = $backend->getResource($newId);
-					} else {
-						$resource = $backend->getRoom($newId);
-					}
-
-					$metadata = [];
-					if ($resource instanceof IMetadataProvider) {
-						$metadata = $this->getAllMetadataOfBackend($resource);
-					}
-				} catch (BackendTemporarilyUnavailableException $ex) {
-					continue;
-				}
-
-				$id = $this->addToCache($dbTable, $backendId, $resource);
-				$this->addMetadataToCache($dbTableMetadata, $foreignKey, $id, $metadata);
-				// we don't create the calendar here, it is created lazily
-				// when an event is actually scheduled with this resource / room
-			}
-
-			foreach ($deletedIds as $deletedId) {
-				$id = $this->getIdForBackendAndResource($dbTable, $backendId, $deletedId);
-				$this->deleteFromCache($dbTable, $id);
-				$this->deleteMetadataFromCache($dbTableMetadata, $foreignKey, $id);
-
-				$principalName = implode('-', [$backendId, $deletedId]);
-				$this->deleteCalendarDataForResource($principalPrefix, $principalName);
-			}
-
-			foreach ($editedIds as $editedId) {
-				$id = $this->getIdForBackendAndResource($dbTable, $backendId, $editedId);
-
-				try {
-					if ($backend instanceof IResourceBackend) {
-						$resource = $backend->getResource($editedId);
-					} else {
-						$resource = $backend->getRoom($editedId);
-					}
-
-					$metadata = [];
-					if ($resource instanceof IMetadataProvider) {
-						$metadata = $this->getAllMetadataOfBackend($resource);
-					}
-				} catch (BackendTemporarilyUnavailableException $ex) {
-					continue;
-				}
-
-				$this->updateCache($dbTable, $id, $resource);
-
-				if ($resource instanceof IMetadataProvider) {
-					$cachedMetadata = $this->getAllMetadataOfCache($dbTableMetadata, $foreignKey, $id);
-					$this->updateMetadataCache($dbTableMetadata, $foreignKey, $id, $metadata, $cachedMetadata);
-				}
-			}
-		}
-	}
-
-	/**
-	 * add entry to cache that exists remotely but not yet in cache
-	 *
-	 * @param string $table
-	 * @param string $backendId
-	 * @param IResource|IRoom $remote
-	 *
-	 * @return int Insert id
-	 */
-	private function addToCache(string $table,
-								string $backendId,
-								$remote): int {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->insert($table)
-			->values([
-				'backend_id' => $query->createNamedParameter($backendId),
-				'resource_id' => $query->createNamedParameter($remote->getId()),
-				'email' => $query->createNamedParameter($remote->getEMail()),
-				'displayname' => $query->createNamedParameter($remote->getDisplayName()),
-				'group_restrictions' => $query->createNamedParameter(
-					$this->serializeGroupRestrictions(
-						$remote->getGroupRestrictions()
-					))
-			])
-			->executeStatement();
-		return $query->getLastInsertId();
-	}
-
-	/**
-	 * @param string $table
-	 * @param string $foreignKey
-	 * @param int $foreignId
-	 * @param array $metadata
-	 */
-	private function addMetadataToCache(string $table,
-										string $foreignKey,
-										int $foreignId,
-										array $metadata): void {
-		foreach ($metadata as $key => $value) {
-			$query = $this->dbConnection->getQueryBuilder();
-			$query->insert($table)
-				->values([
-					$foreignKey => $query->createNamedParameter($foreignId),
-					'key' => $query->createNamedParameter($key),
-					'value' => $query->createNamedParameter($value),
-				])
-				->executeStatement();
-		}
-	}
-
-	/**
-	 * delete entry from cache that does not exist anymore remotely
-	 *
-	 * @param string $table
-	 * @param int $id
-	 */
-	private function deleteFromCache(string $table,
-									 int $id): void {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->delete($table)
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)))
-			->executeStatement();
-	}
-
-	/**
-	 * @param string $table
-	 * @param string $foreignKey
-	 * @param int $id
-	 */
-	private function deleteMetadataFromCache(string $table,
-											 string $foreignKey,
-											 int $id): void {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->delete($table)
-			->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
-			->executeStatement();
-	}
-
-	/**
-	 * update an existing entry in cache
-	 *
-	 * @param string $table
-	 * @param int $id
-	 * @param IResource|IRoom $remote
-	 */
-	private function updateCache(string $table,
-								 int $id,
-								 $remote): void {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->update($table)
-			->set('email', $query->createNamedParameter($remote->getEMail()))
-			->set('displayname', $query->createNamedParameter($remote->getDisplayName()))
-			->set('group_restrictions', $query->createNamedParameter(
-				$this->serializeGroupRestrictions(
-					$remote->getGroupRestrictions()
-				)))
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)))
-			->executeStatement();
-	}
-
-	/**
-	 * @param string $dbTable
-	 * @param string $foreignKey
-	 * @param int $id
-	 * @param array $metadata
-	 * @param array $cachedMetadata
-	 */
-	private function updateMetadataCache(string $dbTable,
-										 string $foreignKey,
-										 int $id,
-										 array $metadata,
-										 array $cachedMetadata): void {
-		$newMetadata = array_diff_key($metadata, $cachedMetadata);
-		$deletedMetadata = array_diff_key($cachedMetadata, $metadata);
-
-		foreach ($newMetadata as $key => $value) {
-			$query = $this->dbConnection->getQueryBuilder();
-			$query->insert($dbTable)
-				->values([
-					$foreignKey => $query->createNamedParameter($id),
-					'key' => $query->createNamedParameter($key),
-					'value' => $query->createNamedParameter($value),
-				])
-				->executeStatement();
-		}
-
-		foreach ($deletedMetadata as $key => $value) {
-			$query = $this->dbConnection->getQueryBuilder();
-			$query->delete($dbTable)
-				->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
-				->andWhere($query->expr()->eq('key', $query->createNamedParameter($key)))
-				->executeStatement();
-		}
-
-		$existingKeys = array_keys(array_intersect_key($metadata, $cachedMetadata));
-		foreach ($existingKeys as $existingKey) {
-			if ($metadata[$existingKey] !== $cachedMetadata[$existingKey]) {
-				$query = $this->dbConnection->getQueryBuilder();
-				$query->update($dbTable)
-					->set('value', $query->createNamedParameter($metadata[$existingKey]))
-					->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
-					->andWhere($query->expr()->eq('key', $query->createNamedParameter($existingKey)))
-					->executeStatement();
-			}
-		}
-	}
-
-	/**
-	 * serialize array of group restrictions to store them in database
-	 *
-	 * @param array $groups
-	 *
-	 * @return string
-	 */
-	private function serializeGroupRestrictions(array $groups): string {
-		return \json_encode($groups);
-	}
-
-	/**
-	 * Gets all metadata of a backend
-	 *
-	 * @param IResource|IRoom $resource
-	 *
-	 * @return array
-	 */
-	private function getAllMetadataOfBackend($resource): array {
-		if (!($resource instanceof IMetadataProvider)) {
-			return [];
-		}
-
-		$keys = $resource->getAllAvailableMetadataKeys();
-		$metadata = [];
-		foreach ($keys as $key) {
-			$metadata[$key] = $resource->getMetadataForKey($key);
-		}
-
-		return $metadata;
-	}
-
-	/**
-	 * @param string $table
-	 * @param string $foreignKey
-	 * @param int $id
-	 *
-	 * @return array
-	 */
-	private function getAllMetadataOfCache(string $table,
-										   string $foreignKey,
-										   int $id): array {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->select(['key', 'value'])
-			->from($table)
-			->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)));
-		$result = $query->executeQuery();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		$metadata = [];
-		foreach ($rows as $row) {
-			$metadata[$row['key']] = $row['value'];
-		}
-
-		return $metadata;
-	}
-
-	/**
-	 * Gets all cached rooms / resources by backend
-	 *
-	 * @param $tableName
-	 * @param $backendId
-	 *
-	 * @return array
-	 */
-	private function getAllCachedByBackend(string $tableName,
-										   string $backendId): array {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->select('resource_id')
-			->from($tableName)
-			->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)));
-		$result = $query->executeQuery();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return array_map(function ($row): string {
-			return $row['resource_id'];
-		}, $rows);
-	}
-
-	/**
-	 * @param $principalPrefix
-	 * @param $principalUri
-	 */
-	private function deleteCalendarDataForResource(string $principalPrefix,
-												   string $principalUri): void {
-		$calendar = $this->calDavBackend->getCalendarByUri(
-			implode('/', [$principalPrefix, $principalUri]),
-			CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI);
-
-		if ($calendar !== null) {
-			$this->calDavBackend->deleteCalendar(
-				$calendar['id'],
-				true // Because this wasn't deleted by a user
-			);
-		}
-	}
-
-	/**
-	 * @param $table
-	 * @param $backendId
-	 * @param $resourceId
-	 *
-	 * @return int
-	 */
-	private function getIdForBackendAndResource(string $table,
-												string $backendId,
-												string $resourceId): int {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->select('id')
-			->from($table)
-			->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
-		$result = $query->executeQuery();
-
-		$id = (int) $result->fetchOne();
-		$result->closeCursor();
-		return $id;
-	}
+    /** @var IResourceManager */
+    private $resourceManager;
+
+    /** @var IRoomManager */
+    private $roomManager;
+
+    /** @var IDBConnection */
+    private $dbConnection;
+
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    public function __construct(ITimeFactory $time,
+                                IResourceManager $resourceManager,
+                                IRoomManager $roomManager,
+                                IDBConnection $dbConnection,
+                                CalDavBackend $calDavBackend) {
+        parent::__construct($time);
+        $this->resourceManager = $resourceManager;
+        $this->roomManager = $roomManager;
+        $this->dbConnection = $dbConnection;
+        $this->calDavBackend = $calDavBackend;
+
+        // Run once an hour
+        $this->setInterval(60 * 60);
+        $this->setTimeSensitivity(self::TIME_SENSITIVE);
+    }
+
+    /**
+     * @param $argument
+     */
+    public function run($argument): void {
+        $this->runForBackend(
+            $this->resourceManager,
+            'calendar_resources',
+            'calendar_resources_md',
+            'resource_id',
+            'principals/calendar-resources'
+        );
+        $this->runForBackend(
+            $this->roomManager,
+            'calendar_rooms',
+            'calendar_rooms_md',
+            'room_id',
+            'principals/calendar-rooms'
+        );
+    }
+
+    /**
+     * Run background-job for one specific backendManager
+     * either ResourceManager or RoomManager
+     *
+     * @param IResourceManager|IRoomManager $backendManager
+     * @param string $dbTable
+     * @param string $dbTableMetadata
+     * @param string $foreignKey
+     * @param string $principalPrefix
+     */
+    private function runForBackend($backendManager,
+                                    string $dbTable,
+                                    string $dbTableMetadata,
+                                    string $foreignKey,
+                                    string $principalPrefix): void {
+        $backends = $backendManager->getBackends();
+
+        foreach ($backends as $backend) {
+            $backendId = $backend->getBackendIdentifier();
+
+            try {
+                if ($backend instanceof IResourceBackend) {
+                    $list = $backend->listAllResources();
+                } else {
+                    $list = $backend->listAllRooms();
+                }
+            } catch (BackendTemporarilyUnavailableException $ex) {
+                continue;
+            }
+
+            $cachedList = $this->getAllCachedByBackend($dbTable, $backendId);
+            $newIds = array_diff($list, $cachedList);
+            $deletedIds = array_diff($cachedList, $list);
+            $editedIds = array_intersect($list, $cachedList);
+
+            foreach ($newIds as $newId) {
+                try {
+                    if ($backend instanceof IResourceBackend) {
+                        $resource = $backend->getResource($newId);
+                    } else {
+                        $resource = $backend->getRoom($newId);
+                    }
+
+                    $metadata = [];
+                    if ($resource instanceof IMetadataProvider) {
+                        $metadata = $this->getAllMetadataOfBackend($resource);
+                    }
+                } catch (BackendTemporarilyUnavailableException $ex) {
+                    continue;
+                }
+
+                $id = $this->addToCache($dbTable, $backendId, $resource);
+                $this->addMetadataToCache($dbTableMetadata, $foreignKey, $id, $metadata);
+                // we don't create the calendar here, it is created lazily
+                // when an event is actually scheduled with this resource / room
+            }
+
+            foreach ($deletedIds as $deletedId) {
+                $id = $this->getIdForBackendAndResource($dbTable, $backendId, $deletedId);
+                $this->deleteFromCache($dbTable, $id);
+                $this->deleteMetadataFromCache($dbTableMetadata, $foreignKey, $id);
+
+                $principalName = implode('-', [$backendId, $deletedId]);
+                $this->deleteCalendarDataForResource($principalPrefix, $principalName);
+            }
+
+            foreach ($editedIds as $editedId) {
+                $id = $this->getIdForBackendAndResource($dbTable, $backendId, $editedId);
+
+                try {
+                    if ($backend instanceof IResourceBackend) {
+                        $resource = $backend->getResource($editedId);
+                    } else {
+                        $resource = $backend->getRoom($editedId);
+                    }
+
+                    $metadata = [];
+                    if ($resource instanceof IMetadataProvider) {
+                        $metadata = $this->getAllMetadataOfBackend($resource);
+                    }
+                } catch (BackendTemporarilyUnavailableException $ex) {
+                    continue;
+                }
+
+                $this->updateCache($dbTable, $id, $resource);
+
+                if ($resource instanceof IMetadataProvider) {
+                    $cachedMetadata = $this->getAllMetadataOfCache($dbTableMetadata, $foreignKey, $id);
+                    $this->updateMetadataCache($dbTableMetadata, $foreignKey, $id, $metadata, $cachedMetadata);
+                }
+            }
+        }
+    }
+
+    /**
+     * add entry to cache that exists remotely but not yet in cache
+     *
+     * @param string $table
+     * @param string $backendId
+     * @param IResource|IRoom $remote
+     *
+     * @return int Insert id
+     */
+    private function addToCache(string $table,
+                                string $backendId,
+                                $remote): int {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->insert($table)
+            ->values([
+                'backend_id' => $query->createNamedParameter($backendId),
+                'resource_id' => $query->createNamedParameter($remote->getId()),
+                'email' => $query->createNamedParameter($remote->getEMail()),
+                'displayname' => $query->createNamedParameter($remote->getDisplayName()),
+                'group_restrictions' => $query->createNamedParameter(
+                    $this->serializeGroupRestrictions(
+                        $remote->getGroupRestrictions()
+                    ))
+            ])
+            ->executeStatement();
+        return $query->getLastInsertId();
+    }
+
+    /**
+     * @param string $table
+     * @param string $foreignKey
+     * @param int $foreignId
+     * @param array $metadata
+     */
+    private function addMetadataToCache(string $table,
+                                        string $foreignKey,
+                                        int $foreignId,
+                                        array $metadata): void {
+        foreach ($metadata as $key => $value) {
+            $query = $this->dbConnection->getQueryBuilder();
+            $query->insert($table)
+                ->values([
+                    $foreignKey => $query->createNamedParameter($foreignId),
+                    'key' => $query->createNamedParameter($key),
+                    'value' => $query->createNamedParameter($value),
+                ])
+                ->executeStatement();
+        }
+    }
+
+    /**
+     * delete entry from cache that does not exist anymore remotely
+     *
+     * @param string $table
+     * @param int $id
+     */
+    private function deleteFromCache(string $table,
+                                        int $id): void {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->delete($table)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)))
+            ->executeStatement();
+    }
+
+    /**
+     * @param string $table
+     * @param string $foreignKey
+     * @param int $id
+     */
+    private function deleteMetadataFromCache(string $table,
+                                                string $foreignKey,
+                                                int $id): void {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->delete($table)
+            ->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
+            ->executeStatement();
+    }
+
+    /**
+     * update an existing entry in cache
+     *
+     * @param string $table
+     * @param int $id
+     * @param IResource|IRoom $remote
+     */
+    private function updateCache(string $table,
+                                    int $id,
+                                    $remote): void {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->update($table)
+            ->set('email', $query->createNamedParameter($remote->getEMail()))
+            ->set('displayname', $query->createNamedParameter($remote->getDisplayName()))
+            ->set('group_restrictions', $query->createNamedParameter(
+                $this->serializeGroupRestrictions(
+                    $remote->getGroupRestrictions()
+                )))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)))
+            ->executeStatement();
+    }
+
+    /**
+     * @param string $dbTable
+     * @param string $foreignKey
+     * @param int $id
+     * @param array $metadata
+     * @param array $cachedMetadata
+     */
+    private function updateMetadataCache(string $dbTable,
+                                            string $foreignKey,
+                                            int $id,
+                                            array $metadata,
+                                            array $cachedMetadata): void {
+        $newMetadata = array_diff_key($metadata, $cachedMetadata);
+        $deletedMetadata = array_diff_key($cachedMetadata, $metadata);
+
+        foreach ($newMetadata as $key => $value) {
+            $query = $this->dbConnection->getQueryBuilder();
+            $query->insert($dbTable)
+                ->values([
+                    $foreignKey => $query->createNamedParameter($id),
+                    'key' => $query->createNamedParameter($key),
+                    'value' => $query->createNamedParameter($value),
+                ])
+                ->executeStatement();
+        }
+
+        foreach ($deletedMetadata as $key => $value) {
+            $query = $this->dbConnection->getQueryBuilder();
+            $query->delete($dbTable)
+                ->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
+                ->andWhere($query->expr()->eq('key', $query->createNamedParameter($key)))
+                ->executeStatement();
+        }
+
+        $existingKeys = array_keys(array_intersect_key($metadata, $cachedMetadata));
+        foreach ($existingKeys as $existingKey) {
+            if ($metadata[$existingKey] !== $cachedMetadata[$existingKey]) {
+                $query = $this->dbConnection->getQueryBuilder();
+                $query->update($dbTable)
+                    ->set('value', $query->createNamedParameter($metadata[$existingKey]))
+                    ->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
+                    ->andWhere($query->expr()->eq('key', $query->createNamedParameter($existingKey)))
+                    ->executeStatement();
+            }
+        }
+    }
+
+    /**
+     * serialize array of group restrictions to store them in database
+     *
+     * @param array $groups
+     *
+     * @return string
+     */
+    private function serializeGroupRestrictions(array $groups): string {
+        return \json_encode($groups);
+    }
+
+    /**
+     * Gets all metadata of a backend
+     *
+     * @param IResource|IRoom $resource
+     *
+     * @return array
+     */
+    private function getAllMetadataOfBackend($resource): array {
+        if (!($resource instanceof IMetadataProvider)) {
+            return [];
+        }
+
+        $keys = $resource->getAllAvailableMetadataKeys();
+        $metadata = [];
+        foreach ($keys as $key) {
+            $metadata[$key] = $resource->getMetadataForKey($key);
+        }
+
+        return $metadata;
+    }
+
+    /**
+     * @param string $table
+     * @param string $foreignKey
+     * @param int $id
+     *
+     * @return array
+     */
+    private function getAllMetadataOfCache(string $table,
+                                            string $foreignKey,
+                                            int $id): array {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->select(['key', 'value'])
+            ->from($table)
+            ->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)));
+        $result = $query->executeQuery();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        $metadata = [];
+        foreach ($rows as $row) {
+            $metadata[$row['key']] = $row['value'];
+        }
+
+        return $metadata;
+    }
+
+    /**
+     * Gets all cached rooms / resources by backend
+     *
+     * @param $tableName
+     * @param $backendId
+     *
+     * @return array
+     */
+    private function getAllCachedByBackend(string $tableName,
+                                            string $backendId): array {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->select('resource_id')
+            ->from($tableName)
+            ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)));
+        $result = $query->executeQuery();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return array_map(function ($row): string {
+            return $row['resource_id'];
+        }, $rows);
+    }
+
+    /**
+     * @param $principalPrefix
+     * @param $principalUri
+     */
+    private function deleteCalendarDataForResource(string $principalPrefix,
+                                                    string $principalUri): void {
+        $calendar = $this->calDavBackend->getCalendarByUri(
+            implode('/', [$principalPrefix, $principalUri]),
+            CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI);
+
+        if ($calendar !== null) {
+            $this->calDavBackend->deleteCalendar(
+                $calendar['id'],
+                true // Because this wasn't deleted by a user
+            );
+        }
+    }
+
+    /**
+     * @param $table
+     * @param $backendId
+     * @param $resourceId
+     *
+     * @return int
+     */
+    private function getIdForBackendAndResource(string $table,
+                                                string $backendId,
+                                                string $resourceId): int {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->select('id')
+            ->from($table)
+            ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
+        $result = $query->executeQuery();
+
+        $id = (int) $result->fetchOne();
+        $result->closeCursor();
+        return $id;
+    }
 }

apps/dav/lib/BackgroundJob/CleanupDirectLinksJob.php

Indentation +13 added lines, -13 removed lines

@@ -31,20 +31,20 @@
 use OCP\BackgroundJob\TimedJob;
 
 class CleanupDirectLinksJob extends TimedJob {
-	/** @var DirectMapper */
-	private $mapper;
+    /** @var DirectMapper */
+    private $mapper;
 
-	public function __construct(ITimeFactory $timeFactory, DirectMapper $mapper) {
-		parent::__construct($timeFactory);
-		$this->mapper = $mapper;
+    public function __construct(ITimeFactory $timeFactory, DirectMapper $mapper) {
+        parent::__construct($timeFactory);
+        $this->mapper = $mapper;
 
-		// Run once a day at off-peak time
-		$this->setInterval(24 * 60 * 60);
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-	}
+        // Run once a day at off-peak time
+        $this->setInterval(24 * 60 * 60);
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+    }
 
-	protected function run($argument) {
-		// Delete all shares expired 24 hours ago
-		$this->mapper->deleteExpired($this->time->getTime() - 60 * 60 * 24);
-	}
+    protected function run($argument) {
+        // Delete all shares expired 24 hours ago
+        $this->mapper->deleteExpired($this->time->getTime() - 60 * 60 * 24);
+    }
 }

apps/dav/lib/BackgroundJob/EventReminderJob.php

Indentation +29 added lines, -29 removed lines

@@ -33,39 +33,39 @@
 
 class EventReminderJob extends TimedJob {
 
-	/** @var ReminderService */
-	private $reminderService;
+    /** @var ReminderService */
+    private $reminderService;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(ITimeFactory $time,
-								ReminderService $reminderService,
-								IConfig $config) {
-		parent::__construct($time);
-		$this->reminderService = $reminderService;
-		$this->config = $config;
+    public function __construct(ITimeFactory $time,
+                                ReminderService $reminderService,
+                                IConfig $config) {
+        parent::__construct($time);
+        $this->reminderService = $reminderService;
+        $this->config = $config;
 
-		// Run every 5 minutes
-		$this->setInterval(5 * 60);
-		$this->setTimeSensitivity(self::TIME_SENSITIVE);
-	}
+        // Run every 5 minutes
+        $this->setInterval(5 * 60);
+        $this->setTimeSensitivity(self::TIME_SENSITIVE);
+    }
 
-	/**
-	 * @param $arg
-	 * @throws \OCA\DAV\CalDAV\Reminder\NotificationProvider\ProviderNotAvailableException
-	 * @throws \OCA\DAV\CalDAV\Reminder\NotificationTypeDoesNotExistException
-	 * @throws \OC\User\NoUserException
-	 */
-	public function run($arg):void {
-		if ($this->config->getAppValue('dav', 'sendEventReminders', 'yes') !== 'yes') {
-			return;
-		}
+    /**
+     * @param $arg
+     * @throws \OCA\DAV\CalDAV\Reminder\NotificationProvider\ProviderNotAvailableException
+     * @throws \OCA\DAV\CalDAV\Reminder\NotificationTypeDoesNotExistException
+     * @throws \OC\User\NoUserException
+     */
+    public function run($arg):void {
+        if ($this->config->getAppValue('dav', 'sendEventReminders', 'yes') !== 'yes') {
+            return;
+        }
 
-		if ($this->config->getAppValue('dav', 'sendEventRemindersMode', 'backgroundjob') !== 'backgroundjob') {
-			return;
-		}
+        if ($this->config->getAppValue('dav', 'sendEventRemindersMode', 'backgroundjob') !== 'backgroundjob') {
+            return;
+        }
 
-		$this->reminderService->processReminders();
-	}
+        $this->reminderService->processReminders();
+    }
 }

apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php

Indentation +32 added lines, -32 removed lines

@@ -32,44 +32,44 @@
 
 class GenerateBirthdayCalendarBackgroundJob extends QueuedJob {
 
-	/** @var BirthdayService */
-	private $birthdayService;
+    /** @var BirthdayService */
+    private $birthdayService;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(ITimeFactory $time,
-								BirthdayService $birthdayService,
-								IConfig $config) {
-		parent::__construct($time);
+    public function __construct(ITimeFactory $time,
+                                BirthdayService $birthdayService,
+                                IConfig $config) {
+        parent::__construct($time);
 
-		$this->birthdayService = $birthdayService;
-		$this->config = $config;
-	}
+        $this->birthdayService = $birthdayService;
+        $this->config = $config;
+    }
 
-	/**
-	 * @param array $arguments
-	 */
-	public function run($arguments) {
-		$userId = $arguments['userId'];
-		$purgeBeforeGenerating = $arguments['purgeBeforeGenerating'] ?? false;
+    /**
+     * @param array $arguments
+     */
+    public function run($arguments) {
+        $userId = $arguments['userId'];
+        $purgeBeforeGenerating = $arguments['purgeBeforeGenerating'] ?? false;
 
-		// make sure admin didn't change his mind
-		$isGloballyEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
-		if ($isGloballyEnabled !== 'yes') {
-			return;
-		}
+        // make sure admin didn't change his mind
+        $isGloballyEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
+        if ($isGloballyEnabled !== 'yes') {
+            return;
+        }
 
-		// did the user opt out?
-		$isUserEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
-		if ($isUserEnabled !== 'yes') {
-			return;
-		}
+        // did the user opt out?
+        $isUserEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
+        if ($isUserEnabled !== 'yes') {
+            return;
+        }
 
-		if ($purgeBeforeGenerating) {
-			$this->birthdayService->resetForUser($userId);
-		}
+        if ($purgeBeforeGenerating) {
+            $this->birthdayService->resetForUser($userId);
+        }
 
-		$this->birthdayService->syncUser($userId);
-	}
+        $this->birthdayService->syncUser($userId);
+    }
 }