Skip to content

Commit 574bafd

Browse files
committed
fix: cleanup parameter
1 parent 2b805f8 commit 574bafd

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

app/Http/Controllers/Api/ApplicationsController.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ public function application_by_uuid(Request $request)
12831283
public function delete_by_uuid(Request $request)
12841284
{
12851285
$teamId = getTeamIdFromToken();
1286-
$cleanup = $request->query->get('cleanup') ?? true;
1286+
$cleanup = filter_var($request->query->get('cleanup', true), FILTER_VALIDATE_BOOLEAN);
12871287
if (is_null($teamId)) {
12881288
return invalidTokenResponse();
12891289
}
@@ -1297,7 +1297,10 @@ public function delete_by_uuid(Request $request)
12971297
'message' => 'Application not found',
12981298
], 404);
12991299
}
1300-
DeleteResourceJob::dispatch($application, deleteConfigurations: $cleanup, deleteVolumes: $cleanup);
1300+
DeleteResourceJob::dispatch(
1301+
resource: $application,
1302+
deleteConfigurations: $cleanup,
1303+
deleteVolumes: $cleanup);
13011304

13021305
return response()->json([
13031306
'message' => 'Application deletion request queued.',

app/Http/Controllers/Api/DatabasesController.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,7 +1572,7 @@ public function create_database(Request $request, NewDatabaseTypes $type)
15721572
public function delete_by_uuid(Request $request)
15731573
{
15741574
$teamId = getTeamIdFromToken();
1575-
$cleanup = $request->query->get('cleanup') ?? true;
1575+
$cleanup = filter_var($request->query->get('cleanup', true), FILTER_VALIDATE_BOOLEAN);
15761576
if (is_null($teamId)) {
15771577
return invalidTokenResponse();
15781578
}
@@ -1583,7 +1583,10 @@ public function delete_by_uuid(Request $request)
15831583
if (! $database) {
15841584
return response()->json(['message' => 'Database not found.'], 404);
15851585
}
1586-
DeleteResourceJob::dispatch($database, deleteConfigurations: $cleanup, deleteVolumes: $cleanup);
1586+
DeleteResourceJob::dispatch(
1587+
resource: $database,
1588+
deleteConfigurations: $cleanup,
1589+
deleteVolumes: $cleanup);
15871590

15881591
return response()->json([
15891592
'message' => 'Database deletion request queued.',

app/Jobs/DeleteResourceJob.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue
2828
{
2929
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
3030

31-
public function __construct(public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse $resource, public bool $deleteConfigurations = false, public bool $deleteVolumes = false) {}
31+
public function __construct(
32+
public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse $resource,
33+
public bool $deleteConfigurations = false,
34+
public bool $deleteVolumes = false) {}
3235

3336
public function handle()
3437
{

0 commit comments

Comments
 (0)