StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup allocation repository

Browse source
This commit is contained in:
Dane Everitt 2020-09-13 12:47:05 -07:00
parent 9410a54c98
commit 7b57d65edf
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 27 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

69
app/Repositories/Eloquent/AllocationRepository.php
View file

@ -2,7 +2,6 @@
namespace Pterodactyl\Repositories\Eloquent;
use Illuminate\Support\Collection;
use Pterodactyl\Models\Allocation;
use Illuminate\Database\Eloquent\Builder;
use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
@ -19,20 +18,6 @@ class AllocationRepository extends EloquentRepository implements AllocationRepos
return Allocation::class;
}
/**
* Return all of the unique IPs that exist for a given node.
*
* @param int $node
* @return \Illuminate\Support\Collection
*/
public function getUniqueAllocationIpsForNode(int $node): Collection
{
return $this->getBuilder()->where('node_id', $node)
->groupBy('ip')
->orderByRaw('INET_ATON(ip) ASC')
->get($this->getColumns());
}
/**
* Return all of the allocations that exist for a node that are not currently
* allocated.
@ -42,22 +27,12 @@ class AllocationRepository extends EloquentRepository implements AllocationRepos
*/
public function getUnassignedAllocationIds(int $node): array
{
$results = $this->getBuilder()->select('id')->whereNull('server_id')->where('node_id', $node)->get();
return $results->pluck('id')->toArray();
}
/**
* Get an array of all allocations that are currently assigned to a given server.
*
* @param int $server
* @return array
*/
public function getAssignedAllocationIds(int $server): array
{
$results = $this->getBuilder()->select('id')->where('server_id', $server)->get();
return $results->pluck('id')->toArray();
return Allocation::query()->select('id')
->whereNull('server_id')
->where('node_id', $node)
->get()
->pluck('id')
->toArray();
}
/**
@ -71,21 +46,19 @@ class AllocationRepository extends EloquentRepository implements AllocationRepos
* @param array $nodes
* @return array
*/
public function getDiscardableDedicatedAllocations(array $nodes = []): array
protected function getDiscardableDedicatedAllocations(array $nodes = []): array
{
$instance = $this->getBuilder()->select(
$this->getBuilder()->raw('CONCAT_WS("-", node_id, ip) as result')
);
$query = Allocation::query()->selectRaw('CONCAT_WS("-", node_id, ip) as result');
if (! empty($nodes)) {
$instance->whereIn('node_id', $nodes);
$query->whereIn('node_id', $nodes);
}
$results = $instance->whereNotNull('server_id')
->groupBy($this->getBuilder()->raw('CONCAT(node_id, ip)'))
->get();
return $results->pluck('result')->toArray();
return $query->whereNotNull('server_id')
->groupByRaw('CONCAT(node_id, ip)')
->get()
->pluck('result')
->toArray();
}
/**
@ -98,18 +71,18 @@ class AllocationRepository extends EloquentRepository implements AllocationRepos
*/
public function getRandomAllocation(array $nodes, array $ports, bool $dedicated = false)
{
$instance = $this->getBuilder()->whereNull('server_id');
$query = Allocation::query()->whereNull('server_id');
if (! empty($nodes)) {
$instance->whereIn('node_id', $nodes);
$query->whereIn('node_id', $nodes);
}
if (! empty($ports)) {
$instance->where(function (Builder $query) use ($ports) {
$query->where(function (Builder $inner) use ($ports) {
$whereIn = [];
foreach ($ports as $port) {
if (is_array($port)) {
$query->orWhereBetween('port', $port);
$inner->orWhereBetween('port', $port);
continue;
}
@ -117,7 +90,7 @@ class AllocationRepository extends EloquentRepository implements AllocationRepos
}
if (! empty($whereIn)) {
$query->orWhereIn('port', $whereIn);
$inner->orWhereIn('port', $whereIn);
}
});
}
@ -128,12 +101,12 @@ class AllocationRepository extends EloquentRepository implements AllocationRepos
$discard = $this->getDiscardableDedicatedAllocations($nodes);
if (! empty($discard)) {
$instance->whereNotIn(
$query->whereNotIn(
$this->getBuilder()->raw('CONCAT_WS("-", node_id, ip)'), $discard
);
}
}
return $instance->inRandomOrder()->first();
return $query->inRandomOrder()->first();
}
}