adding UserDetailObserver and reorderable records feature

app/Containers/InstituteStructure/UI/WEB/Controllers/ClientDepartmentController.php

@@ -58,6 +58,9 @@ class ClientDepartmentController extends Controller
                     ->where('is_active', true)
                     ->with([
                         'faculty',
+                        'workers' => fn ($query) => $query->orderBy('sort', 'asc'),
+                        'teachers' => fn ($query) => $query->orderBy('sort', 'asc'),
+                        'programs' => fn ($query) => $query->orderBy('sort', 'asc'),
                         'workers.userDetail',
                         'teachers.userDetail',
                         'programs.directionStudy',

app/Containers/InstituteStructure/UI/WEB/Controllers/ClientDivisionController.php

@@ -38,7 +38,15 @@ class ClientDivisionController extends Controller
         });
 
         $divisionData = Cache::remember(CacheKeys::DIVISION_PREFIX->value . $slug, now()->addDay(), function () use ($slug) {
-            return Division::with(['workers.userDetail', 'seo'])->where('is_active', true)->where('slug', $slug)->firstOrFail();
+            return Division::query()
+                ->with([
+                    'workers' => fn ($query) => $query->orderBy('sort', 'asc'),
+                    'workers.userDetail',
+                    'seo'
+                ])
+                ->where('is_active', true)
+                ->where('slug', $slug)
+                ->firstOrFail();
         });
 
         $seo = $this->seoPageProvider->getSeoForModel($divisionData);

app/Containers/InstituteStructure/UI/WEB/Controllers/ClientFacultyController.php

@@ -61,7 +61,11 @@ class ClientFacultyController extends Controller
             function () use ($slug) {
                 return Faculty::where('slug', $slug)
                     ->where('is_active', true)
-                    ->with(['departments.faculty', 'workers', 'seo'])
+                    ->with(['departments.faculty',
+                        'workers' => fn ($query) => $query->orderBy('sort', 'asc'),
+                        'workers.userDetail',
+                        'seo'
+                    ])
                     ->firstOrFail();
             }
         );

app/Containers/User/Observers/UserDetailObserver.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Containers\User\Observers;
+
+use App\Containers\User\Models\UserDetail;
+use App\Services\App\Cache\UserCacheService;
+
+class UserDetailObserver
+{
+    private UserCacheService $userCacheService;
+
+    public function __construct()
+    {
+        $this->userCacheService = app(UserCacheService::class);
+    }
+
+    /**
+     * Handle the User "created" event.
+     */
+    public function created(UserDetail $user): void
+    {
+        $this->userCacheService->clearAllCacheByModel();
+    }
+
+    /**
+     * Handle the User "updated" event.
+     */
+    public function updated(UserDetail $user): void
+    {
+        $this->userCacheService->clearAllCacheByModel();
+    }
+
+    /**
+     * Handle the User "deleted" event.
+     */
+    public function deleted(UserDetail $user): void
+    {
+        $this->userCacheService->clearAllCacheByModel();
+    }
+
+    /**
+     * Handle the User "restored" event.
+     */
+    public function restored(UserDetail $user): void
+    {
+        $this->userCacheService->clearAllCacheByModel();
+    }
+
+    /**
+     * Handle the User "force deleted" event.
+     */
+    public function forceDeleted(UserDetail $user): void
+    {
+        $this->userCacheService->clearAllCacheByModel();
+    }
+}

app/Filament/Resources/DepartmentResource/RelationManagers/ProgramsRelationManager.php

@@ -103,4 +103,9 @@ class ProgramsRelationManager extends RelationManager
             ->deferLoading()
             ->persistFiltersInSession();
     }
+
+    protected function canReorder(): bool
+    {
+        return true;
+    }
 }

app/Filament/Resources/DepartmentResource/RelationManagers/TeachersRelationManager.php

@@ -166,7 +166,13 @@ class TeachersRelationManager extends RelationManager
                 AttachAction::make()
                     ->label('Добавить преподавателя'),
             ])
-            ->defaultSort('name')
+            ->defaultSort('sort')
+            ->reorderable('sort')
             ->deferLoading();
     }
