kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

#23 - cr fix

Browse Source
This commit is contained in:
Adrian Hopek 2022-01-24 11:21:00 +01:00
parent 03af084c04
commit 36b98e1e67
13 changed files with 54 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Helpers/YearPeriodRetriever.php
View File

@ -4,16 +4,22 @@ declare(strict_types=1);
namespace Toby\Helpers;
use Illuminate\Contracts\Session\Session;
use Toby\Models\YearPeriod;
class YearPeriodRetriever
{
public const SESSION_KEY = "selected_year_period";
public function __construct(
protected Session $session,
) {
}
public function selected(): YearPeriod
{
/** @var YearPeriod $yearPeriod */
$yearPeriod = YearPeriod::query()->find(session()->get(static::SESSION_KEY));
$yearPeriod = YearPeriod::query()->find($this->session->get(static::SESSION_KEY));
return $yearPeriod !== null ? $yearPeriod : $this->current();
}

14
app/Http/Requests/VacationLimitRequest.php
View File

@ -15,8 +15,7 @@ class VacationLimitRequest extends FormRequest
return [
"items" => ["required", "array"],
"items.*.id" => ["required", "exists:vacation_limits,id"],
"items.*.hasVacation" => ["required", "boolean"],
"items.*.days" => ["exclude_if:items.*.hasVacation,false", "required", "integer", "min:0"],
"items.*.days" => ["nullable", "integer", "min:0"],
];
}
@ -25,13 +24,10 @@ class VacationLimitRequest extends FormRequest
return VacationLimit::query()->find($this->collect("items")->pluck("id"));
}
public function data(): Collection
public function data(): array
{
return $this->collect("items")->mapWithKeys(fn(array $item): array => [
$item["id"] => [
"has_vacation" => $item["hasVacation"],
"days" => $item["days"],
],
]);
return $this->collect("items")
->keyBy("id")
->toArray();
}
}

2
app/Http/Resources/UserFormDataResource.php
View File

