dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

Code cleanup to use new findCountWhere function

Browse Source
This commit is contained in:
Dane Everitt 2017-08-05 17:23:02 -05:00
parent c1a078bdcf
commit 4da7922de6
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Servers/DeletionService.php
View File

@ -141,13 +141,11 @@ class DeletionService
}
$this->database->beginTransaction();
$this->databaseRepository->withColumns('id')->findWhere([['server_id', '=', $server->id]])->each(function ($item) {
$this->databaseManagementService->delete($item->id);
});
$this->repository->delete($server->id);
$this->database->commit();
}
}

4
app/Services/Users/DeletionService.php
View File

@ -78,8 +78,8 @@ class DeletionService
$user = $user->id;
}
$servers = $this->serverRepository->findWhere([['owner_id', '=', $user]]);
if (count($servers) > 0) {
$servers = $this->serverRepository->withColumns('id')->findCountWhere([['owner_id', '=', $user]]);
if ($servers > 0) {
throw new DisplayException($this->translator->trans('admin/user.exceptions.user_has_servers'));
}

4
app/Services/Users/UpdateService.php
View File

@ -68,8 +68,6 @@ class UpdateService
$data['password'] = $this->hasher->make($data['password']);
}
$user = $this->repository->update($id, $data);
return $user;
return $this->repository->update($id, $data);
}
}

9
tests/Unit/Services/Users/DeletionServiceTest.php
View File

@ -81,7 +81,8 @@ class DeletionServiceTest extends TestCase
*/
public function testUserIsDeletedIfNoServersAreAttachedToAccount()
{
$this->serverRepository->shouldReceive('findWhere')->with([['owner_id', '=', $this->user->id]])->once()->andReturn([]);
$this->serverRepository->shouldReceive('withColumns')->with('id')->once()->andReturnSelf()
->shouldReceive('findCountWhere')->with([['owner_id', '=', $this->user->id]])->once()->andReturn(0);
$this->repository->shouldReceive('delete')->with($this->user->id)->once()->andReturn(true);
$this->assertTrue(
@ -97,7 +98,8 @@ class DeletionServiceTest extends TestCase
*/
public function testExceptionIsThrownIfServersAreAttachedToAccount()
{
$this->serverRepository->shouldReceive('findWhere')->with([['owner_id', '=', $this->user->id]])->once()->andReturn(['item']);
$this->serverRepository->shouldReceive('withColumns')->with('id')->once()->andReturnSelf()
->shouldReceive('findCountWhere')->with([['owner_id', '=', $this->user->id]])->once()->andReturn(1);
$this->translator->shouldReceive('trans')->with('admin/user.exceptions.user_has_servers')->once()->andReturnNull();
$this->service->handle($this->user->id);
@ -108,7 +110,8 @@ class DeletionServiceTest extends TestCase
*/
public function testModelCanBePassedInPlaceOfUserId()
{
$this->serverRepository->shouldReceive('findWhere')->with([['owner_id', '=', $this->user->id]])->once()->andReturn([]);
$this->serverRepository->shouldReceive('withColumns')->with('id')->once()->andReturnSelf()
->shouldReceive('findCountWhere')->with([['owner_id', '=', $this->user->id]])->once()->andReturn(0);
$this->repository->shouldReceive('delete')->with($this->user->id)->once()->andReturn(true);
$this->assertTrue(