From e51fec2f57ce92d7882509fb01f4621b353441d4 Mon Sep 17 00:00:00 2001 From: pc-10 Date: Fri, 26 Sep 2025 11:37:23 -0300 Subject: [PATCH 1/2] feat: add kernel schedule extraction with bulk import functionality - Add extractFromKernel method to extract schedules from Laravel Kernel - Create ImportService to handle schedule import logic with duplicate prevention - Add importFromKernel method with upsert functionality (create new or update existing) - Create extract.blade.php view with bulk selection interface --- resources/lang/en/schedule.php | 20 +++- resources/views/extract.blade.php | 120 +++++++++++++++++++ resources/views/index.blade.php | 4 + routes/web.php | 6 +- src/Http/Controllers/ScheduleController.php | 45 +++++++ src/Http/Services/ImportService.php | 23 ++++ src/Http/Services/KernelExtractorService.php | 106 ++++++++++++++++ 7 files changed, 319 insertions(+), 5 deletions(-) create mode 100644 resources/views/extract.blade.php create mode 100644 src/Http/Services/ImportService.php create mode 100644 src/Http/Services/KernelExtractorService.php diff --git a/resources/lang/en/schedule.php b/resources/lang/en/schedule.php index 6b04f2b..1079134 100644 --- a/resources/lang/en/schedule.php +++ b/resources/lang/en/schedule.php @@ -5,7 +5,8 @@ 'create' => 'Create new schedule', 'edit' => 'Edit schedule', 'show' => 'Show run history', - 'back_to_application' => 'Back to application' + 'back_to_application' => 'Back to application', + 'extract' => 'Extract Schedules from Kernel' ], 'fields' => [ 'command' => 'Command', @@ -33,7 +34,8 @@ 'updated_at' => 'Updated At', 'never' => 'Never', 'groups' => 'Groups', - 'environments' => 'Environments' + 'environments' => 'Environments', + 'settings' => 'Settings' ], 'messages' => [ 'no-records-found' => 'No records found.', @@ -48,7 +50,13 @@ 'help-type' => 'Multiple :type can be specified separated by commas', 'attention-type-function' => "ATTENTION: parameters of the type 'function' are executed before the execution of the scheduling and its return is passed as parameter. Use with care, it can break your job", 'delete_cronjob' => 'Delete cronjob', - 'delete_cronjob_confirm' => 'Do you really want to delete the cronjob ":cronjob"?' + 'delete_cronjob_confirm' => 'Do you really want to delete the cronjob ":cronjob"?', + 'import-success' => 'Schedules extracted successfully', + 'import-error' => 'Error extracting schedules', + 'no-schedules-found' => 'No schedules found in Kernel.', + 'all-environments' => 'All', + 'no-overlap' => 'No Overlap', + 'one-server' => 'One Server' ], 'status' => [ 'active' => 'Active', @@ -65,7 +73,11 @@ 'delete' => 'Delete', 'history' => 'History', 'cancel' => 'Cancel', - 'restore' => 'Restore' + 'restore' => 'Restore', + 'extract_kernel' => 'Extract from Kernel', + 'select_all' => 'Select All', + 'select_none' => 'Select None', + 'import_selected' => 'Import Selected' ], 'validation' => [ 'cron' => 'The field must be filled in the cron expression format.', diff --git a/resources/views/extract.blade.php b/resources/views/extract.blade.php new file mode 100644 index 0000000..be0be0b --- /dev/null +++ b/resources/views/extract.blade.php @@ -0,0 +1,120 @@ +@extends('schedule::layout.master') + +@section('content') +
+
+
+
+
+ {{ trans('schedule::schedule.titles.extract') }} + + {{ trans('schedule::schedule.buttons.back') }} + +
+ +
+ @include('schedule::messages') + + @if(count($extractedSchedules) > 0) +
+ @csrf + +
+ + + +
+ +
+ + + + + + + + + + + + @foreach($extractedSchedules as $index => $schedule) + + + + + + + + @endforeach + +
+ + {{ trans('schedule::schedule.fields.command') }}{{ trans('schedule::schedule.fields.expression') }}{{ trans('schedule::schedule.fields.environments') }}{{ trans('schedule::schedule.fields.settings') }}
+ + + {{ $schedule['command'] }} + @if(!empty($schedule['params'])) +
+ @foreach($schedule['params'] as $key => $param) + {{ $key }}: {{ $param }} + @endforeach + @endif + 		{{ $schedule['expression'] }} + @if($schedule['environments']) + {{ $schedule['environments'] }} + @else + {{ trans('schedule::schedule.messages.all-environments') }} + @endif + + @if($schedule['without_overlapping']) + {{ trans('schedule::schedule.messages.no-overlap') }} + @endif + @if($schedule['on_one_server']) + {{ trans('schedule::schedule.messages.one-server') }} + @endif + @if($schedule['status']) + {{ trans('schedule::schedule.status.active') }} + @else + {{ trans('schedule::schedule.status.inactive') }} + @endif +
+
+
+ @else +
+ {{ trans('schedule::schedule.messages.no-schedules-found') }} +
+ @endif +
+
+
+
+
+ + +@endsection diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index e6618e0..0ce21e6 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -122,6 +122,10 @@ class="bi {{ ($schedule->status ? 'bi-pause' : 'bi-play') }}">
+ + {{ trans('schedule::schedule.buttons.extract_kernel') }} + {{ trans('schedule::schedule.buttons.create') }} diff --git a/routes/web.php b/routes/web.php index b07dd02..c8039dc 100644 --- a/routes/web.php +++ b/routes/web.php @@ -18,8 +18,12 @@ ->name(config('database-schedule.route.name', 'database-schedule') . '.filter'); Route::post('/filter-reset', 'ScheduleController@filterReset') ->name(config('database-schedule.route.name', 'database-schedule') . '.filter-reset'); -Route::get('/create', 'ScheduleController@create') +Route::get('/create2', 'ScheduleController@create') ->name(config('database-schedule.route.name', 'database-schedule') . '.create'); +Route::get('/extract', 'ScheduleController@extractFromKernel') + ->name(config('database-schedule.route.name', 'database-schedule') . '.extract'); +Route::post('/import', 'ScheduleController@importFromKernel') + ->name(config('database-schedule.route.name', 'database-schedule') . '.import'); Route::put('/{schedule}', 'ScheduleController@update') ->name(config('database-schedule.route.name', 'database-schedule') . '.update'); Route::get('/{schedule}', 'ScheduleController@show') diff --git a/src/Http/Controllers/ScheduleController.php b/src/Http/Controllers/ScheduleController.php index 4d2d2d4..dd1c5ac 100644 --- a/src/Http/Controllers/ScheduleController.php +++ b/src/Http/Controllers/ScheduleController.php @@ -4,6 +4,8 @@ use RobersonFaria\DatabaseSchedule\Http\Requests\ScheduleRequest; use RobersonFaria\DatabaseSchedule\Http\Services\CommandService; +use RobersonFaria\DatabaseSchedule\Http\Services\ImportService; +use RobersonFaria\DatabaseSchedule\Http\Services\KernelExtractorService; use RobersonFaria\DatabaseSchedule\Models\Schedule; use RobersonFaria\DatabaseSchedule\View\Helpers; @@ -63,6 +65,9 @@ public function index() return view('schedule::index')->with(compact('schedules', 'orderBy', 'direction')); } + /** + * @return \Illuminate\Http\RedirectResponse + */ public function filter() { session()->put(Schedule::SESSION_KEY_FILTERS, request()->input('filters')); @@ -155,6 +160,11 @@ public function update(ScheduleRequest $request, Schedule $schedule) } } + /** + * @param Schedule $schedule + * @param bool $status + * @return \Illuminate\Http\RedirectResponse + */ public function status(Schedule $schedule, bool $status) { try { @@ -224,4 +234,39 @@ public function filterReset() return redirect()->to(Helpers::indexRoute()); } + + /** + * Extract schedules from Kernel + * + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Http\Response|\Illuminate\View\View + */ + public function extractFromKernel() + { + $extractorService = new KernelExtractorService(); + $extractedSchedules = $extractorService->extract(); + + return view('schedule::extract') + ->with(compact('extractedSchedules')); + } + + /** + * Import selected schedules from kernel extraction + * + * @return \Illuminate\Http\RedirectResponse + */ + public function importFromKernel(ImportService $importService) + { + try { + $selectedSchedules = request()->input('schedules', []); + + $importService->importSchedules($selectedSchedules); + + return redirect()->to(Helpers::indexRoute()) + ->with('success', trans('schedule::schedule.messages.import-success')); + } catch (\Exception $e) { + report($e); + return back() + ->with('error', trans('schedule::schedule.messages.import-error') . ' : ' . $e->getMessage()); + } + } } diff --git a/src/Http/Services/ImportService.php b/src/Http/Services/ImportService.php new file mode 100644 index 0000000..5032d59 --- /dev/null +++ b/src/Http/Services/ImportService.php @@ -0,0 +1,23 @@ + $data['command'], + 'expression' => $data['expression'], + ], + $data + ); + } + } +} diff --git a/src/Http/Services/KernelExtractorService.php b/src/Http/Services/KernelExtractorService.php new file mode 100644 index 0000000..4f52e36 --- /dev/null +++ b/src/Http/Services/KernelExtractorService.php @@ -0,0 +1,106 @@ +setAccessible(true); + $method->invoke($kernel, $schedule); + + $extractedSchedules = []; + + foreach ($schedule->events() as $event) { + $extractedSchedules[] = $this->parseEvent($event); + } + + return $extractedSchedules; + } + + private function parseEvent($event): array + { + $command = $this->getCommand($event); + + // Get cron expression + $expression = $event->getExpression(); + + // Get configurations + $withoutOverlapping = $this->getProperty($event, 'withoutOverlapping'); + $onOneServer = $this->getProperty($event, 'onOneServer'); + $environments = $this->getEnvironments($event); + + return [ + 'command' => $command['command'], + 'params' => $command['params'], + 'expression' => $expression, + 'without_overlapping' => $withoutOverlapping, + 'on_one_server' => $onOneServer, + 'environments' => $environments, + 'status' => true, + ]; + } + + private function getCommand($event): array + { + if (!empty($event->description)) { + return [ + 'command' => $event->description, + 'params' => [] + ]; + } + + $fullCommand = $event->command ?? ''; + + $fullCommand = str_replace(["'/usr/local/bin/php'", "'artisan'"], '', $fullCommand); + $fullCommand = trim(preg_replace('/\s+/', ' ', $fullCommand)); + + $parts = explode(' ', $fullCommand); + $command = $parts[0] ?? ''; + $params = array_slice($parts, 1); + + return [ + 'command' => $command, + 'params' => $this->formatParams($params), + ]; + } + + private function formatParams(array $params): array + { + $formatted = []; + foreach ($params as $index => $param) { + $formatted["arg{$index}"] = ['value' => $param]; + } + return $formatted; + } + + private function getProperty($event, string $property) + { + try { + $reflection = new ReflectionClass($event); + $prop = $reflection->getProperty($property); + $prop->setAccessible(true); + + return $prop->getValue($event); + } catch (\Exception $e) { + return false; + } + } + + private function getEnvironments($event): ?string + { + $environments = $this->getProperty($event, 'environments'); + return $environments ? implode(',', $environments) : null; + } +} From 4e00be9e9f10eac3fd2ca74a9d36d5c7ce99ace7 Mon Sep 17 00:00:00 2001 From: pc-10 Date: Fri, 26 Sep 2025 11:41:06 -0300 Subject: [PATCH 2/2] remove typo --- routes/web.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index c8039dc..9ac4a36 100644 --- a/routes/web.php +++ b/routes/web.php @@ -18,7 +18,7 @@ ->name(config('database-schedule.route.name', 'database-schedule') . '.filter'); Route::post('/filter-reset', 'ScheduleController@filterReset') ->name(config('database-schedule.route.name', 'database-schedule') . '.filter-reset'); -Route::get('/create2', 'ScheduleController@create') +Route::get('/create', 'ScheduleController@create') ->name(config('database-schedule.route.name', 'database-schedule') . '.create'); Route::get('/extract', 'ScheduleController@extractFromKernel') ->name(config('database-schedule.route.name', 'database-schedule') . '.extract');