From 798258ab16ea7870907d68068555797015305fcf Mon Sep 17 00:00:00 2001 From: Nikola Cirkovic Date: Thu, 26 May 2022 04:18:10 +0200 Subject: [PATCH] INA-5 | TaskSchedulerService (Fixed license,refactored methods for update|destroy|store) --- .../TaskScheduler/TaskSchedulerService.php | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/app/Services/TaskScheduler/TaskSchedulerService.php b/app/Services/TaskScheduler/TaskSchedulerService.php index 01e62c950629..4bce031574c6 100644 --- a/app/Services/TaskScheduler/TaskSchedulerService.php +++ b/app/Services/TaskScheduler/TaskSchedulerService.php @@ -1,5 +1,13 @@ paused = $request->get('paused', false); - $scheduler->archived = (bool)$request->get('archived', false); $scheduler->start_from = $request->get('start_from') ? Carbon::parse((int)$request->get('start_from')) : Carbon::now(); $scheduler->repeat_every = $request->get('repeat_every'); $scheduler->scheduled_run = $request->get('start_from') ? Carbon::parse((int)$request->get('start_from')) : Carbon::now();; $scheduler->company_id = auth()->user()->company()->id; $scheduler->save(); + $this->createJob($request, $scheduler); - if ($this->createJob($request, $scheduler)) { - return response(['job_has_been_created'], 200); - } - return response(['failed_to_create_job'], 400); } public function update(Scheduler $scheduler, UpdateScheduleRequest $request) @@ -189,15 +195,6 @@ class TaskSchedulerService return $class = is_object($class) ? get_class($class) : $class; } - public function destroy(Scheduler $scheduler) - { - $job = $scheduler->job; - if ($job) { - $job->delete(); - } - $scheduler->delete(); - return response(['successfully_deleted_scheduler_and_job_associated_to_him']); - } public function updateJob(Scheduler $scheduler, UpdateScheduledJobRequest $request) { @@ -208,8 +205,5 @@ class TaskSchedulerService $job = $this->setJobParameters($job, $request); $job->save(); - return response(['job_successfully_updated'], 200); - - } }