perf: don't loop the users without any provisioning configurations

Signed-off-by: Daniel Kesselberg <[email protected]>
nextcloud · Sep 3, 2024 · b76e68f · b76e68f
1 parent c937e8f
commit b76e68f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 8 deletions.
diff --git a/lib/Service/Provisioning/Manager.php b/lib/Service/Provisioning/Manager.php
@@ -100,14 +100,20 @@ public function getConfigs(): array {
 	}
 
 	public function provision(): int {
-		$cnt = 0;
+		$counter = 0;
+
 		$configs = $this->getConfigs();
-		$this->userManager->callForAllUsers(function (IUser $user) use ($configs, &$cnt) {
-			if ($this->provisionSingleUser($configs, $user) === true) {
-				$cnt++;
+		if (count($configs) === 0) {
+			return $counter;
+		}
+
+		$this->userManager->callForAllUsers(function (IUser $user) use ($configs, &$counter) {
+			if ($this->provisionSingleUser($configs, $user)) {
+				$counter++;
 			}
 		});
-		return $cnt;
+
+		return $counter;
 	}
 
 	/**

diff --git a/tests/Unit/Service/Provisioning/ManagerTest.php b/tests/Unit/Service/Provisioning/ManagerTest.php
@@ -30,14 +30,34 @@ protected function setUp(): void {
 		$this->manager = $this->mock->getService();
 	}
 
-	public function testProvision() {
+	public function testProvision(): void {
+		$config = new Provisioning();
+		$config->setId(1);
+		$config->setProvisioningDomain('batman.com');
+		$config->setEmailTemplate('%USER%@batman.com');
+
+		$this->mock->getParameter('provisioningMapper')
+			->expects($this->once())
+			->method('getAll')
+			->willReturn([$config]);
+
 		$this->mock->getParameter('userManager')
 			->expects($this->once())
 			->method('callForAllUsers');
 
-		$cnt = $this->manager->provision();
+		$count = $this->manager->provision();
+
+		$this->assertEquals(0, $count);
+	}
+
+	public function testProvisionSkipWithoutConfigurations(): void {
+		$this->mock->getParameter('userManager')
+			->expects($this->never())
+			->method('callForAllUsers');
+
+		$count = $this->manager->provision();
 
-		$this->assertEquals(0, $cnt);
+		$this->assertEquals(0, $count);
 	}
 
 	public function testUpdateProvisionSingleUser() {