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

#90 - wip

Browse Source
This commit is contained in:
Adrian Hopek
2022-04-08 12:42:24 +02:00
parent 4af0482a93
commit 6506855bba
50 changed files with 581 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Architecture/ExceptionHandler.php
View File

@@ -21,7 +21,15 @@ class ExceptionHandler extends Handler
{
$response = parent::render($request, $e);
if (app()->environment("production") && in_array($response->status(), [500, 503, 429, 419, 404, 403, 401], true)) {
if (! app()->environment("production")) {
return $response;
}
if ($response->status() === 405) {
$response->setStatusCode(404);
}
if (in_array($response->status(), [500, 503, 429, 419, 404, 403, 401], true)) {
return Inertia::render("Error", [
"status" => $response->status(),
])

6
app/Domain/Actions/CreateUserAction.php
View File

@@ -9,12 +9,14 @@ use Toby\Eloquent\Models\YearPeriod;
class CreateUserAction
{
public function execute(array $data): User
public function execute(array $userData, array $profileData): User
{
$user = new User($data);
$user = new User($userData);
$user->save();
$user->profile()->create($profileData);
$this->createVacationLimitsFor($user);
return $user;

19
app/Domain/Actions/UpdateUserAction.php Normal file
View File

@@ -0,0 +1,19 @@
<?php
declare(strict_types=1);
namespace Toby\Domain\Actions;
use Toby\Eloquent\Models\User;
class UpdateUserAction
{
public function execute(User $user, array $userData, array $profileData): User
{
$user->update($userData);
$user->profile->update($profileData);
return $user;
}
}

2
app/Domain/Notifications/VacationRequestCreatedNotification.php
View File

@@ -39,7 +39,7 @@ class VacationRequestCreatedNotification extends Notification
protected function buildMailMessage(string $url): MailMessage
{
$user = $this->vacationRequest->user->first_name;
$user = $this->vacationRequest->user->profile->first_name;
$type = $this->vacationRequest->type->label();
$from = $this->vacationRequest->from->toDisplayString();
$to = $this->vacationRequest->to->toDisplayString();

4
app/Domain/Notifications/VacationRequestStatusChangedNotification.php
View File

@@ -42,14 +42,14 @@ class VacationRequestStatusChangedNotification extends Notification
protected function buildMailMessage(string $url): MailMessage
{
$user = $this->user->first_name;
$user = $this->user - profile->first_name;
$title = $this->vacationRequest->name;
$type = $this->vacationRequest->type->label();
$status = $this->vacationRequest->state->label();
$from = $this->vacationRequest->from->toDisplayString();
$to = $this->vacationRequest->to->toDisplayString();
$days = $this->vacationRequest->vacations()->count();
$requester = $this->vacationRequest->user->fullName;
$requester = $this->vacationRequest->user->profile->fullName;
return (new MailMessage())
->greeting(__("Hi :user!", [

4
app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php
View File

@@ -43,7 +43,7 @@ class VacationRequestWaitsForApprovalNotification extends Notification
protected function buildMailMessage(string $url): MailMessage
{
$user = $this->user->first_name;
$user = $this->user->profile->first_name;
$type = $this->vacationRequest->type->label();
$from = $this->vacationRequest->from->toDisplayString();
$to = $this->vacationRequest->to->toDisplayString();
@@ -84,7 +84,7 @@ class VacationRequestWaitsForApprovalNotification extends Notification
protected function buildDescription(): string
{
$title = $this->vacationRequest->name;
$requester = $this->vacationRequest->user->fullName;
$requester = $this->vacationRequest->user->profile->fullName;
if ($this->vacationRequest->state->equals(WaitingForTechnical::class)) {
return __("The vacation request :title from user :requester is waiting for your technical approval.", [

2
app/Domain/TimesheetPerUserSheet.php
View File

@@ -46,7 +46,7 @@ class TimesheetPerUserSheet implements WithTitle, WithHeadings, WithEvents, With
public function title(): string
{
return $this->user->fullName;
return $this->user->profile->fullName;
}
public function headings(): array

8
app/Eloquent/Helpers/YearPeriodRetriever.php
View File

@@ -33,7 +33,8 @@ class YearPeriodRetriever
$selected = $this->selected();
$current = $this->current();
$years = YearPeriod::query()->whereIn("year", $this->offset($selected->year))->get();
$years = YearPeriod::all();
$navigation = $years->map(fn(YearPeriod $yearPeriod) => $this->toNavigation($yearPeriod));
return [
@@ -43,11 +44,6 @@ class YearPeriodRetriever
];
}
protected function offset(int $year): array
{
return range($year - 2, $year + 2);
}
protected function toNavigation(YearPeriod $yearPeriod): array
{
return [

63
app/Eloquent/Models/Profile.php Normal file
View File

@@ -0,0 +1,63 @@
<?php
declare(strict_types=1);
namespace Toby\Eloquent\Models;
use Database\Factories\ProfileFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Carbon;
use Rackbeat\UIAvatars\HasAvatar;
use Toby\Domain\Enums\EmploymentForm;
use Toby\Eloquent\Helpers\ColorGenerator;
/**
* @property string $first_name
* @property string $last_name
* @property string $position
* @property EmploymentForm $employment_form
* @property Carbon $employment_date
*/
class Profile extends Model
{
use HasFactory;
use HasAvatar;
protected $primaryKey = "user_id";
protected $guarded = [];
protected $casts = [
"employment_form" => EmploymentForm::class,
"employment_date" => "date",
];
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
public function getAvatar(): string
{
return $this->getAvatarGenerator()
->backgroundColor(ColorGenerator::generate($this->fullName))
->image();
}
public function getFullNameAttribute(): string
{
return "{$this->first_name} {$this->last_name}";
}
protected function getAvatarName(): string
{
return mb_substr($this->first_name, 0, 1) . mb_substr($this->last_name, 0, 1);
}
protected static function newFactory(): ProfileFactory
{
return ProfileFactory::new();
}
}

56
app/Eloquent/Models/User.php
View File

@@ -8,27 +8,20 @@ use Database\Factories\UserFactory;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
use Rackbeat\UIAvatars\HasAvatar;
use Toby\Domain\Enums\EmploymentForm;
use Toby\Domain\Enums\Role;
use Toby\Eloquent\Helpers\ColorGenerator;
/**
* @property int $id
* @property string $first_name
* @property string $last_name
* @property string $email
* @property string $password
* @property string $avatar
* @property string $position
* @property Role $role
* @property EmploymentForm $employment_form
* @property Carbon $employment_date
* @property Profile $profile
* @property Collection $vacationLimits
* @property Collection $vacationRequests
* @property Collection $vacations
@@ -38,12 +31,12 @@ class User extends Authenticatable
use HasFactory;
use Notifiable;
use SoftDeletes;
use HasAvatar;
protected $guarded = [];
protected $casts = [
"role" => Role::class,
"last_active_at" => "datetime",
"employment_form" => EmploymentForm::class,
"employment_date" => "date",
];
@@ -52,6 +45,15 @@ class User extends Authenticatable
"remember_token",
];
protected $with = [
"profile",
];
public function profile(): HasOne
{
return $this->hasOne(Profile::class);
}
public function vacationLimits(): HasMany
{
return $this->hasMany(VacationLimit::class);
@@ -72,18 +74,6 @@ class User extends Authenticatable
return $this->hasMany(Vacation::class);
}
public function getAvatar(): string
{
return $this->getAvatarGenerator()
->backgroundColor(ColorGenerator::generate($this->fullName))
->image();
}
public function getFullNameAttribute(): string
{
return "{$this->first_name} {$this->last_name}";
}
public function hasRole(Role $role): bool
{
return $this->role === $role;
@@ -104,9 +94,20 @@ class User extends Authenticatable
}
return $query
->where("first_name", "ILIKE", "%{$text}%")
->orWhere("last_name", "ILIKE", "%{$text}%")
->orWhere("email", "ILIKE", "%{$text}%");
->where("email", "ILIKE", "%{$text}%")
->orWhereRelation(
"profile",
fn(Builder $query) => $query
->where("first_name", "ILIKE", "%{$text}%")
->orWhere("last_name", "ILIKE", "%{$text}%"),
);
}
public function scopeOrderByProfileField(Builder $query, string $field): Builder
{
$profileQuery = Profile::query()->select($field)->whereColumn("users.id", "profiles.user_id");
return $query->orderBy($profileQuery);
}
public function scopeWithVacationLimitIn(Builder $query, YearPeriod $yearPeriod): Builder
@@ -119,11 +120,6 @@ class User extends Authenticatable
);
}
protected function getAvatarName(): string
{
return mb_substr($this->first_name, 0, 1) . mb_substr($this->last_name, 0, 1);
}
protected static function newFactory(): UserFactory
{
return UserFactory::new();

8
app/Eloquent/Models/VacationLimit.php
View File

@@ -5,7 +5,6 @@ declare(strict_types=1);
namespace Toby\Eloquent\Models;
use Database\Factories\VacationLimitFactory;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -37,13 +36,6 @@ class VacationLimit extends Model
return $this->belongsTo(YearPeriod::class);
}
public function scopeOrderByUserField(Builder $query, string $field): Builder
{
$userQuery = User::query()->select($field)->whereColumn("vacation_limits.user_id", "users.id");
return $query->orderBy($userQuery);
}
protected static function newFactory(): VacationLimitFactory
{
return VacationLimitFactory::new();

2
app/Infrastructure/Http/Controllers/Api/GetAvailableVacationTypesController.php
View File

@@ -21,7 +21,7 @@ class GetAvailableVacationTypesController extends Controller
$user = User::query()->find($request->get("user"));
$types = VacationType::all()
->filter(fn(VacationType $type) => $configRetriever->isAvailableFor($type, $user->employment_form))
->filter(fn(VacationType $type) => $configRetriever->isAvailableFor($type, $user->profile->employment_form))
->map(fn(VacationType $type) => [
"label" => $type->label(),
"value" => $type->value,

18
app/Infrastructure/Http/Controllers/DashboardController.php
View File

@@ -9,21 +9,23 @@ use Illuminate\Support\Carbon;
use Inertia\Response;
use Toby\Domain\UserVacationStatsRetriever;
use Toby\Domain\VacationRequestStatesRetriever;
use Toby\Eloquent\Models\Holiday;
use Toby\Eloquent\Helpers\YearPeriodRetriever;
use Toby\Eloquent\Models\Vacation;
use Toby\Eloquent\Models\VacationRequest;
use Toby\Eloquent\Models\YearPeriod;
use Toby\Infrastructure\Http\Resources\AbsenceResource;
use Toby\Infrastructure\Http\Resources\HolidayResource;
use Toby\Infrastructure\Http\Resources\VacationRequestResource;
class DashboardController extends Controller
{
public function __invoke(Request $request, UserVacationStatsRetriever $vacationStatsRetriever): Response
{
public function __invoke(
Request $request,
YearPeriodRetriever $yearPeriodRetriever,
UserVacationStatsRetriever $vacationStatsRetriever
): Response {
$user = $request->user();
$now = Carbon::now();
$yearPeriod = YearPeriod::findByYear($now->year);
$yearPeriod = $yearPeriodRetriever->selected();
$absences = Vacation::query()
->with(["user", "vacationRequest"])
@@ -32,19 +34,21 @@ class DashboardController extends Controller
->get();
if ($user->can("listAll", VacationRequest::class)) {
$vacationRequests = VacationRequest::query()
$vacationRequests = $yearPeriod->vacationRequests()
->states(VacationRequestStatesRetriever::waitingForUserActionStates($user))
->latest("updated_at")
->limit(3)
->get();
} else {
$vacationRequests = $user->vacationRequests()
->whereBelongsTo($yearPeriod)
->latest("updated_at")
->limit(3)
->get();
}
$holidays = Holiday::query()
$holidays = $yearPeriod
->holidays()
->whereDate("date", ">=", $now)
->orderBy("date")
->limit(3)

8
app/Infrastructure/Http/Controllers/MonthlyUsageController.php
View File

@@ -10,7 +10,7 @@ use Toby\Domain\Enums\Month;
use Toby\Domain\UserVacationStatsRetriever;
use Toby\Eloquent\Helpers\YearPeriodRetriever;
use Toby\Eloquent\Models\User;
use Toby\Infrastructure\Http\Resources\UserResource;
use Toby\Infrastructure\Http\Resources\SimpleUserResource;
class MonthlyUsageController extends Controller
{
@@ -27,8 +27,8 @@ class MonthlyUsageController extends Controller
$users = User::query()
->withVacationLimitIn($currentYearPeriod)
->where("id", "!=", $currentUser->id)
->orderBy("last_name")
->orderBy("first_name")
->orderByProfileField("last_name")
->orderByProfileField("first_name")
->get();
if ($currentUser->hasVacationLimit($currentYearPeriod)) {
@@ -45,7 +45,7 @@ class MonthlyUsageController extends Controller
$remaining = $limit - $used - $pending;
$monthlyUsage[] = [
"user" => new UserResource($user),
"user" => new SimpleUserResource($user),
"months" => $vacationsByMonth,
"stats" => [
"used" => $used,

6
app/Infrastructure/Http/Controllers/TimesheetController.php
View File

@@ -28,9 +28,9 @@ class TimesheetController extends Controller
$carbonMonth = Carbon::create($yearPeriod->year, $month->toCarbonNumber());
$users = User::query()
->where("employment_form", EmploymentForm::EmploymentContract)
->orderBy("last_name")
->orderBy("first_name")
->whereRelation("profile", "employment_form", EmploymentForm::EmploymentContract)
->orderByProfileField("last_name")
->orderByProfileField("first_name")
->get();
$types = VacationType::all()

11
app/Infrastructure/Http/Controllers/UserController.php
View File

@@ -9,6 +9,7 @@ use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Inertia\Response;
use Toby\Domain\Actions\CreateUserAction;
use Toby\Domain\Actions\UpdateUserAction;
use Toby\Domain\Enums\EmploymentForm;
use Toby\Domain\Enums\Role;
use Toby\Eloquent\Models\User;
@@ -28,8 +29,8 @@ class UserController extends Controller
$users = User::query()
->withTrashed()
->search($request->query("search"))
->orderBy("last_name")
->orderBy("first_name")
->orderByProfileField("last_name")
->orderByProfileField("first_name")
->paginate()
->withQueryString();
@@ -59,7 +60,7 @@ class UserController extends Controller
{
$this->authorize("manageUsers");
$createUserAction->execute($request->data());
$createUserAction->execute($request->userData(), $request->profileData());
return redirect()
->route("users.index")
@@ -83,11 +84,11 @@ class UserController extends Controller
/**
* @throws AuthorizationException
*/
public function update(UserRequest $request, User $user): RedirectResponse
public function update(UserRequest $request, UpdateUserAction $updateUserAction, User $user): RedirectResponse
{
$this->authorize("manageUsers");
$user->update($request->data());
$updateUserAction->execute($user, $request->userData(), $request->profileData());
return redirect()
->route("users.index")

8
app/Infrastructure/Http/Controllers/VacationCalendarController.php
View File

@@ -11,7 +11,7 @@ use Toby\Domain\CalendarGenerator;
use Toby\Domain\Enums\Month;
use Toby\Eloquent\Helpers\YearPeriodRetriever;
use Toby\Eloquent\Models\User;
use Toby\Infrastructure\Http\Resources\UserResource;
use Toby\Infrastructure\Http\Resources\SimpleUserResource;
class VacationCalendarController extends Controller
{
@@ -29,8 +29,8 @@ class VacationCalendarController extends Controller
$users = User::query()
->where("id", "!=", $currentUser->id)
->orderBy("last_name")
->orderBy("first_name")
->orderByProfileField("last_name")
->orderByProfileField("first_name")
->get();
$users->prepend($currentUser);
@@ -41,7 +41,7 @@ class VacationCalendarController extends Controller
"calendar" => $calendar,
"current" => Month::current(),
"selected" => $month->value,
"users" => UserResource::collection($users),
"users" => SimpleUserResource::collection($users),
"can" => [
"generateTimesheet" => $request->user()->can("generateTimesheet"),
],

12
app/Infrastructure/Http/Controllers/VacationLimitController.php
View File

@@ -11,7 +11,7 @@ use Toby\Eloquent\Helpers\YearPeriodRetriever;
use Toby\Eloquent\Models\VacationLimit;
use Toby\Eloquent\Models\YearPeriod;
use Toby\Infrastructure\Http\Requests\VacationLimitRequest;
use Toby\Infrastructure\Http\Resources\UserResource;
use Toby\Infrastructure\Http\Resources\SimpleUserResource;
class VacationLimitController extends Controller
{
@@ -26,13 +26,15 @@ class VacationLimitController extends Controller
->vacationLimits()
->with("user")
->has("user")
->orderByUserField("last_name")
->orderByUserField("first_name")
->get();
->get()
->sortBy([
"last_name" => "asc",
"first_name" => "asc",
]);
$limitsResource = $limits->map(fn(VacationLimit $limit) => [
"id" => $limit->id,
"user" => new UserResource($limit->user),
"user" => new SimpleUserResource($limit->user),
"hasVacation" => $limit->hasVacation(),
"days" => $limit->days,
"remainingLastYear" => $previousYearPeriod

20
app/Infrastructure/Http/Controllers/VacationRequestController.php
View File

@@ -27,14 +27,18 @@ use Toby\Eloquent\Helpers\YearPeriodRetriever;
use Toby\Eloquent\Models\User;
use Toby\Eloquent\Models\VacationRequest;
use Toby\Infrastructure\Http\Requests\VacationRequestRequest;
use Toby\Infrastructure\Http\Resources\UserResource;
use Toby\Infrastructure\Http\Resources\SimpleUserResource;
use Toby\Infrastructure\Http\Resources\VacationRequestActivityResource;
use Toby\Infrastructure\Http\Resources\VacationRequestResource;
class VacationRequestController extends Controller
{
public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response
public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response|RedirectResponse
{
if ($request->user()->can("listAll", VacationRequest::class)) {
return redirect()->route("vacation.requests.indexForApprovers");
}
$status = $request->get("status", "all");
$vacationRequests = $request->user()
@@ -104,13 +108,13 @@ class VacationRequestController extends Controller
$users = User::query()
->withVacationLimitIn($yearPeriod)
->orderBy("last_name")
->orderBy("first_name")
->orderByProfileField("last_name")
->orderByProfileField("first_name")
->get();
return inertia("VacationRequest/IndexForApprovers", [
"requests" => VacationRequestResource::collection($vacationRequests),
"users" => UserResource::collection($users),
"users" => SimpleUserResource::collection($users),
"filters" => [
"status" => $status,
"user" => (int)$user,
@@ -159,13 +163,13 @@ class VacationRequestController extends Controller
public function create(Request $request): Response
{
$users = User::query()
->orderBy("last_name")
->orderBy("first_name")
->orderByProfileField("last_name")
->orderByProfileField("first_name")
->get();
return inertia("VacationRequest/Create", [
"vacationTypes" => VacationType::casesToSelect(),
"users" => UserResource::collection($users),
"users" => SimpleUserResource::collection($users),
"can" => [
"createOnBehalfOfEmployee" => $request->user()->can("createOnBehalfOfEmployee", VacationRequest::class),
"skipFlow" => $request->user()->can("skipFlow", VacationRequest::class),

12
app/Infrastructure/Http/Middleware/HandleInertiaRequests.php
View File

@@ -6,6 +6,7 @@ namespace Toby\Infrastructure\Http\Middleware;
use Illuminate\Http\Request;
use Inertia\Middleware;
use Toby\Domain\VacationRequestStatesRetriever;
use Toby\Eloquent\Helpers\YearPeriodRetriever;
use Toby\Eloquent\Models\VacationRequest;
use Toby\Infrastructure\Http\Resources\UserResource;
@@ -14,7 +15,8 @@ class HandleInertiaRequests extends Middleware
{
public function __construct(
protected YearPeriodRetriever $yearPeriodRetriever,
) {}
) {
}
public function share(Request $request): array
{
@@ -36,6 +38,14 @@ class HandleInertiaRequests extends Middleware
"info" => $request->session()->get("info"),
],
"years" => fn() => $user ? $this->yearPeriodRetriever->links() : [],
"vacationRequestsCount" => fn() => $user->can("listAll", VacationRequest::class)
? VacationRequest::query()
->whereBelongsTo($this->yearPeriodRetriever->selected())
->states(
VacationRequestStatesRetriever::waitingForUserActionStates($user),
)
->count()
: null
]);
}
}

21
app/Infrastructure/Http/Middleware/TrackUserLastActivity.php Normal file
View File

@@ -0,0 +1,21 @@
<?php
declare(strict_types=1);
namespace Toby\Infrastructure\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
class TrackUserLastActivity
{
public function handle(Request $request, Closure $next)
{
$request->user()?->update([
"last_active_at" => Carbon::now(),
]);
return $next($request);
}
}

12
app/Infrastructure/Http/Requests/UserRequest.php
View File

@@ -25,14 +25,20 @@ class UserRequest extends FormRequest
];
}
public function data(): array
public function userData(): array
{
return [
"email" => $this->get("email"),
"role" => $this->get("role"),
];
}
public function profileData(): array
{
return [
"first_name" => $this->get("firstName"),
"last_name" => $this->get("lastName"),
"email" => $this->get("email"),
"position" => $this->get("position"),
"role" => $this->get("role"),
"employment_form" => $this->get("employmentForm"),
"employment_date" => $this->get("employmentDate"),
];

2
app/Infrastructure/Http/Resources/AbsenceResource.php
View File

@@ -14,7 +14,7 @@ class AbsenceResource extends JsonResource
{
return [
"id" => $this->id,
"user" => new UserResource($this->user),
"user" => new SimpleUserResource($this->user),
"date" => $this->date->toDisplayString(),
];
}

1
app/Infrastructure/Http/Resources/HolidayResource.php
View File

@@ -16,6 +16,7 @@ class HolidayResource extends JsonResource
"id" => $this->id,
"name" => $this->name,
"date" => $this->date->toDateString(),
"isPast" => $this->date->isPast(),
"displayDate" => $this->date->toDisplayString(),
"dayOfWeek" => $this->date->dayName,
];

22
app/Infrastructure/Http/Resources/SimpleUserResource.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
declare(strict_types=1);
namespace Toby\Infrastructure\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
class SimpleUserResource extends JsonResource
{
public static $wrap = null;
public function toArray($request): array
{
return [
"id" => $this->id,
"name" => $this->profile->fullName,
"email" => $this->email,
"avatar" => $this->profile->getAvatar(),
];
}
}

10
app/Infrastructure/Http/Resources/UserFormDataResource.php
View File

@@ -14,13 +14,13 @@ class UserFormDataResource extends JsonResource
{
return [
"id" => $this->id,
"firstName" => $this->first_name,
"lastName" => $this->last_name,
"firstName" => $this->profile->first_name,
"lastName" => $this->profile->last_name,
"email" => $this->email,
"role" => $this->role,
"position" => $this->position,
"employmentForm" => $this->employment_form,
"employmentDate" => $this->employment_date->toDateString(),
"position" => $this->profile->position,
"employmentForm" => $this->profile->employment_form,
"employmentDate" => $this->profile->employment_date->toDateString(),
];
}
}

11
app/Infrastructure/Http/Resources/UserResource.php
View File

@@ -14,14 +14,15 @@ class UserResource extends JsonResource
{
return [
"id" => $this->id,
"name" => $this->fullName,
"name" => $this->profile->fullName,
"email" => $this->email,
"role" => $this->role->label(),
"position" => $this->position,
"avatar" => $this->getAvatar(),
"position" => $this->profile->position,
"avatar" => $this->profile->getAvatar(),
"deleted" => $this->trashed(),
"employmentForm" => $this->employment_form->label(),
"employmentDate" => $this->employment_date->toDisplayString(),
"lastActiveAt" => $this->last_active_at?->toDateTimeString(),
"employmentForm" => $this->profile->employment_form->label(),
"employmentDate" => $this->profile->employment_date->toDisplayString(),
];
}
}

2
app/Infrastructure/Http/Resources/VacationRequestActivityResource.php
View File

@@ -15,7 +15,7 @@ class VacationRequestActivityResource extends JsonResource
return [
"date" => $this->created_at->toDisplayString(),
"time" => $this->created_at->format("H:i"),
"user" => $this->user ? $this->user->fullName : __("System"),
"user" => $this->user ? $this->user->profile->fullName : __("System"),
"state" => $this->to,
];
}

2
app/Infrastructure/Http/Resources/VacationRequestResource.php
View File

@@ -15,7 +15,7 @@ class VacationRequestResource extends JsonResource
return [
"id" => $this->id,
"name" => $this->name,
"user" => new UserResource($this->user),
"user" => new SimpleUserResource($this->user),
"type" => $this->type,
"state" => $this->state,
"from" => $this->from->toDisplayString(),

2
app/Infrastructure/Jobs/ClearVacationRequestDaysInGoogleCalendar.php
View File

@@ -21,7 +21,7 @@ class ClearVacationRequestDaysInGoogleCalendar implements ShouldQueue
public function handle(): void
{
foreach ($this->vacationRequest->event_ids as $eventId) {
foreach ($this->vacationRequest->event_ids ?? [] as $eventId) {
$calendarEvent = Event::find($eventId);
if ($calendarEvent->googleEvent->getStatus() !== "cancelled") {

2
app/Infrastructure/Jobs/SendVacationRequestDaysToGoogleCalendar.php
View File

@@ -32,7 +32,7 @@ class SendVacationRequestDaysToGoogleCalendar implements ShouldQueue
$ranges = $this->prepareRanges($days);
foreach ($ranges as $range) {
$text = "{$this->vacationRequest->type->label()} - {$this->vacationRequest->user->fullName} [{$this->vacationRequest->name}]";
$text = "{$this->vacationRequest->type->label()} - {$this->vacationRequest->user->profile->fullName} [{$this->vacationRequest->name}]";
$event = Event::create([
"name" => $text,