Skip to content

Commit 38feac9

Browse files
committed
Fix server deletion mechanics
1 parent 516e2dc commit 38feac9

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

app/Repositories/ServerRepository.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -789,11 +789,13 @@ public function deleteNow($id, $force = false)
789789
// Remove Variables
790790
Models\ServerVariable::where('server_id', $server->id)->delete();
791791

792-
// Remove Permissions (Foreign Key requires before Subusers)
793-
Models\Permission::where('server_id', $server->id)->delete();
794-
795792
// Remove SubUsers
796-
Models\Subuser::where('server_id', $server->id)->delete();
793+
foreach(Models\Subuser::with('permissions')->where('server_id', $server->id)->get() as &$subuser) {
794+
foreach($subuser->permissions as &$permission) {
795+
$permission->delete();
796+
}
797+
$subuser->delete();
798+
}
797799

798800
// Remove Downloads
799801
Models\Download::where('server', $server->uuid)->delete();
@@ -809,7 +811,7 @@ public function deleteNow($id, $force = false)
809811
$repository->drop($database->id);
810812
}
811813

812-
$server->node->guzzleRequest([
814+
$server->node->guzzleClient([
813815
'X-Access-Token' => $server->node->daemonSecret,
814816
'X-Access-Server' => $server->uuid,
815817
])->request('DELETE', '/servers');

0 commit comments

Comments
 (0)