+
+    protected function canReorder(): bool
+    {
+        return true;
+    }
 }

app/Filament/Resources/DepartmentResource/RelationManagers/WorkersRelationManager.php

@@ -166,7 +166,13 @@ class WorkersRelationManager extends RelationManager
                 AttachAction::make()
                     ->label('Добавить сотрудника'),
             ])
-            ->defaultSort('name')
+            ->reorderable('sort')
+            ->defaultSort('sort')
             ->deferLoading();
     }
+
+    protected function canReorder(): bool
+    {
+        return true;
+    }
 }

app/Filament/Resources/DivisionResource/RelationManagers/WorkersRelationManager.php

@@ -181,4 +181,9 @@ class WorkersRelationManager extends RelationManager
             ->paginated([10, 25, 50, 100])
             ->striped();
     }
+
+    protected function canReorder(): bool
+    {
+        return true;
+    }
 }

app/Filament/Resources/FacultyResource/RelationManagers/WorkersRelationManager.php

@@ -50,6 +50,7 @@ class WorkersRelationManager extends RelationManager
                             ->maxLength(10)
                             ->placeholder('Например: 305а')
                             ->helperText('Номер кабинета для приема'),
+
                     ])
             ]);
     }
@@ -57,9 +58,9 @@ class WorkersRelationManager extends RelationManager
     public function table(Table $table): Table
     {
         return $table
-            ->recordTitleAttribute('name')
             ->reorderable('sort')
             ->defaultSort('sort')
+            ->recordTitleAttribute('name')
             ->columns([
                 Tables\Columns\TextColumn::make('name')
                     ->label('ФИО')
@@ -75,23 +76,21 @@ class WorkersRelationManager extends RelationManager
                 Tables\Columns\TextColumn::make('service_email')
                     ->label('Почта')
                     ->searchable()
-                    ->icon('heroicon-o-envelope')
-                    ->toggleable(isToggledHiddenByDefault: true),
+                    ->icon('heroicon-o-envelope'),
 
                 Tables\Columns\TextColumn::make('service_phone')
                     ->label('Телефон')
                     ->searchable()
-                    ->icon('heroicon-o-phone')
-                    ->toggleable(isToggledHiddenByDefault: true),
+                    ->icon('heroicon-o-phone'),
 
                 Tables\Columns\TextColumn::make('cabinet')
                     ->label('Кабинет')
                     ->searchable()
-                    ->icon('heroicon-o-home-modern')
-                    ->toggleable(isToggledHiddenByDefault: false),
-            ])
-            ->filters([
-                //
+                    ->icon('heroicon-o-home-modern'),
+//                Tables\Columns\TextColumn::make('sort')
+//                    ->label('Сортировка')
+//                    ->toggleable(isToggledHiddenByDefault: false),
+
             ])
             ->headerActions([
                 AttachAction::make()
@@ -165,4 +164,9 @@ class WorkersRelationManager extends RelationManager
             ->emptyStateDescription('Добавьте сотрудников, используя кнопку выше')
             ->emptyStateIcon('heroicon-o-user-group');
     }
+
+    protected function canReorder(): bool
+    {
+        return true;
+    }
 }

app/Providers/AppServiceProvider.php

@@ -18,6 +18,8 @@ use App\Containers\InstituteStructure\Models\Faculty;
 use App\Containers\Schedule\Models\Schedule;
 use App\Containers\Science\Models\AcademicJournal;
 use App\Containers\User\Models\User;
+use App\Containers\User\Models\UserDetail;
+use App\Containers\User\Observers\UserDetailObserver;
 use App\Containers\Widget\Models\ContactWidget;
 use App\Containers\Widget\Models\PageReferenceList;
 use App\Containers\Widget\Models\Slide;
@@ -90,6 +92,7 @@ class AppServiceProvider extends ServiceProvider
         Event::observe(EventObserver::class);
         Faculty::observe(FacultyObserver::class);
         User::observe(UserObserver::class);
+        UserDetail::observe(UserDetailObserver::class);
         EducationalProgram::observe(EducationalProgramObserver::class);
         Schedule::observe(ScheduleObserver::class);
         ContactWidget::observe(ContactWidgetObserver::class);