From 62fc1e1ca9403e1817e261bd6304a2c13b766772 Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Mon, 24 Jan 2022 10:23:08 +0100 Subject: [PATCH] #23 - ecs fix --- app/Helpers/YearPeriodRetriever.php | 2 +- app/Http/Middleware/HandleInertiaRequests.php | 5 ++-- app/Http/Requests/VacationLimitRequest.php | 3 +-- app/Observers/UserObserver.php | 4 +++- app/Observers/YearPeriodObserver.php | 4 +++- app/Scopes/SelectedYearPeriodScope.php | 7 +++--- ...19_140630_create_vacation_limits_table.php | 4 ++-- database/seeders/DatabaseSeeder.php | 23 ++++++++++++------- resources/js/Pages/VacationLimits.vue | 2 +- resources/js/Shared/MainMenu.vue | 2 +- tests/Feature/VacationLimitTest.php | 10 ++++---- tests/Traits/InteractsWithYearPeriods.php | 10 +++++--- tests/Unit/CheckYearPeriodTest.php | 1 - tests/Unit/YearPeriodRetrieverTest.php | 11 ++++----- 14 files changed, 51 insertions(+), 37 deletions(-) diff --git a/app/Helpers/YearPeriodRetriever.php b/app/Helpers/YearPeriodRetriever.php index 33c5723..15ee6f2 100644 --- a/app/Helpers/YearPeriodRetriever.php +++ b/app/Helpers/YearPeriodRetriever.php @@ -48,4 +48,4 @@ class YearPeriodRetriever "link" => route("year-periods.select", $yearPeriod->id), ]; } -} \ No newline at end of file +} diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php index 195dea9..dd63c51 100644 --- a/app/Http/Middleware/HandleInertiaRequests.php +++ b/app/Http/Middleware/HandleInertiaRequests.php @@ -11,8 +11,9 @@ use Toby\Http\Resources\UserResource; class HandleInertiaRequests extends Middleware { - public function __construct(protected YearPeriodRetriever $yearPeriodRetriever) - { + public function __construct( + protected YearPeriodRetriever $yearPeriodRetriever, + ) { } public function share(Request $request): array diff --git a/app/Http/Requests/VacationLimitRequest.php b/app/Http/Requests/VacationLimitRequest.php index eb03e12..a91ccfe 100644 --- a/app/Http/Requests/VacationLimitRequest.php +++ b/app/Http/Requests/VacationLimitRequest.php @@ -20,7 +20,6 @@ class VacationLimitRequest extends FormRequest ]; } - public function vacationLimits(): Collection { return VacationLimit::query()->find($this->collect("items")->pluck("id")); @@ -32,7 +31,7 @@ class VacationLimitRequest extends FormRequest $item["id"] => [ "has_vacation" => $item["hasVacation"], "days" => $item["days"], - ] + ], ]); } } diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php index 1aa109c..3462cdf 100644 --- a/app/Observers/UserObserver.php +++ b/app/Observers/UserObserver.php @@ -21,7 +21,9 @@ class UserObserver { $user->saveAvatar($this->generator->generateFor($user)); - $user->vacationLimits()->create(["year_period_id" => $this->yearPeriodRetriever->current()->id]); + $user->vacationLimits()->create([ + "year_period_id" => $this->yearPeriodRetriever->current()->id, + ]); } public function updating(User $user): void diff --git a/app/Observers/YearPeriodObserver.php b/app/Observers/YearPeriodObserver.php index 006e610..0b345d1 100644 --- a/app/Observers/YearPeriodObserver.php +++ b/app/Observers/YearPeriodObserver.php @@ -20,7 +20,9 @@ class YearPeriodObserver $users = User::all(); foreach ($users as $user) { - $yearPeriod->vacationLimits()->updateOrCreate(["user_id" => $user->id]); + $yearPeriod->vacationLimits()->updateOrCreate([ + "user_id" => $user->id, + ]); } } } diff --git a/app/Scopes/SelectedYearPeriodScope.php b/app/Scopes/SelectedYearPeriodScope.php index bc054b2..4d407fa 100644 --- a/app/Scopes/SelectedYearPeriodScope.php +++ b/app/Scopes/SelectedYearPeriodScope.php @@ -11,12 +11,13 @@ use Toby\Helpers\YearPeriodRetriever; class SelectedYearPeriodScope implements Scope { - public function __construct(protected YearPeriodRetriever $yearPeriodRetriever) - { + public function __construct( + protected YearPeriodRetriever $yearPeriodRetriever, + ) { } public function apply(Builder $builder, Model $model): Builder { return $builder->where("year_period_id", $this->yearPeriodRetriever->selected()->id); } -} \ No newline at end of file +} diff --git a/database/migrations/2022_01_19_140630_create_vacation_limits_table.php b/database/migrations/2022_01_19_140630_create_vacation_limits_table.php index eab4fdf..0447376 100644 --- a/database/migrations/2022_01_19_140630_create_vacation_limits_table.php +++ b/database/migrations/2022_01_19_140630_create_vacation_limits_table.php @@ -11,7 +11,7 @@ use Toby\Models\YearPeriod; return new class() extends Migration { public function up(): void { - Schema::create('vacation_limits', function (Blueprint $table): void { + Schema::create("vacation_limits", function (Blueprint $table): void { $table->id(); $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete(); $table->foreignIdFor(YearPeriod::class)->constrained()->cascadeOnDelete(); @@ -23,6 +23,6 @@ return new class() extends Migration { public function down(): void { - Schema::dropIfExists('vacation_limits'); + Schema::dropIfExists("vacation_limits"); } }; diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index c90c3ad..d6a4f27 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -14,8 +14,9 @@ use Toby\Models\YearPeriod; class DatabaseSeeder extends Seeder { - public function __construct(protected UserAvatarGenerator $avatarGenerator) - { + public function __construct( + protected UserAvatarGenerator $avatarGenerator, + ) { } public function run(): void @@ -23,7 +24,7 @@ class DatabaseSeeder extends Seeder User::unsetEventDispatcher(); YearPeriod::unsetEventDispatcher(); - User::factory(14)->create(); + User::factory(9)->create(); User::factory([ "email" => env("LOCAL_EMAIL_FOR_LOGIN_VIA_GOOGLE"), ])->create(); @@ -35,11 +36,17 @@ class DatabaseSeeder extends Seeder YearPeriod::factory() ->count(3) ->sequence( - ["year" => Carbon::now()->year - 1], - ["year" => Carbon::now()->year], - ["year" => Carbon::now()->year + 1], + [ + "year" => Carbon::now()->year - 1, + ], + [ + "year" => Carbon::now()->year, + ], + [ + "year" => Carbon::now()->year + 1, + ], ) - ->afterCreating(function (YearPeriod $yearPeriod) use ($users) { + ->afterCreating(function (YearPeriod $yearPeriod) use ($users): void { foreach ($users as $user) { VacationLimit::factory() ->for($yearPeriod) @@ -47,7 +54,7 @@ class DatabaseSeeder extends Seeder ->create(); } }) - ->create(); + ->create(); } protected function generateAvatarsForUsers(Collection $users): void diff --git a/resources/js/Pages/VacationLimits.vue b/resources/js/Pages/VacationLimits.vue index 0d36ad7..a07dbde 100644 --- a/resources/js/Pages/VacationLimits.vue +++ b/resources/js/Pages/VacationLimits.vue @@ -166,7 +166,7 @@ export default { days: item.hasVacation ? item.days : null, })), })) - .put('/vacation-days', { + .put('/vacation-limits', { preserveState: (page) => Object.keys(page.props.errors).length, preserveScroll: true, }); diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue index 5db4fbd..4966645 100644 --- a/resources/js/Shared/MainMenu.vue +++ b/resources/js/Shared/MainMenu.vue @@ -321,7 +321,7 @@ export default { const navigation = [ {name: 'Strona główna', href: '/', current: true}, {name: 'Użytkownicy', href: '/users', current: false}, - {name: 'Dostępne urlopy', href: '/vacation-days', current: false}, + {name: 'Dostępne urlopy', href: '/vacation-limits', current: false}, {name: 'Company Directory', href: '#', current: false}, {name: 'Openings', href: '#', current: false}, ]; diff --git a/tests/Feature/VacationLimitTest.php b/tests/Feature/VacationLimitTest.php index b566f2c..e1d2e5e 100644 --- a/tests/Feature/VacationLimitTest.php +++ b/tests/Feature/VacationLimitTest.php @@ -26,7 +26,7 @@ class VacationLimitTest extends FeatureTestCase ->assertInertia( fn(Assert $page) => $page ->component("VacationLimits") - ->has("limits.data", 10) + ->has("limits.data", 10), ); } @@ -58,14 +58,14 @@ class VacationLimitTest extends FeatureTestCase $this->actingAs($admin) ->put("/vacation-limits", [ - "items" => $data + "items" => $data, ]) ->assertRedirect(); $this->assertDatabaseHas("vacation_limits", [ - "id" => $limit1->id, - "has_vacation" => true, - "days" => 25, + "id" => $limit1->id, + "has_vacation" => true, + "days" => 25, ]); $this->assertDatabaseHas("vacation_limits", [ diff --git a/tests/Traits/InteractsWithYearPeriods.php b/tests/Traits/InteractsWithYearPeriods.php index fcafae6..fb74ab3 100644 --- a/tests/Traits/InteractsWithYearPeriods.php +++ b/tests/Traits/InteractsWithYearPeriods.php @@ -16,7 +16,9 @@ trait InteractsWithYearPeriods public function createYearPeriod(int $year): YearPeriod { /** @var YearPeriod $yearPeriod */ - $yearPeriod = YearPeriod::factory()->create(["year" => $year]); + $yearPeriod = YearPeriod::factory()->create([ + "year" => $year, + ]); return $yearPeriod; } @@ -28,7 +30,9 @@ trait InteractsWithYearPeriods public function markYearPeriodAsSelected(YearPeriod $yearPeriod): void { - $this->session([YearPeriodRetriever::SESSION_KEY => $yearPeriod->id]); + $this->session([ + YearPeriodRetriever::SESSION_KEY => $yearPeriod->id, + ]); } public function clearSelectedYearPeriod(): void @@ -42,4 +46,4 @@ trait InteractsWithYearPeriods YearPeriod::query()->delete(); } -} \ No newline at end of file +} diff --git a/tests/Unit/CheckYearPeriodTest.php b/tests/Unit/CheckYearPeriodTest.php index 6d5f5dc..b258e84 100644 --- a/tests/Unit/CheckYearPeriodTest.php +++ b/tests/Unit/CheckYearPeriodTest.php @@ -9,7 +9,6 @@ use Illuminate\Support\Carbon; use Tests\TestCase; use Tests\Traits\InteractsWithYearPeriods; use Toby\Jobs\CheckYearPeriod; -use Toby\Models\YearPeriod; class CheckYearPeriodTest extends TestCase { diff --git a/tests/Unit/YearPeriodRetrieverTest.php b/tests/Unit/YearPeriodRetrieverTest.php index 4f46df8..8d88104 100644 --- a/tests/Unit/YearPeriodRetrieverTest.php +++ b/tests/Unit/YearPeriodRetrieverTest.php @@ -24,7 +24,7 @@ class YearPeriodRetrieverTest extends TestCase public YearPeriod $nextYearPeriod; public YearPeriodRetriever $yearPeriodRetriever; - public function setUp(): void + protected function setUp(): void { parent::setUp(); @@ -64,20 +64,19 @@ class YearPeriodRetrieverTest extends TestCase "navigation" => [ [ "year" => $this->previousYearPeriod->year, - "link" => route("year-periods.select", $this->previousYearPeriod) + "link" => route("year-periods.select", $this->previousYearPeriod), ], [ "year" => $this->currentYearPeriod->year, - "link" => route("year-periods.select", $this->currentYearPeriod) + "link" => route("year-periods.select", $this->currentYearPeriod), ], [ "year" => $this->nextYearPeriod->year, - "link" => route("year-periods.select", $this->nextYearPeriod) + "link" => route("year-periods.select", $this->nextYearPeriod), ], - ] + ], ]; - $this->assertSame($expected, $this->yearPeriodRetriever->links()); } }