From 6721ceffcc8e82a1125fd02503e2d6a699f85d8f Mon Sep 17 00:00:00 2001
From: Yoga Pangestu <ypangestu976@gmail.com>
Date: Mon, 30 Mar 2026 16:38:24 +0700
Subject: [PATCH] refactor: update study group and student queries to sort by
 full name alphabetically

---
 app/Filament/Pages/Learning/StudyGroup/Index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Filament/Pages/Learning/StudyGroup/Index.php b/app/Filament/Pages/Learning/StudyGroup/Index.php
index 4932365..cd30962 100644
--- a/app/Filament/Pages/Learning/StudyGroup/Index.php
+++ b/app/Filament/Pages/Learning/StudyGroup/Index.php
@@ -106,7 +106,7 @@ public function deleteStudyGroupAction(): Action
     #[Computed]
     public function studyGroups(): Collection
     {
-        $query = StudyGroup::with(['leader', 'students', 'courses'])
+        $query = StudyGroup::with(['leader', 'students' => fn ($q) => $q->orderBy('full_name', 'asc'), 'courses'])
             ->whereHas('courses', fn ($q) => $q->where('courses.semester', app(GeneralSettings::class)->current_semester));
 
         if ($this->course_id) {
@@ -115,7 +115,7 @@ public function studyGroups(): Collection
 
         $studentId = auth()->user()?->student?->id;
 
-        return $query->latest()->get()->map(function ($record) use ($studentId) {
+        return $query->orderBy('name', 'asc')->get()->map(function ($record) use ($studentId) {
             $isMyGroup = ($studentId && ($record->leader_id === $studentId || $record->students->contains($studentId)));
 
             return (object) [
@@ -197,7 +197,7 @@ public function studyGroupFormSchema(): array
                                 $query->whereNotIn('id', array_unique(array_merge($allBusyIds, $selectedMembers)));
                             }
 
-                            return $query->get()->pluck('full_name', 'id')->toArray();
+                            return $query->orderBy('full_name', 'asc')->get()->pluck('full_name', 'id')->toArray();
                         })
                         ->searchable()
                         ->required()
@@ -227,7 +227,7 @@ public function studyGroupFormSchema(): array
                                     );
                                 }
 
-                                return $query->orderBy('student_number', 'asc');
+                                return $query->orderBy('full_name', 'asc');
                             }
                         )
                         ->multiple()