@@ -32,10 +32,11 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | public function index(DedicatedServer $dedicatedServer) |
| 34 | 34 | { |
| 35 | - return QueryBuilder::for(GdaemonTask::where('dedicated_server_id', $dedicatedServer->id)) |
|
| 36 | - ->allowedFilters(['status']) |
|
| 35 | + return QueryBuilder::for(GdaemonTask::where('dedicated_server_id', $dedicatedServer->id)) { |
|
| 36 | + ->allowedFilters(['status']) |
|
| 37 | 37 | ->allowedAppends(['status_num']) |
| 38 | 38 | ->get(); |
| 39 | + } |
|
| 39 | 40 | } |
| 40 | 41 | |
| 41 | 42 | public function update(GdaemonTask $gdaemonTask): JsonResponse |
@@ -28,13 +28,14 @@ |
||
| 28 | 28 | |
| 29 | 29 | public function index(DedicatedServer $dedicatedServer): JsonResponse |
| 30 | 30 | { |
| 31 | - $servers = QueryBuilder::for(Server::where('ds_id', '=', $dedicatedServer->id)) |
|
| 32 | - ->allowedFilters('id') |
|
| 31 | + $servers = QueryBuilder::for(Server::where('ds_id', '=', $dedicatedServer->id)) { |
|
| 32 | + ->allowedFilters('id') |
|
| 33 | 33 | ->with('dedicatedServer') |
| 34 | 34 | ->with('game') |
| 35 | 35 | ->with('gameMod') |
| 36 | 36 | ->with('settings') |
| 37 | 37 | ->get(); |
| 38 | + } |
|
| 38 | 39 | |
| 39 | 40 | $serversResponse = []; |
| 40 | 41 | |
@@ -106,20 +106,22 @@ |
||
| 106 | 106 | |
| 107 | 107 | public function getServersForUser(int $userId) |
| 108 | 108 | { |
| 109 | - $qb = QueryBuilder::for(Server::class) |
|
| 110 | - ->allowedFilters('ds_id') |
|
| 109 | + $qb = QueryBuilder::for(Server::class) { |
|
| 110 | + ->allowedFilters('ds_id') |
|
| 111 | 111 | ->with('game:code,name,engine,engine_version') |
| 112 | 112 | ->whereRaw('id IN(SELECT server_id FROM server_user su WHERE su.user_id = ?)', [$userId]); |
| 113 | + } |
|
| 113 | 114 | |
| 114 | 115 | return $qb->get()->append(['online']); |
| 115 | 116 | } |
| 116 | 117 | |
| 117 | 118 | public function getAllServers() |
| 118 | 119 | { |
| 119 | - $qb = QueryBuilder::for(Server::class) |
|
| 120 | - ->allowedFilters('ds_id') |
|
| 120 | + $qb = QueryBuilder::for(Server::class) { |
|
| 121 | + ->allowedFilters('ds_id') |
|
| 121 | 122 | ->allowedAppends(['full_path']) |
| 122 | 123 | ->with('game:code,name,engine,engine_version'); |
| 124 | + } |
|
| 123 | 125 | |
| 124 | 126 | return $qb->get()->append(['online']); |
| 125 | 127 | } |
@@ -68,10 +68,11 @@ |
||
| 68 | 68 | { |
| 69 | 69 | return QueryBuilder::for( |
| 70 | 70 | GdaemonTask::select('id','created_at', 'updated_at', 'dedicated_server_id', 'server_id', 'task', 'status', 'cmd') |
| 71 | - ) |
|
| 72 | - ->allowedSorts(['created_at', 'id']) |
|
| 71 | + ) { |
|
| 72 | + ->allowedSorts(['created_at', 'id']) |
|
| 73 | 73 | ->allowedFilters(['status', 'dedicated_server_id', 'server_id', 'task', 'status']) |
| 74 | 74 | ->jsonPaginate(); |
| 75 | + } |
|
| 75 | 76 | } |
| 76 | 77 | |
| 77 | 78 | /** |