CRUD зон/устройств/правил автоматизации + RBAC owner/viewer

Policies (ZonePolicy/DevicePolicy/AutomationRulePolicy): не multi-tenant изоляция по user_id, а household-wide RBAC — все авторизованные видят одни и те же данные, только owner может создавать/менять/удалять. user_id на записи — это created_by, а не граница видимости. Form Requests с authorize() через политики; DeviceRequest учитывает unique external_id с ignore на update. AutomationRuleRequest: action_type остаётся строкой (не enum), т.к. это открытый список из device_types.capabilities; для действия set_level в форме есть отдельное поле "level" (Alpine.js переключает его видимость), которое контроллер мапит в action_params — без сырого JSON-редактора для MVP. Контроллеры без show (index+create/edit достаточно), Blade-формы на базе Breeze-компонентов. Навигация и дашборд (счётчики зон/устройств/активных правил) обновлены. Добавлен DemoGrowboxSeeder (демо-зона с датчиком, вентилятором и правилом) и viewer-пользователь в сидер. Восстановлен трейт AuthorizesRequests в базовом Controller (Laravel 11+ убрал его по умолчанию) — нужен для $this->authorize(). Проверено: 33/33 теста (включая новые ZoneControllerTest, AutomationRuleControllerTest — маппинг level→action_params, 403 для viewer), полный CRUD-цикл вживую через браузер под owner (создание зоны, правила с set_level, Alpine-переключение поля "Уровень"), доступ viewer подтверждён как read-only (нет кнопок изменения, прямой заход на /zones/create отдаёт 403).
2026-08-11 16:54:26 +05:00
parent bb492785a4
commit 467a05542c
29 changed files with 1264 additions and 9 deletions
@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Enums\DeviceCategory;
+use App\Http\Requests\AutomationRuleRequest;
+use App\Models\AutomationRule;
+use App\Models\Device;
+use App\Models\DeviceType;
+use App\Models\Zone;
+
+class AutomationRuleController extends Controller
+{
+    public function index()
+    {
+        $this->authorize('viewAny', AutomationRule::class);
+
+        $rules = AutomationRule::with(['zone', 'targetDevice', 'conditionSourceDevice'])
+            ->orderByDesc('id')
+            ->get();
+
+        return view('automation-rules.index', ['rules' => $rules]);
+    }
+
+    public function create()
+    {
+        $this->authorize('create', AutomationRule::class);
+
+        return view('automation-rules.create', $this->formOptions());
+    }
+
+    public function store(AutomationRuleRequest $request)
+    {
+        $rule = new AutomationRule($this->mapActionParams($request->validated()));
+        $rule->user()->associate($request->user());
+        $rule->save();
+
+        return redirect()->route('automation-rules.index')->with('status', 'Правило создано.');
+    }
+
+    public function edit(AutomationRule $automation_rule)
+    {
+        $this->authorize('update', $automation_rule);
+
+        return view('automation-rules.edit', [
+            'rule' => $automation_rule,
+            ...$this->formOptions(),
+        ]);
+    }
+
+    public function update(AutomationRuleRequest $request, AutomationRule $automation_rule)
+    {
+        $automation_rule->update($this->mapActionParams($request->validated()));
+
+        return redirect()->route('automation-rules.index')->with('status', 'Правило обновлено.');
+    }
+
+    public function destroy(AutomationRule $automation_rule)
+    {
+        $this->authorize('delete', $automation_rule);
+
+        $automation_rule->delete();
+
+        return redirect()->route('automation-rules.index')->with('status', 'Правило удалено.');
+    }
+
+    /**
+     * The "level" form field is a friendlier stand-in for action_params —
+     * only set_level currently takes a parameter, so there's no need for a
+     * raw JSON editor yet.
+     *
+     * @param  array<string, mixed>  $data
+     * @return array<string, mixed>
+     */
+    private function mapActionParams(array $data): array
+    {
+        $data['action_params'] = $data['action_type'] === 'set_level'
+            ? ['level' => $data['level']]
+            : [];
+
+        unset($data['level']);
+
+        return $data;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function formOptions(): array
+    {
+        $devices = Device::with(['zone', 'deviceType'])->orderBy('name')->get();
+
+        return [
+            'zones' => Zone::orderBy('name')->get(),
+            'devices' => $devices,
+            'actionTypeOptions' => $this->capabilityOptions(DeviceCategory::Actuator),
+            'sensorTypeOptions' => $this->capabilityOptions(DeviceCategory::Sensor),
+        ];
+    }
+
+    /**
+     * Distinct capability values across device_types of the given category —
+     * used as friendly select/datalist suggestions, not a hardcoded list.
+     *
+     * @return \Illuminate\Support\Collection<int, string>
+     */
+    private function capabilityOptions(DeviceCategory $category)
+    {
+        return DeviceType::where('category', $category)
+            ->get()
+            ->pluck('capabilities')
+            ->flatten()
+            ->unique()
+            ->sort()
+            ->values();
+    }
+}
@@ -2,7 +2,9 @@

 namespace App\Http\Controllers;

+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+
 abstract class Controller
 {
-    //
+    use AuthorizesRequests;
 }
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\DeviceRequest;
+use App\Models\Device;
+use App\Models\DeviceType;
+use App\Models\Zone;
+
+class DeviceController extends Controller
+{
+    public function index()
+    {
+        $this->authorize('viewAny', Device::class);
+
+        $devices = Device::with(['zone', 'deviceType'])->orderBy('name')->get();
+
+        return view('devices.index', compact('devices'));
+    }
+
+    public function create()
+    {
+        $this->authorize('create', Device::class);
+
+        return view('devices.create', $this->formOptions());
+    }
+
+    public function store(DeviceRequest $request)
+    {
+        $device = new Device($request->validated());
+        $device->user()->associate($request->user());
+        $device->save();
+
+        return redirect()->route('devices.index')->with('status', 'Устройство добавлено.');
+    }
+
+    public function edit(Device $device)
+    {
+        $this->authorize('update', $device);
+
+        return view('devices.edit', ['device' => $device, ...$this->formOptions()]);
+    }
+
+    public function update(DeviceRequest $request, Device $device)
+    {
+        $device->update($request->validated());
+
+        return redirect()->route('devices.index')->with('status', 'Устройство обновлено.');
+    }
+
+    public function destroy(Device $device)
+    {
+        $this->authorize('delete', $device);
+
+        $device->delete();
+
+        return redirect()->route('devices.index')->with('status', 'Устройство удалено.');
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function formOptions(): array
+    {
+        return [
+            'zones' => Zone::orderBy('name')->get(),
+            'deviceTypes' => DeviceType::orderBy('code')->get(),
+        ];
+    }
+}
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\ZoneRequest;
+use App\Models\Zone;
+
+class ZoneController extends Controller
+{
+    public function index()
+    {
+        $this->authorize('viewAny', Zone::class);
+
+        $zones = Zone::withCount('devices')->orderBy('name')->get();
+
+        return view('zones.index', compact('zones'));
+    }
+
+    public function create()
+    {
+        $this->authorize('create', Zone::class);
+
+        return view('zones.create');
+    }
+
+    public function store(ZoneRequest $request)
+    {
+        $request->user()->zones()->create($request->validated());
+
+        return redirect()->route('zones.index')->with('status', 'Зона создана.');
+    }
+
+    public function edit(Zone $zone)
+    {
+        $this->authorize('update', $zone);
+
+        return view('zones.edit', compact('zone'));
+    }
+
+    public function update(ZoneRequest $request, Zone $zone)
+    {
+        $zone->update($request->validated());
+
+        return redirect()->route('zones.index')->with('status', 'Зона обновлена.');
+    }
+
+    public function destroy(Zone $zone)
+    {
+        $this->authorize('delete', $zone);
+
+        $zone->delete();
+
+        return redirect()->route('zones.index')->with('status', 'Зона удалена.');
+    }
+}
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Enums\ConditionOperator;
+use App\Models\AutomationRule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class AutomationRuleRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        $rule = $this->route('automation_rule');
+
+        return $rule
+            ? $this->user()->can('update', $rule)
+            : $this->user()->can('create', AutomationRule::class);
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'zone_id' => ['required', 'exists:zones,id'],
+            'target_device_id' => ['required', 'exists:devices,id'],
+            'condition_source_device_id' => ['required', 'exists:devices,id'],
+            'condition_sensor_type' => ['required', 'string', 'max:255'],
+            'condition_operator' => ['required', Rule::enum(ConditionOperator::class)],
+            'condition_value' => ['required', 'numeric'],
+            'action_type' => ['required', 'string', 'max:255'],
+            'level' => ['nullable', 'numeric', 'required_if:action_type,set_level'],
+            'is_active' => ['boolean'],
+        ];
+    }
+}
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\Device;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class DeviceRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        $device = $this->route('device');
+
+        return $device
+            ? $this->user()->can('update', $device)
+            : $this->user()->can('create', Device::class);
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        $device = $this->route('device');
+
+        return [
+            'zone_id' => ['required', 'exists:zones,id'],
+            'device_type_id' => ['required', 'exists:device_types,id'],
+            'name' => ['required', 'string', 'max:255'],
+            'external_id' => [
+                'required', 'string', 'max:255',
+                Rule::unique('devices', 'external_id')->ignore($device),
+            ],
+            'protocol' => ['required', 'string', 'max:255'],
+        ];
+    }
+}
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\Zone;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ZoneRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        $zone = $this->route('zone');
+
+        return $zone
+            ? $this->user()->can('update', $zone)
+            : $this->user()->can('create', Zone::class);
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => ['required', 'string', 'max:255'],
+            'description' => ['nullable', 'string'],
+        ];
+    }
+}