H4ad / laravel-scheduler

src/Scheduler/Exceptions/CustomException.php

Braces +6 added lines, -4 removed lines

@@ -88,8 +88,9 @@ 
      */
     protected function parseValues()
     {
-        if(is_array($this->attributes) && is_array($this->values))
-            return collect($this->attributes)->combine($this->values)->all();
+        if(is_array($this->attributes) && is_array($this->values)) {
+                    return collect($this->attributes)->combine($this->values)->all();
+        }
 
         return [ $this->attributes => $this->values ?? $this->isLower() ];
     }
@@ -111,8 +112,9 @@ 
      */
     protected function getAlias()
     {
-        if(is_object($this->model))
-            $this->model = get_class($this->model);
+        if(is_object($this->model)) {
+                    $this->model = get_class($this->model);
+        }
 
         return collect(trans('scheduler::exceptions.aliases.'. $this->aliastype))->search($this->model) ?: 'Recurso';
     }

Indentation +120 added lines, -120 removed lines

@@ -10,124 +10,124 @@
 
 class CustomException extends \Exception
 {
-    /**
-     * Model que não pertence ao usuário
-     *
-     * @var mixed
-     */
-    protected $model;
-
-    /**
-     * Key para o arquivo de tradução de exceções.
-     *
-     * @var string
-     */
-    protected $trans;
-
-    /**
-     * HTTP Status Code
-     *
-     * @var int
-     */
-    protected $statusCode;
-
-    /**
-     * Atributo usado como key para substituir por um texto.
-     *
-     * @var array|string
-     */
-    protected $attributes = 'model';
-
-    /**
-     * Diz se o alias será no singular ou no plural.
-     *
-     * @var string
-     */
-    protected $aliastype = 'singular';
-
-    /**
-     * Valor passado para o atributo
-     *
-     * @var array|string|null
-     */
-    protected $values = null;
-
-    /**
-     * Indica se a model será printada com lower case.
-     *
-     * @var boolean
-     */
-    protected $lowercase = false;
-
-    /**
-     * Construtor da exceção
-     *
-     * @param mixed $model
-     */
-    public function __construct($model = 'foo')
-    {
-        $this->model = $model;
-    }
-
-    /**
-     * Render the exception as an HTTP response.
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function render()
-    {
-        return response()->
-            /** @scrutinizer ignore-call */
-            json([
-            'messages' => trans('scheduler::exceptions.'. $this->trans, $this->parseValues())
-        ], $this->statusCode);
-    }
-
-    /**
-     * Dá parse nos valores para a string de tradução.
-     *
-     * @return array
-     */
-    protected function parseValues()
-    {
-        if(is_array($this->attributes) && is_array($this->values))
-            return collect($this->attributes)->combine($this->values)->all();
-
-        return [ $this->attributes => $this->values ?? $this->isLower() ];
-    }
-
-    /**
-     * Verifica se é lowercase e retorna de acordo.
-     *
-     * @return string
-     */
-    protected function isLower()
-    {
-        return $this->lowercase ? strtolower($this->getAlias()) : $this->getAlias();
-    }
-
-    /**
-     * Retorna o alias da model.
-     *
-     * @return string
-     */
-    protected function getAlias()
-    {
-        if(is_object($this->model))
-            $this->model = get_class($this->model);
-
-        return collect(trans('scheduler::exceptions.aliases.'. $this->aliastype))->search($this->model) ?: 'Recurso';
-    }
-
-    /**
-     * Seta os valores.
-     *
-     * @param mixed $values
-     */
-    public function setValues($values)
-    {
-        $this->values = $values;
-
-        return $this;
-    }
+	/**
+	 * Model que não pertence ao usuário
+	 *
+	 * @var mixed
+	 */
+	protected $model;
+
+	/**
+	 * Key para o arquivo de tradução de exceções.
+	 *
+	 * @var string
+	 */
+	protected $trans;
+
+	/**
+	 * HTTP Status Code
+	 *
+	 * @var int
+	 */
+	protected $statusCode;
+
+	/**
+	 * Atributo usado como key para substituir por um texto.
+	 *
+	 * @var array|string
+	 */
+	protected $attributes = 'model';
+
+	/**
+	 * Diz se o alias será no singular ou no plural.
+	 *
+	 * @var string
+	 */
+	protected $aliastype = 'singular';
+
+	/**
+	 * Valor passado para o atributo
+	 *
+	 * @var array|string|null
+	 */
+	protected $values = null;
+
+	/**
+	 * Indica se a model será printada com lower case.
+	 *
+	 * @var boolean
+	 */
+	protected $lowercase = false;
+
+	/**
+	 * Construtor da exceção
+	 *
+	 * @param mixed $model
+	 */
+	public function __construct($model = 'foo')
+	{
+		$this->model = $model;
+	}
+
+	/**
+	 * Render the exception as an HTTP response.
+	 *
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function render()
+	{
+		return response()->
+			/** @scrutinizer ignore-call */
+			json([
+			'messages' => trans('scheduler::exceptions.'. $this->trans, $this->parseValues())
+		], $this->statusCode);
+	}
+
+	/**
+	 * Dá parse nos valores para a string de tradução.
+	 *
+	 * @return array
+	 */
+	protected function parseValues()
+	{
+		if(is_array($this->attributes) && is_array($this->values))
+			return collect($this->attributes)->combine($this->values)->all();
+
+		return [ $this->attributes => $this->values ?? $this->isLower() ];
+	}
+
+	/**
+	 * Verifica se é lowercase e retorna de acordo.
+	 *
+	 * @return string
+	 */
+	protected function isLower()
+	{
+		return $this->lowercase ? strtolower($this->getAlias()) : $this->getAlias();
+	}
+
+	/**
+	 * Retorna o alias da model.
+	 *
+	 * @return string
+	 */
+	protected function getAlias()
+	{
+		if(is_object($this->model))
+			$this->model = get_class($this->model);
+
+		return collect(trans('scheduler::exceptions.aliases.'. $this->aliastype))->search($this->model) ?: 'Recurso';
+	}
+
+	/**
+	 * Seta os valores.
+	 *
+	 * @param mixed $values
+	 */
+	public function setValues($values)
+	{
+		$this->values = $values;
+
+		return $this;
+	}
 }

