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

#63 - permissions (#67)

Browse Source 
* wip

* fix

* wip

* #63 - permissions

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
This commit is contained in:
Adrian Hopek
2022-03-02 09:52:50 +01:00
committed by GitHub
parent 5cb46d2fc4
commit d825dd727f
47 changed files with 1027 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Eloquent/Models/VacationRequest.php
View File

@@ -12,8 +12,9 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
use Toby\Domain\Enums\VacationRequestState;
use Spatie\ModelStates\HasStates;
use Toby\Domain\Enums\VacationType;
use Toby\Domain\States\VacationRequest\VacationRequestState;
/**
* @property int $id
@@ -34,6 +35,7 @@ use Toby\Domain\Enums\VacationType;
class VacationRequest extends Model
{
use HasFactory;
use HasStates;
protected $guarded = [];
@@ -69,26 +71,14 @@ class VacationRequest extends Model
return $this->hasMany(Vacation::class);
}
public function changeStateTo(VacationRequestState $state): void
public function scopeStates(Builder $query, VacationRequestState|array $states): Builder
{
$this->state = $state;
$this->save();
return $query->whereState("state", $states);
}
public function hasFlowSkipped(): bool
public function scopeNoStates(Builder $query, VacationRequestState|array $states): Builder
{
return $this->flow_skipped;
}
public function scopeStates(Builder $query, array $states): Builder
{
return $query->whereIn("state", $states);
}
public function scopeNoStates(Builder $query, array $states): Builder
{
return $query->whereNotIn("state", $states);
return $query->whereNotState("state", $states);
}
public function scopeOverlapsWith(Builder $query, self $vacationRequest): Builder
@@ -97,6 +87,11 @@ class VacationRequest extends Model
->where("to", ">=", $vacationRequest->from);
}
public function hasFlowSkipped(): bool
{
return $this->flow_skipped;
}
protected static function newFactory(): VacationRequestFactory
{
return VacationRequestFactory::new();

2
app/Eloquent/Models/VacationRequestActivity.php
View File

@@ -6,7 +6,7 @@ namespace Toby\Eloquent\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Toby\Domain\Enums\VacationRequestState;
use Toby\Domain\States\VacationRequest\VacationRequestState;
/**
* @property int $id

30
app/Eloquent/Observers/VacationRequestObserver.php
View File

@@ -6,9 +6,6 @@ namespace Toby\Eloquent\Observers;
use Illuminate\Contracts\Auth\Factory as Auth;
use Illuminate\Contracts\Events\Dispatcher;
use Toby\Domain\Enums\VacationRequestState;
use Toby\Domain\Events\VacationRequestStateChanged;
use Toby\Eloquent\Models\User;
use Toby\Eloquent\Models\VacationRequest;
class VacationRequestObserver
@@ -29,31 +26,4 @@ class VacationRequestObserver
$vacationRequest->name = "{$vacationRequestNumber}/${year}";
}
public function saved(VacationRequest $vacationRequest): void
{
if ($vacationRequest->isDirty("state")) {
$previousState = $vacationRequest->getOriginal("state");
$this->fireStateChangedEvent($vacationRequest, $previousState, $vacationRequest->state);
}
}
protected function fireStateChangedEvent(
VacationRequest $vacationRequest,
?VacationRequestState $from,
VacationRequestState $to,
): void {
$event = new VacationRequestStateChanged($vacationRequest, $from, $to, $this->getAuthUser());
$this->dispatcher->dispatch($event);
}
protected function getAuthUser(): ?User
{
/** @var User $user */
$user = $this->auth->guard()->user();
return $user;
}
}