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

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();
}
}

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
{

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,
];
}