Merge branch 'main' into directory-refactor

# Conflicts:
#	app/Architecture/Providers/AppServiceProvider.php
#	app/Eloquent/Observers/YearPeriodObserver.php
This commit is contained in:
Adrian Hopek
2022-01-26 08:58:57 +01:00
33 changed files with 979 additions and 55 deletions

View File

@@ -4,29 +4,34 @@ declare(strict_types=1);
namespace Toby\Eloquent\Models;
use Carbon\Carbon;
use Database\Factories\YearPeriodFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
/**
* @property int $id
* @property int $year
* @property Collection $vacationLimits
* @property Collection $holidays
*/
class YearPeriod extends Model
{
use HasFactory;
protected $fillable = [
"year",
];
protected $guarded = [];
public static function current(): ?static
{
return static::findByYear(Carbon::now()->year);
}
public static function findByYear(int $year): ?static
{
/** @var YearPeriod $year */
$year = static::query()->where("year", Carbon::now()->year)->first();
$year = static::query()->where("year", $year)->first();
return $year;
}
@@ -35,4 +40,14 @@ class YearPeriod extends Model
{
return $this->hasMany(VacationLimit::class);
}
public function holidays(): HasMany
{
return $this->hasMany(Holiday::class);
}
protected static function newFactory(): YearPeriodFactory
{
return YearPeriodFactory::new();
}
}