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

@@ -0,0 +1,23 @@
<?php
declare(strict_types=1);
namespace Database\Factories;
use Illuminate\Database\Eloquent\Factories\Factory;
use Toby\Eloquent\Models\Holiday;
use Toby\Eloquent\Models\YearPeriod;
class HolidayFactory extends Factory
{
protected $model = Holiday::class;
public function definition(): array
{
return [
"name" => $this->faker->word,
"date" => $this->faker->unique->date,
"year_period_id" => YearPeriod::current()->id,
];
}
}

View File

@@ -5,11 +5,15 @@ declare(strict_types=1);
namespace Database\Factories;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Carbon;
use Illuminate\Support\Str;
use Toby\Enums\EmploymentForm;
use Toby\Domain\EmploymentForm;
use Toby\Eloquent\Models\User;
class UserFactory extends Factory
{
protected $model = User::class;
public function definition(): array
{
return [
@@ -17,7 +21,7 @@ class UserFactory extends Factory
"last_name" => $this->faker->lastName(),
"email" => $this->faker->unique()->safeEmail(),
"employment_form" => $this->faker->randomElement(EmploymentForm::cases()),
"employment_date" => $this->faker->dateTimeBetween("2020-10-27"),
"employment_date" => Carbon::createFromInterface($this->faker->dateTimeBetween("2020-10-27"))->toDateString(),
"remember_token" => Str::random(10),
];
}

View File

@@ -5,11 +5,14 @@ declare(strict_types=1);
namespace Database\Factories;
use Illuminate\Database\Eloquent\Factories\Factory;
use Toby\Models\User;
use Toby\Models\YearPeriod;
use Toby\Eloquent\Models\User;
use Toby\Eloquent\Models\VacationLimit;
use Toby\Eloquent\Models\YearPeriod;
class VacationLimitFactory extends Factory
{
protected $model = VacationLimit::class;
public function definition(): array
{
$hasVacation = $this->faker->boolean(75);

View File

@@ -5,13 +5,16 @@ declare(strict_types=1);
namespace Database\Factories;
use Illuminate\Database\Eloquent\Factories\Factory;
use Toby\Eloquent\Models\YearPeriod;
class YearPeriodFactory extends Factory
{
protected $model = YearPeriod::class;
public function definition(): array
{
return [
"year" => $this->faker->unique()->year,
"year" => (int)$this->faker->unique()->year,
];
}
}