src/Scheduler/Models/Schedule.php

Braces +6 added lines, -4 removed lines

@@ -52,13 +52,15 @@
      */
     public function parseStatusKey($key)
     {
-    	if(is_int($key))
-    		return ['status' => $key];
+    	if(is_int($key)) {
+    	    		return ['status' => $key];
+    	}
 
     	$status = ScheduleStatus::where('name', $key)->first();
 
-    	if(is_null($status))
-    		throw (new ModelNotFound)->setValues(ScheduleStatus::class);
+    	if(is_null($status)) {
+    	    		throw (new ModelNotFound)->setValues(ScheduleStatus::class);
+    	}
 
     	return ['status' => $status->id];
     }

Indentation +51 added lines, -51 removed lines

@@ -14,64 +14,64 @@
 
 class Schedule extends Model
 {
-    use SoftDeletes;
+	use SoftDeletes;
 
 	/**
-     * Os atributos que podem ser atribuíveis em massa.
-     *
-     * @var array
-     */
-    protected $fillable = [
-    	'model_type', 'model_id', 'start_at', 'end_at', 'status'
-    ];
+	 * Os atributos que podem ser atribuíveis em massa.
+	 *
+	 * @var array
+	 */
+	protected $fillable = [
+		'model_type', 'model_id', 'start_at', 'end_at', 'status'
+	];
 
-    /**
-     * Os atributos que devem ser transformados para data.
-     *
-     * @var array
-     */
-    protected $dates = [
-    	'start_at', 'end_at', 'deleted_at'
-    ];
+	/**
+	 * Os atributos que devem ser transformados para data.
+	 *
+	 * @var array
+	 */
+	protected $dates = [
+		'start_at', 'end_at', 'deleted_at'
+	];
 
-    /**
-     * Seta um status para o horário agendado.
-     *
-     * @param int|string $status Pode ser passado o ID do status ou seu nome para seta-lo no horário.
-     */
-    public function setStatus($name)
-    {
-    	$this->fill($this->parseStatusKey($name))->save();
-    }
+	/**
+	 * Seta um status para o horário agendado.
+	 *
+	 * @param int|string $status Pode ser passado o ID do status ou seu nome para seta-lo no horário.
+	 */
+	public function setStatus($name)
+	{
+		$this->fill($this->parseStatusKey($name))->save();
+	}
 
-    /**
-     * Retorna o ID do status caso passem o nome do status.
-     *
-     * @param  int|string $key ID ou o nome do status.
-     * @return array
-     */
-    public function parseStatusKey($key)
-    {
-    	if(is_int($key))
-    		return ['status' => $key];
+	/**
+	 * Retorna o ID do status caso passem o nome do status.
+	 *
+	 * @param  int|string $key ID ou o nome do status.
+	 * @return array
+	 */
+	public function parseStatusKey($key)
+	{
+		if(is_int($key))
+			return ['status' => $key];
 
-    	$status = ScheduleStatus::where('name', $key)->first();
+		$status = ScheduleStatus::where('name', $key)->first();
 
-    	if(is_null($status))
-    		throw (new ModelNotFound)->setValues(ScheduleStatus::class);
+		if(is_null($status))
+			throw (new ModelNotFound)->setValues(ScheduleStatus::class);
 
-    	return ['status' => $status->id];
-    }
+		return ['status' => $status->id];
+	}
 
-    /**
-     * Escopo de uma consulta que busca horarios pela data de início.
-     *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param mixed $start_at
-     * @return \Illuminate\Database\Eloquent\Builder
-     */
-    public function scopeByStartAt($query, $start_at)
-    {
-        return $query->where('start_at', $start_at);
-    }
+	/**
+	 * Escopo de uma consulta que busca horarios pela data de início.
+	 *
+	 * @param \Illuminate\Database\Eloquent\Builder $query
+	 * @param mixed $start_at
+	 * @return \Illuminate\Database\Eloquent\Builder
+	 */
+	public function scopeByStartAt($query, $start_at)
+	{
+		return $query->where('start_at', $start_at);
+	}
 }
