shlinkio/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-12-11 06:45:13 -06:00
Code Issues Packages Projects Releases 146 Wiki Activity

Merge pull request #2256 from acelaya-forks/feature/unecessary-flush

Browse Source 
Remove unnecessary flush calls when used in wrapInTransaction
This commit is contained in:
Alejandro Celaya 2024-11-11 09:35:30 +01:00 committed by GitHub
commit 15cb3bb73c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/Rest/src/ApiKey/Repository/ApiKeyRepository.php
View File

@ -36,7 +36,6 @@ class ApiKeyRepository extends EntitySpecificationRepository implements ApiKeyRe
$initialApiKey = ApiKey::fromMeta(ApiKeyMeta::fromParams(key: $apiKey)); $initialApiKey = ApiKey::fromMeta(ApiKeyMeta::fromParams(key: $apiKey));
$em->persist($initialApiKey); $em->persist($initialApiKey);
$em->flush();
return $initialApiKey; return $initialApiKey;
}); });

8
module/Rest/src/Service/ApiKeyService.php
View File

@ -27,7 +27,6 @@ readonly class ApiKeyService implements ApiKeyServiceInterface
return $this->em->wrapInTransaction(function () use ($apiKeyMeta) { return $this->em->wrapInTransaction(function () use ($apiKeyMeta) {
$apiKey = ApiKey::fromMeta($this->ensureUniqueName($apiKeyMeta)); $apiKey = ApiKey::fromMeta($this->ensureUniqueName($apiKeyMeta));
$this->em->persist($apiKey); $this->em->persist($apiKey);
$this->em->flush();
return $apiKey; return $apiKey;
}); });
@ -120,7 +119,7 @@ readonly class ApiKeyService implements ApiKeyServiceInterface
return $apiKey; return $apiKey;
} }
return $this->em->wrapInTransaction(function () use ($apiKeyRenaming, $apiKey) { $this->em->wrapInTransaction(function () use ($apiKeyRenaming, $apiKey): void {
if ($this->repo->nameExists($apiKeyRenaming->newName)) { if ($this->repo->nameExists($apiKeyRenaming->newName)) {
throw new InvalidArgumentException( throw new InvalidArgumentException(
sprintf('Another API key with name "%s" already exists', $apiKeyRenaming->newName), sprintf('Another API key with name "%s" already exists', $apiKeyRenaming->newName),
@ -128,10 +127,9 @@ readonly class ApiKeyService implements ApiKeyServiceInterface
} }
$apiKey->name = $apiKeyRenaming->newName; $apiKey->name = $apiKeyRenaming->newName;
$this->em->flush();
return $apiKey;
}); });
return $apiKey;
} }
private function findByKey(string $key): ApiKey|null private function findByKey(string $key): ApiKey|null

7
module/Rest/test/Service/ApiKeyServiceTest.php
View File

@ -45,7 +45,6 @@ class ApiKeyServiceTest extends TestCase
$this->repo->expects($this->once())->method('nameExists')->with( $this->repo->expects($this->once())->method('nameExists')->with(
! empty($name) ? $name : $this->isType('string'), ! empty($name) ? $name : $this->isType('string'),
)->willReturn(false); )->willReturn(false);
$this->em->expects($this->once())->method('flush');
$this->em->expects($this->once())->method('persist')->with($this->isInstanceOf(ApiKey::class)); $this->em->expects($this->once())->method('persist')->with($this->isInstanceOf(ApiKey::class));
$meta = ApiKeyMeta::fromParams(name: $name, expirationDate: $date, roleDefinitions: $roles); $meta = ApiKeyMeta::fromParams(name: $name, expirationDate: $date, roleDefinitions: $roles);
@ -87,7 +86,6 @@ class ApiKeyServiceTest extends TestCase
$callCount++; $callCount++;
return $callCount < 3; return $callCount < 3;
}); });
$this->em->expects($this->once())->method('flush');
$this->em->expects($this->once())->method('persist')->with($this->isInstanceOf(ApiKey::class)); $this->em->expects($this->once())->method('persist')->with($this->isInstanceOf(ApiKey::class));
$this->service->create(ApiKeyMeta::create()); $this->service->create(ApiKeyMeta::create());
@ -97,7 +95,6 @@ class ApiKeyServiceTest extends TestCase
public function exceptionIsThrownWhileCreatingIfExplicitlyProvidedNameIsInUse(): void public function exceptionIsThrownWhileCreatingIfExplicitlyProvidedNameIsInUse(): void
{ {
$this->repo->expects($this->once())->method('nameExists')->with('the_name')->willReturn(true); $this->repo->expects($this->once())->method('nameExists')->with('the_name')->willReturn(true);
$this->em->expects($this->never())->method('flush');
$this->em->expects($this->never())->method('persist'); $this->em->expects($this->never())->method('persist');
$this->expectException(InvalidArgumentException::class); $this->expectException(InvalidArgumentException::class);
@ -219,7 +216,6 @@ class ApiKeyServiceTest extends TestCase
$this->repo->expects($this->once())->method('findOneBy')->with(['name' => 'old'])->willReturn(null); $this->repo->expects($this->once())->method('findOneBy')->with(['name' => 'old'])->willReturn(null);
$this->repo->expects($this->never())->method('nameExists'); $this->repo->expects($this->never())->method('nameExists');
$this->em->expects($this->never())->method('flush');
$this->expectException(InvalidArgumentException::class); $this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('API key with name "old" could not be found'); $this->expectExceptionMessage('API key with name "old" could not be found');
@ -235,7 +231,6 @@ class ApiKeyServiceTest extends TestCase
$this->repo->expects($this->once())->method('findOneBy')->with(['name' => 'same_value'])->willReturn($apiKey); $this->repo->expects($this->once())->method('findOneBy')->with(['name' => 'same_value'])->willReturn($apiKey);
$this->repo->expects($this->never())->method('nameExists'); $this->repo->expects($this->never())->method('nameExists');
$this->em->expects($this->never())->method('flush');
$result = $this->service->renameApiKey($renaming); $result = $this->service->renameApiKey($renaming);
@ -250,7 +245,6 @@ class ApiKeyServiceTest extends TestCase
$this->repo->expects($this->once())->method('findOneBy')->with(['name' => 'old'])->willReturn($apiKey); $this->repo->expects($this->once())->method('findOneBy')->with(['name' => 'old'])->willReturn($apiKey);
$this->repo->expects($this->once())->method('nameExists')->with('new')->willReturn(true); $this->repo->expects($this->once())->method('nameExists')->with('new')->willReturn(true);
$this->em->expects($this->never())->method('flush');
$this->expectException(InvalidArgumentException::class); $this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Another API key with name "new" already exists'); $this->expectExceptionMessage('Another API key with name "new" already exists');
@ -266,7 +260,6 @@ class ApiKeyServiceTest extends TestCase
$this->repo->expects($this->once())->method('findOneBy')->with(['name' => 'old'])->willReturn($apiKey); $this->repo->expects($this->once())->method('findOneBy')->with(['name' => 'old'])->willReturn($apiKey);
$this->repo->expects($this->once())->method('nameExists')->with('new')->willReturn(false); $this->repo->expects($this->once())->method('nameExists')->with('new')->willReturn(false);
$this->em->expects($this->once())->method('flush');
$result = $this->service->renameApiKey($renaming); $result = $this->service->renameApiKey($renaming);