Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

fix(api): improve scheduled tasks validation and delete logic

Andras Bacsai4d36265017fa
diff --git a/app/Http/Controllers/Api/ScheduledTasksController.php b/app/Http/Controllers/Api/ScheduledTasksController.php
index cf3574f1cf..6245dc2ec6 100644
--- a/app/Http/Controllers/Api/ScheduledTasksController.php
+++ b/app/Http/Controllers/Api/ScheduledTasksController.php
@@ -93,8 +93,8 @@ class ScheduledTasksController extends Controller
$task->command = $request->command;
$task->frequency = $request->frequency;
$task->container = $request->container;
- $task->timeout = $request->timeout ?? 300;
- $task->enabled = $request->enabled ?? true;
+ $task->timeout = $request->has('timeout') ? $request->timeout : 300;
+ $task->enabled = $request->has('enabled') ? $request->enabled : true;
$task->team_id = $teamId;
if ($resource instanceof Application) {
@@ -117,6 +117,10 @@ class ScheduledTasksController extends Controller
return $return;
}
+ if ($request->all() === []) {
+ return response()->json(['message' => 'At least one field must be provided.'], 422);
+ }
+
$allowedFields = ['name', 'command', 'frequency', 'container', 'timeout', 'enabled'];
$validator = customApiValidator($request->all(), [
@@ -164,13 +168,11 @@ class ScheduledTasksController extends Controller
{
$this->authorize('update', $resource);
- $task = $resource->scheduled_tasks()->where('uuid', $request->task_uuid)->first();
- if (! $task) {
+ $deleted = $resource->scheduled_tasks()->where('uuid', $request->task_uuid)->delete();
+ if (! $deleted) {
return response()->json(['message' => 'Scheduled task not found.'], 404);
}
- $task->delete();
-
return response()->json(['message' => 'Scheduled task deleted.']);
}
diff --git a/database/factories/ScheduledTaskFactory.php b/database/factories/ScheduledTaskFactory.php
index 5f65192889..6e4d6d7405 100644
--- a/database/factories/ScheduledTaskFactory.php
+++ b/database/factories/ScheduledTaskFactory.php
@@ -2,6 +2,7 @@
namespace Database\Factories;
+use App\Models\Team;
use Illuminate\Database\Eloquent\Factories\Factory;
class ScheduledTaskFactory extends Factory
@@ -14,7 +15,7 @@ class ScheduledTaskFactory extends Factory
'frequency' => '* * * * *',
'timeout' => 300,
'enabled' => true,
- 'team_id' => 1,
+ 'team_id' => Team::factory(),
];
}
}