diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 127a5a1e..c59836a6 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -111,7 +111,7 @@ class ItemController extends Controller public function getItems() { - $userId = auth('api')->user()->id; + $userId = auth('api')->id(); // $medicalCenterId = optional(optional($user)->medical_center)->id; // $userIds = User::where('medical_center_id', $medicalCenterId)->pluck('id')->toArray(); diff --git a/app/Http/Requests/StoreCycleRequest.php b/app/Http/Requests/StoreCycleRequest.php index f8f54ea5..f647f70c 100644 --- a/app/Http/Requests/StoreCycleRequest.php +++ b/app/Http/Requests/StoreCycleRequest.php @@ -25,8 +25,9 @@ class StoreCycleRequest extends FormRequest return [ 'date' => 'required', 'sterilizer_id' => 'required', - 'cycle_number' => 'required|unique:labels,cycle_number', + 'cycle_number' => 'required|unique:cycles,cycle_number', 'note' => 'nullable', + 'labels' => 'required|array|distinct', 'labels.*.id' => 'required|numeric|exists:labels,id', ]; break; @@ -37,8 +38,9 @@ class StoreCycleRequest extends FormRequest return [ 'date' => 'required', 'sterilizer_id' => 'required', - 'cycle_number' => 'required|unique:labels,cycle_number', + 'cycle_number' => 'required|unique:cycles,cycle_number', 'note' => 'nullable', + 'labels' => 'required|array|distinct', 'labels.*.id' => 'required|numeric|exists:labels,id', ]; break; diff --git a/app/Http/Requests/StoreLabelRequest.php b/app/Http/Requests/StoreLabelRequest.php index 7232be13..c1efa2c5 100644 --- a/app/Http/Requests/StoreLabelRequest.php +++ b/app/Http/Requests/StoreLabelRequest.php @@ -26,7 +26,7 @@ class StoreLabelRequest extends FormRequest 'sterile_date' => 'required|date', 'expire_date' => 'required|date', 'sterilizer_id' => 'required', - 'cycle_number' => 'required', + 'cycle_number' => 'required|exists:cycles,cycle_number', 'lot_number' => 'required', 'package_id' => 'required|exists:packages,id', ]; @@ -39,7 +39,7 @@ class StoreLabelRequest extends FormRequest 'sterile_date' => 'required', 'expire_date' => 'required', 'sterilizer_id' => 'required', - 'cycle_number' => 'required', + 'cycle_number' => 'required|exists:cycles,cycle_number', 'lot_number' => 'required', 'package_id' => 'required|exists:packages,id', ];