refactor(traits) : slim down models by splitting them into traits

Author: roshangautam

resources/views/tasks/view.blade.php

@@ -26,8 +26,7 @@
         <li>
             <span class="uk-text-muted uk-float-right">Cron Expression</span>
             <span class="uk-float-left">
-                <span>{{$task->expression}}</span>
-                <span class="uk-margin-left">( <em>{{$task->frequencies->pluck('label')->implode(', ')}}</em> )</span>
+                <span>{{$task->getCronExpression()}}</span>
             </span>
         </li>
         <li>

src/Frequency.php

@@ -2,10 +2,13 @@
 
 namespace Studio\Totem;
 
+use Studio\Totem\Traits\HasParameters;
 use Illuminate\Database\Eloquent\Model;
 
 class Frequency extends Model
 {
+    use HasParameters;
+
     protected $table = 'task_frequencies';
 
     protected $fillable = [
@@ -20,12 +23,4 @@ public function task()
     {
         return $this->belongsTo(Task::class);
     }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function parameters()
-    {
-        return $this->hasMany(Parameter::class);
-    }
 }

src/Http/Requests/TaskRequest.php

@@ -26,7 +26,7 @@ public function rules()
         return [
             'description'                => 'required',
             'command'                    => 'required',
-            'expression'                 => 'required_if:type,expression|cron_expression',
+            'expression'                 => 'nullable|required_if:type,expression|cron_expression',
             'frequencies'                => 'required_if:type,frequency|array',
             'notification_email_address' => 'nullable|email',
             'notification_phone_number'  => 'nullable|digits_between:11,13',
@@ -53,4 +53,18 @@ public function messages()
             'notification_slack_webhook.url'                  => 'Slack Webhook must be a valid url',
         ];
     }
+
+    /**
+     * Get data to be validated from the request.
+     *
+     * @return array
+     */
+    protected function validationData()
+    {
+        if ($this->input('type') == 'frequency') {
+            $this->merge(['expression' => null]);
+        }
+
+        return $this->all();
+    }
 }

src/Repositories/EloquentTaskRepository.php

@@ -86,16 +86,6 @@ public function store(array $input)
 
         $task->fill(array_only($input, $task->getFillable()))->save();
 
-        if ($input['type'] == 'frequency') {
-            foreach ($input['frequencies'] as $_frequency) {
-                $frequency = $task->frequencies()->create($_frequency);
-
-                if (isset($_frequency['parameters'])) {
-                    $frequency->parameters()->createMany($_frequency['parameters']);
-                }
-            }
-        }
-
         Created::dispatch($task);
 
         return $task;
@@ -118,22 +108,6 @@ public function update(array $input, $task)
 
         $task->fill(array_only($input, $task->getFillable()))->save();
 
-        if ($input['type'] == 'frequency') {
-            foreach ($task->frequencies as $frequency) {
-                if (! in_array($frequency->interval, collect($input['frequencies'])->pluck('interval')->toArray())) {
-                    $frequency->delete();
-                }
-            }
-            foreach ($input['frequencies'] as $_frequency) {
-                $frequency = $task->frequencies()->updateOrCreate(array_only($_frequency, ['task_id', 'label', 'interval']));
-
-                $parameters = isset($_frequency['parameters']) ? $_frequency['parameters'] : [];
-                foreach ($parameters as $_parameter) {
-                    $frequency->parameters()->updateOrCreate($_parameter);
-                }
-            }
-        }
-
         Updated::dispatch($task);
 
         return $task;
@@ -151,11 +125,6 @@ public function destroy($id)
 
         if ($task) {
             Deleted::dispatch($task);
-
-            $task->frequencies()->delete();
-
-            $task->results()->delete();
-
             $task->delete();
 
             return true;

src/Task.php

@@ -2,29 +2,14 @@
 
 namespace Studio\Totem;
 
-use Closure;
 use Cron\CronExpression;
 use Illuminate\Database\Eloquent\Model;
+use Studio\Totem\Traits\HasFrequencies;
 use Illuminate\Notifications\Notifiable;
-use Illuminate\Console\Scheduling\ManagesFrequencies;
 
 class Task extends Model
 {
-    use Notifiable, ManagesFrequencies;
-
-    /**
-     * The array of filter callbacks.
-     *
-     * @var array
-     */
-    protected $filters = [];
-
-    /**
-     * The array of reject callbacks.
-     *
-     * @var array
-     */
-    protected $rejects = [];
+    use Notifiable, HasFrequencies;
 
     /**
      * The attributes that are mass assignable.
@@ -75,16 +60,6 @@ public function getUpcomingAttribute()
         return CronExpression::factory($this->getCronExpression())->getNextRunDate()->format('Y-m-d H:i:s');
     }
 
-    /**
-     * Frequencies Relation.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function frequencies()
-    {
-        return $this->hasMany(Frequency::class, 'task_id', 'id')->with('parameters');
-    }
-
     /**
      * Results Relation.
      *
@@ -124,80 +99,4 @@ public function routeNotificationForSlack()
     {
         return $this->notification_slack_webhook;
     }
-
-    /**
-     * Generate a cron expression from frequencies.
-     *
-     * @return string
-     */
-    public function getCronExpression()
-    {
-        if (! $this->expression) {
-            $this->expression = '* * * * * *';
-
-            foreach ($this->frequencies as $frequency) {
-                call_user_func_array([$this, $frequency->interval], $frequency->parameters->pluck('value')->toArray());
-            }
-        }
-
-        return $this->expression;
-    }
-
-    /**
-     * Get the mutex name for the scheduled task.
-     *
-     * @return string
-     */
-    public function getMutexName()
-    {
-        return 'logs'.DIRECTORY_SEPARATOR.'schedule-'.sha1($this->expression.$this->command);
-    }
-
-    /**
-     * Determine if the filters pass for the event.
-     *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
-     * @return bool
-     */
-    public function filtersPass($app)
-    {
-        foreach ($this->filters as $callback) {
-            if (! $app->call($callback)) {
-                return false;
-            }
-        }
-
-        foreach ($this->rejects as $callback) {
-            if ($app->call($callback)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Register a callback to further filter the schedule.
-     *
-     * @param  \Closure  $callback
-     * @return $this
-     */
-    public function when(Closure $callback)
-    {
-        $this->filters[] = $callback;
-
-        return $this;
-    }
-
-    /**
-     * Schedule the event to run between start and end time.
-     *
-     * @param  string  $startTime
-     * @param  string  $endTime
-     * @return $this
-     */
-    public function between($startTime, $endTime)
-    {
-        return $this->when($this->inTimeInterval($startTime, $endTime));
-    }
 }