@ -8,7 +8,7 @@ use Illuminate\Http\Resources\Json\JsonResource;
class UserFormDataResource extends JsonResource
{
public static $wrap = false;
public static $wrap = null;
public function toArray($request): array
{

4
app/Http/Resources/VacationLimitResource.php
View File

@ -8,14 +8,14 @@ use Illuminate\Http\Resources\Json\JsonResource;
class VacationLimitResource extends JsonResource
{
public static $wrap = false;
public static $wrap = null;
public function toArray($request): array
{
return [
"id" => $this->id,
"user" => new UserResource($this->user),
"hasVacation" => $this->has_vacation,
"hasVacation" => $this->hasVacation(),
"days" => $this->days,
];
}

8
app/Models/VacationLimit.php
View File

@ -12,7 +12,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
* @property int $id
* @property User $user
* @property YearPeriod $yearPeriod
* @property bool $has_vacation
* @property int $days
*/
class VacationLimit extends Model
@ -21,9 +20,10 @@ class VacationLimit extends Model
protected $guarded = [];
protected $casts = [
"has_vacation" => "boolean",
];
public function hasVacation(): bool
{
return $this->days !== null;
}
public function user(): BelongsTo
{

7
app/Providers/AppServiceProvider.php
View File

@ -6,20 +6,13 @@ namespace Toby\Providers;
use Illuminate\Support\Carbon;
use Illuminate\Support\ServiceProvider;
use Toby\Models\User;
use Toby\Models\VacationLimit;
use Toby\Models\YearPeriod;
use Toby\Observers\UserObserver;
use Toby\Observers\YearPeriodObserver;
use Toby\Scopes\SelectedYearPeriodScope;
class AppServiceProvider extends ServiceProvider
{
public function boot(): void
{
User::observe(UserObserver::class);
YearPeriod::observe(YearPeriodObserver::class);
Carbon::macro("toDisplayString", fn() => $this->translatedFormat("j F Y"));
VacationLimit::addGlobalScope($this->app->make(SelectedYearPeriodScope::class));

20
app/Providers/ObserverServiceProvider.php Normal file
View File

@ -0,0 +1,20 @@
<?php
declare(strict_types=1);
namespace Toby\Providers;
use Illuminate\Support\ServiceProvider;
use Toby\Models\User;
use Toby\Models\YearPeriod;
use Toby\Observers\UserObserver;
use Toby\Observers\YearPeriodObserver;
class ObserverServiceProvider extends ServiceProvider
{
public function boot(): void
{
User::observe(UserObserver::class);
YearPeriod::observe(YearPeriodObserver::class);
}
}

1
config/app.php
View File

@ -42,5 +42,6 @@ return [
Toby\Providers\EventServiceProvider::class,
Toby\Providers\RouteServiceProvider::class,
Toby\Providers\TelescopeServiceProvider::class,
Toby\Providers\ObserverServiceProvider::class,
],
];

1
database/migrations/2022_01_19_140630_create_vacation_limits_table.php
View File

@ -15,7 +15,6 @@ return new class() extends Migration {
$table->id();
$table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
$table->foreignIdFor(YearPeriod::class)->constrained()->cascadeOnDelete();
$table->boolean("has_vacation")->default(false);
$table->integer("days")->nullable();
$table->timestamps();
});

1
resources/js/Pages/VacationLimits.vue
View File

@ -162,7 +162,6 @@ export default {
.transform(data => ({
items: data.items.map(item => ({
id: item.id,
hasVacation: item.hasVacation,
days: item.hasVacation ? item.days : null,
})),
}))

17
tests/Feature/SelectYearPeriodTest.php
View File

@ -14,17 +14,25 @@ class SelectYearPeriodTest extends FeatureTestCase
{
use DatabaseMigrations;
protected YearPeriodRetriever $yearPeriodRetriever;
protected function setUp(): void
{
parent::setUp();
$this->yearPeriodRetriever = $this->app->make(YearPeriodRetriever::class);
}
public function testUserCanSelectNextYearPeriod(): void
{
$nextYearPeriod = $this->createYearPeriod(Carbon::now()->year + 1);
$user = User::factory()->create();
$yearPeriodRetriever = new YearPeriodRetriever();
$this->actingAs($user)
->post("/year-periods/{$nextYearPeriod->id}/select")
->assertRedirect();
$this->assertSame($nextYearPeriod->id, $yearPeriodRetriever->selected()->id);
$this->assertSame($nextYearPeriod->id, $this->yearPeriodRetriever->selected()->id);
}
public function testUserCannotSelectNextYearPeriodIfDoesntExist(): void
@ -38,9 +46,8 @@ class SelectYearPeriodTest extends FeatureTestCase
public function testIfUserDoesntSelectAnyYearPeriodCurrentActsAsSelected(): void
{
$yearPeriodRetriever = new YearPeriodRetriever();
$currentYearPeriod = $yearPeriodRetriever->current();
$currentYearPeriod = $this->yearPeriodRetriever->current();
$this->assertSame($currentYearPeriod->id, $yearPeriodRetriever->selected()->id);
$this->assertSame($currentYearPeriod->id, $this->yearPeriodRetriever->selected()->id);
}
}

6
tests/Feature/VacationLimitTest.php
View File

@ -41,17 +41,14 @@ class VacationLimitTest extends FeatureTestCase
$data = [
[
"id" => $limit1->id,
"hasVacation" => true,
"days" => 25,
],
[
"id" => $limit2->id,
"hasVacation" => false,
"days" => null,
],
[
"id" => $limit3->id,
"hasVacation" => true,
"days" => 20,
],
];
@ -64,19 +61,16 @@ class VacationLimitTest extends FeatureTestCase
$this->assertDatabaseHas("vacation_limits", [
"id" => $limit1->id,
"has_vacation" => true,
"days" => 25,
]);
$this->assertDatabaseHas("vacation_limits", [
"id" => $limit2->id,
"has_vacation" => false,
"days" => null,
]);
$this->assertDatabaseHas("vacation_limits", [
"id" => $limit3->id,
"has_vacation" => true,
"days" => 20,
]);
}

4
tests/Unit/YearPeriodRetrieverTest.php
View File

@ -31,7 +31,7 @@ class YearPeriodRetrieverTest extends TestCase
$this->current = Carbon::now();
Carbon::setTestNow($this->current);
$this->yearPeriodRetriever = new YearPeriodRetriever();
$this->yearPeriodRetriever = $this->app->make(YearPeriodRetriever::class);
$this->previousYearPeriod = $this->createYearPeriod($this->current->year - 1);
$this->currentYearPeriod = $this->createCurrentYearPeriod();
@ -43,7 +43,7 @@ class YearPeriodRetrieverTest extends TestCase
$this->assertSame($this->currentYearPeriod->id, $this->yearPeriodRetriever->current()->id);
}
public function testRetrievesCurrentYearPeriodWhenNoSelected(): void
public function testRetrievesCurrentYearPeriodWhenNoneIsSelected(): void
{
$this->clearSelectedYearPeriod();