\ No newline at end of file

src/Scheduler/Migrations/2018_08_12_000000_create_schedule_status_table.php.php

Indentation +24 added lines, -24 removed lines

@@ -15,29 +15,29 @@
 
 class CreateScheduleStatusTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create(Config::get('scheduler.schedule_status_table'), function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name')->unique();
-            $table->text('description')->nullable();
-            $table->timestamps();
-            $table->softDeletes();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create(Config::get('scheduler.schedule_status_table'), function (Blueprint $table) {
+			$table->increments('id');
+			$table->string('name')->unique();
+			$table->text('description')->nullable();
+			$table->timestamps();
+			$table->softDeletes();
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::drop(Config::get('scheduler.schedule_status_table'));
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop(Config::get('scheduler.schedule_status_table'));
+	}
 }
\ No newline at end of file

src/Scheduler/Migrations/2018_08_12_000000_create_schedules_table.php

Indentation +27 added lines, -27 removed lines

@@ -15,32 +15,32 @@
 
 class CreateSchedulesTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create(Config::get('scheduler.schedules_table'), function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('model_type');
-            $table->integer('model_id');
-            $table->timestamp('start_at');
-            $table->timestamp('end_at')->nullable();
-            $table->integer('status')->nullable();
-            $table->timestamps();
-            $table->softDeletes();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create(Config::get('scheduler.schedules_table'), function (Blueprint $table) {
+			$table->increments('id');
+			$table->string('model_type');
+			$table->integer('model_id');
+			$table->timestamp('start_at');
+			$table->timestamp('end_at')->nullable();
+			$table->integer('status')->nullable();
+			$table->timestamps();
+			$table->softDeletes();
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::drop(Config::get('scheduler.schedules_table'));
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop(Config::get('scheduler.schedules_table'));
+	}
 }
\ No newline at end of file

src/Scheduler/SchedulerServiceProvider.php

Indentation +46 added lines, -46 removed lines

@@ -12,50 +12,50 @@
 
 class SchedulerServiceProvider extends ServiceProvider
 {
-    /**
-     * Perform post-registration booting of services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->publishes([
-            __DIR__.'/../config/config.php' => config_path('scheduler.php'),
-        ]);
-
-        $this->loadMigrationsFrom(__DIR__.'/Migrations');
-        $this->loadTranslationsFrom(__DIR__.'/Translations', 'scheduler');
-
-        $this->publishes([
-            __DIR__.'/Translations' => resource_path('lang/vendor/scheduler'),
-        ]);
-    }
-
-    /**
-     * Register the application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->singleton(Scheduler::class, function ($app) {
-            return new Scheduler($app);
-        });
-
-        $this->app->alias(Scheduler::class, 'scheduler');
-
-        $this->mergeConfig();
-    }
-
-    /**
-     * Mescla configurações do usuário com as configurações do Scheduler.
-     *
-     * @return void
-     */
-    private function mergeConfig()
-    {
-        $this->mergeConfigFrom(
-            __DIR__.'/../config/config.php', 'scheduler'
-        );
-    }
+	/**
+	 * Perform post-registration booting of services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->publishes([
+			__DIR__.'/../config/config.php' => config_path('scheduler.php'),
+		]);
+
+		$this->loadMigrationsFrom(__DIR__.'/Migrations');
+		$this->loadTranslationsFrom(__DIR__.'/Translations', 'scheduler');
+
+		$this->publishes([
+			__DIR__.'/Translations' => resource_path('lang/vendor/scheduler'),
+		]);
+	}
+
+	/**
+	 * Register the application services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->app->singleton(Scheduler::class, function ($app) {
+			return new Scheduler($app);
+		});
+
+		$this->app->alias(Scheduler::class, 'scheduler');
+
+		$this->mergeConfig();
+	}
+
+	/**
+	 * Mescla configurações do usuário com as configurações do Scheduler.
+	 *
+	 * @return void
+	 */
+	private function mergeConfig()
+	{
+		$this->mergeConfigFrom(
+			__DIR__.'/../config/config.php', 'scheduler'
+		);
+	}
 }
\ No newline at end of file

src/Scheduler/Contracts/SchedulerModelTrait.php

Indentation +16 added lines, -16 removed lines

@@ -11,28 +11,28 @@
 interface SchedulerModelInterface
 {
 	/**
-     * Define an inverse one-to-one or many relationship.
-     *
-     * @param  string  $related
-     * @param  string  $foreignKey
-     * @param  string  $ownerKey
-     * @param  string  $relation
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
+	 * Define an inverse one-to-one or many relationship.
+	 *
+	 * @param  string  $related
+	 * @param  string  $foreignKey
+	 * @param  string  $ownerKey
+	 * @param  string  $relation
+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+	 */
 	abstract public function belongsTo($related, $foreignKey = null, $ownerKey = null, $relation = null);
 
 	/**
-     * Get the value of the model's primary key.
-     *
-     * @return mixed
-     */
+	 * Get the value of the model's primary key.
+	 *
+	 * @return mixed
+	 */
 	abstract public function getKey();
 
 	/**
-     * Retorna apenas os horários que possuem o mesmo [model_type] do [parent] dessa [trait].
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
+	 * Retorna apenas os horários que possuem o mesmo [model_type] do [parent] dessa [trait].
+	 *
+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+	 */
 	public function schedules();
 
 	/**

src/Scheduler/Models/ScheduleStatus.php

Indentation +24 added lines, -24 removed lines

@@ -14,33 +14,33 @@
 
 class ScheduleStatus extends Model
 {
-    use SoftDeletes;
+	use SoftDeletes;
 
 	/**
-     * Os atributos que podem ser atribuíveis em massa.
-     *
-     * @var array
-     */
-    protected $fillable = [
-    	'name', 'description'
-    ];
+	 * Os atributos que podem ser atribuíveis em massa.
+	 *
+	 * @var array
+	 */
+	protected $fillable = [
+		'name', 'description'
+	];
 
-    /**
-     * Os atributos que devem ser transformados para data.
-     *
-     * @var array
-     */
-    protected $dates = [
-    	'deleted_at'
-    ];
+	/**
+	 * Os atributos que devem ser transformados para data.
+	 *
+	 * @var array
+	 */
+	protected $dates = [
+		'deleted_at'
+	];
 
-    /**
-     * Construtor para inicilizar a váriavel table.
-     */
-    public function __construct(array $attributes = [])
-    {
-        parent::__construct($attributes);
+	/**
+	 * Construtor para inicilizar a váriavel table.
+	 */
+	public function __construct(array $attributes = [])
+	{
+		parent::__construct($attributes);
 
-        $this->table = Config::get('scheduler.schedule_status_table');
-    }
+		$this->table = Config::get('scheduler.schedule_status_table');
+	}
 }
\ No newline at end of file

src/Scheduler/Facades/Scheduler.php

Indentation +9 added lines, -9 removed lines

@@ -19,13 +19,13 @@
  */
 class Scheduler extends Facade
 {
-    /**
-     * Get the registered name of the component.
-     *
-     * @return string
-     */
-    protected static function getFacadeAccessor()
-    {
-        return 'scheduler';
-    }
+	/**
+	 * Get the registered name of the component.
+	 *
+	 * @return string
+	 */
+	protected static function getFacadeAccessor()
+	{
+		return 'scheduler';
+	}
 }
\ No newline at end of file

src/Scheduler/Scheduler.php

Indentation +103 added lines, -103 removed lines

@@ -14,107 +14,107 @@
 
 class Scheduler
 {
-    /**
-     * Laravel application
-     *
-     * @var \Illuminate\Foundation\Application
-     */
-    public $app;
-
-    /**
-     * Create a new confide instance.
-     *
-     * @param \Illuminate\Foundation\Application $app
-     *
-     * @return void
-     */
-    public function __construct($app)
-    {
-        $this->app = $app;
-    }
-
-    /**
-     * Escopo de uma consulta que busca horarios pela data de início.
-     *
-     * @param string|\Carbon\Carbon $start_at
-     * @param string|\Carbon\Carbon $end_at
-     * @return bool
-     */
-    public function hasScheduleBetween($model_type, $start_at, $end_at)
-    {
-        if(!Config::get('scheduler.enable_schedule_conflict'))
-            return false;
-
-        return !is_null(
-            Schedule::latest()
-                ->where('model_type', $model_type)
-                ->where('start_at', '>=', $start_at)
-                ->where('end_at', '<=', $end_at)
-                ->first()
-        );
-    }
-
-    /**
-     * Retorna os horários disponiveis hoje para uma determinada model.
-     * .
-     * @param  string  $model_type Tipo da model
-     * @param  int    $duration Serve para facilitar na hora de buscar horários livres
-     *                          que precisem ter uma certa duração.
-     * @return array
-     */
-    public function availableToday($model_type, $duration)
-    {
-        return $this->availableOn($model_type, Carbon::now(), $duration);
-    }
-
-    /**
-     * Retorna os horários disponiveis em um determinado dia para uma certa model.
-     *
-     * @param  string  $model_type Tipo da model
-     * @param  string|\Carbon\Carbon $today Data para o qual ele irá fazer a busca.
-     * @param  int    $durationMinutes Serve para facilitar na hora de buscar horários livres
-     *                          que precisem ter uma certa duração.
-     * @return array
-     */
-    public function availableOn($model_type, $today, $durationMinutes)
-    {
-        $openingTime = Carbon::parse(Config::get('scheduler.opening_time'))->setDateFrom($today);
-        $closingTime = Carbon::parse(Config::get('scheduler.closing_time'))->setDateFrom($today);
-
-        $livres = [];
-        $today = Carbon::parse($today->toDateString());
-        while($openingTime <= $closingTime)
-        {
-            $add = true;
-
-            foreach (Schedule::orderBy('start_at', 'DESC')->cursor() as $schedule) {
-            	if($schedule->model_type != $model_type)
-            		continue;
-
-                $start = Carbon::parse($schedule->start_at);
-                $begin = Carbon::parse($start->toDateString());
-
-                if($begin->greaterThan($today))
-                    break;
-
-                if($begin->notEqualTo($today))
-                    continue;
-
-                $end = Carbon::parse($schedule->end_at);
-                if($start <= Carbon::parse($openingTime->toDateTimeString())
-                && $end >= Carbon::parse($openingTime->toDateTimeString())->addMinutes($durationMinutes))
-                    $add = false;
-            }
-
-            if($add)
-                $livres[] = [
-                    'start_at' => Carbon::parse($openingTime->toDateTimeString()),
-                    'end_at' => Carbon::parse($openingTime->toDateTimeString())->addMinutes($durationMinutes)
-                ];
-
-            $openingTime->addMinutes($durationMinutes);
-        }
-
-        return $livres;
-    }
+	/**
+	 * Laravel application
+	 *
+	 * @var \Illuminate\Foundation\Application
+	 */
+	public $app;
+
+	/**
+	 * Create a new confide instance.
+	 *
+	 * @param \Illuminate\Foundation\Application $app
+	 *
+	 * @return void
+	 */
+	public function __construct($app)
+	{
+		$this->app = $app;
+	}
+
+	/**
+	 * Escopo de uma consulta que busca horarios pela data de início.
+	 *
+	 * @param string|\Carbon\Carbon $start_at
+	 * @param string|\Carbon\Carbon $end_at
+	 * @return bool
+	 */
+	public function hasScheduleBetween($model_type, $start_at, $end_at)
+	{
+		if(!Config::get('scheduler.enable_schedule_conflict'))
+			return false;
+
+		return !is_null(
+			Schedule::latest()
+				->where('model_type', $model_type)
+				->where('start_at', '>=', $start_at)
+				->where('end_at', '<=', $end_at)
+				->first()
+		);
+	}
+
+	/**
+	 * Retorna os horários disponiveis hoje para uma determinada model.
+	 * .
+	 * @param  string  $model_type Tipo da model
+	 * @param  int    $duration Serve para facilitar na hora de buscar horários livres
+	 *                          que precisem ter uma certa duração.
+	 * @return array
+	 */
+	public function availableToday($model_type, $duration)
+	{
+		return $this->availableOn($model_type, Carbon::now(), $duration);
+	}
+
+	/**
+	 * Retorna os horários disponiveis em um determinado dia para uma certa model.
+	 *
+	 * @param  string  $model_type Tipo da model
+	 * @param  string|\Carbon\Carbon $today Data para o qual ele irá fazer a busca.
+	 * @param  int    $durationMinutes Serve para facilitar na hora de buscar horários livres
+	 *                          que precisem ter uma certa duração.
+	 * @return array
+	 */
+	public function availableOn($model_type, $today, $durationMinutes)
+	{
+		$openingTime = Carbon::parse(Config::get('scheduler.opening_time'))->setDateFrom($today);
+		$closingTime = Carbon::parse(Config::get('scheduler.closing_time'))->setDateFrom($today);
+
+		$livres = [];
+		$today = Carbon::parse($today->toDateString());
+		while($openingTime <= $closingTime)
+		{
+			$add = true;
+
+			foreach (Schedule::orderBy('start_at', 'DESC')->cursor() as $schedule) {
+				if($schedule->model_type != $model_type)
+					continue;
+
+				$start = Carbon::parse($schedule->start_at);
+				$begin = Carbon::parse($start->toDateString());
+
+				if($begin->greaterThan($today))
+					break;
+
+				if($begin->notEqualTo($today))
+					continue;
+
+				$end = Carbon::parse($schedule->end_at);
+				if($start <= Carbon::parse($openingTime->toDateTimeString())
+				&& $end >= Carbon::parse($openingTime->toDateTimeString())->addMinutes($durationMinutes))
+					$add = false;
+			}
+
+			if($add)
+				$livres[] = [
+					'start_at' => Carbon::parse($openingTime->toDateTimeString()),
+					'end_at' => Carbon::parse($openingTime->toDateTimeString())->addMinutes($durationMinutes)
+				];
+
+			$openingTime->addMinutes($durationMinutes);
+		}
+
+		return $livres;
+	}
 }
\ No newline at end of file

Braces +18 added lines, -12 removed lines

@@ -42,8 +42,9 @@ 
      */
     public function hasScheduleBetween($model_type, $start_at, $end_at)
     {
-        if(!Config::get('scheduler.enable_schedule_conflict'))
-            return false;
+        if(!Config::get('scheduler.enable_schedule_conflict')) {
+                    return false;
+        }
 
         return !is_null(
             Schedule::latest()
@@ -88,29 +89,34 @@ 
             $add = true;
 
             foreach (Schedule::orderBy('start_at', 'DESC')->cursor() as $schedule) {
-            	if($schedule->model_type != $model_type)
-            		continue;
+            	if($schedule->model_type != $model_type) {
+            	            		continue;
+            	}
 
                 $start = Carbon::parse($schedule->start_at);
                 $begin = Carbon::parse($start->toDateString());
 
-                if($begin->greaterThan($today))
-                    break;
+                if($begin->greaterThan($today)) {
+                                    break;
+                }
 
-                if($begin->notEqualTo($today))
-                    continue;
+                if($begin->notEqualTo($today)) {
+                                    continue;
+                }
 
                 $end = Carbon::parse($schedule->end_at);
                 if($start <= Carbon::parse($openingTime->toDateTimeString())
-                && $end >= Carbon::parse($openingTime->toDateTimeString())->addMinutes($durationMinutes))
-                    $add = false;
+                && $end >= Carbon::parse($openingTime->toDateTimeString())->addMinutes($durationMinutes)) {
+                                    $add = false;
+                }
             }
 
-            if($add)
-                $livres[] = [
+            if($add) {
+                            $livres[] = [
                     'start_at' => Carbon::parse($openingTime->toDateTimeString()),
                     'end_at' => Carbon::parse($openingTime->toDateTimeString())->addMinutes($durationMinutes)
                 ];
+            }
 
             $openingTime->addMinutes($durationMinutes);
         }