Merge pull request #82 from imbus/SIT-125_bugfix-sorting-problem-on-settings-page

Sit 125 bugfix sorting problem on settings page

Author: JonasGoseberg

app/Http/Controllers/Api/PredefinedFilterController.php

@@ -12,7 +12,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
 use App\Helpers\Helper;
-use Log;
 
 class PredefinedFilterController extends Controller
 {
@@ -23,12 +22,43 @@ public function __construct(PredefinedFilterService $service)
         $this->service = $service;
     }
 
-    public function index()
+    public function index(Request $request) : JsonResponse | array
     {
         $filters = $this->service->getAllViewableFilters();
-        return (new PredefinedFiltersTransformer)->transformPredefinedFilters($filters, $filters->count());
+
+        if ($request->filled('search')) {
+            $search = strtolower($request->get('search'));
+            $filters = $filters->filter(fn($filter) =>
+                str_contains(strtolower($filter->name), $search)
+            );
+        }
+
+        // --- Sorting ---
+        $sort = $request->input('sort', 'name');
+        $order = $request->input('order', 'asc');
+
+        $allowed_columns = ['id', 'name', 'is_public', 'created_by'];
+        
+        if (!in_array($sort, $allowed_columns)) {
+            $sort = 'name';
+        }
+
+        $filters = $order === 'desc'
+            ? $filters->sortByDesc(fn($f) => strtolower(data_get($f, $sort, '')))
+            : $filters->sortBy(fn($f) => strtolower(data_get($f, $sort, '')));
+        
+        // --- Pagination ---
+        $total = $filters->count();
+        $offset = (int) $request->input('offset', 0);
+        $limit = (int) $request->input('limit', config('app.max_results', 50));
+
+        $filters = $filters->slice($offset, $limit)->values();
+
+        return (new PredefinedFiltersTransformer)->transformPredefinedFilters($filters, $total);
     }
 
+
+
     public function show(int $id)
     {
         $filter = $this->service->getFilterById($id);

tests/Feature/PredefinedFilter/Api/PredefinedFilterControllerTest.php

@@ -145,6 +145,82 @@ public function test_su_can_see_private_filter(){
             ->assertJsonFragment(['name'=>'Allowed Private Filter']);
     }
 
+    public function test_index_can_search_by_name(): void
+    {
+        $user = User::factory()->create();
+
+        $match = PredefinedFilter::factory()->create([
+            'name' => 'Important Filter',
+            'is_public' => 0,
+            'created_by' => $user->id,
+        ]);
+        $noMatch = PredefinedFilter::factory()->create([
+            'name' => 'Unrelated',
+            'is_public' => 0,
+            'created_by' => $user->id,
+        ]);
+
+        $response = $this->actingAs($user, 'api')
+            ->getJson('/api/v1/predefinedFilters?search=important')
+            ->assertOk();
+
+        $response->assertJsonFragment(['name' => 'Important Filter']);
+        $response->assertJsonMissing(['name' => 'Unrelated']);
+        $this->assertCount(1, $response->json('rows'));
+    }
+
+    public function test_index_can_sort_results_by_name(): void
+    {
+        $user = User::factory()->create();
+
+        $a = PredefinedFilter::factory()->create(['name' => 'Alpha', 'is_public' => 0, 'created_by' => $user->id]);
+        $z = PredefinedFilter::factory()->create(['name' => 'Zulu', 'is_public' => 0, 'created_by' => $user->id]);
+        $m = PredefinedFilter::factory()->create(['name' => 'Mike', 'is_public' => 0, 'created_by' => $user->id]);
+
+        // Ascending
+        $asc = $this->actingAs($user, 'api')
+            ->getJson('/api/v1/predefinedFilters?sort=name&order=asc')
+            ->assertOk()
+            ->json('rows');
+
+        $this->assertEquals(['Alpha', 'Mike', 'Zulu'], array_column($asc, 'name'));
+
+        // Descending
+        $desc = $this->actingAs($user, 'api')
+            ->getJson('/api/v1/predefinedFilters?sort=name&order=desc')
+            ->assertOk()
+            ->json('rows');
+
+        $this->assertEquals(['Zulu', 'Mike', 'Alpha'], array_column($desc, 'name'));
+    }
+
+    public function test_index_can_paginate_results(): void
+    {
+        $user = User::factory()->create();
+
+        $filters = PredefinedFilter::factory()->count(5)->sequence(
+            ['name' => 'Filter 1', 'is_public' => 0],
+            ['name' => 'Filter 2', 'is_public' => 0],
+            ['name' => 'Filter 3', 'is_public' => 0],
+            ['name' => 'Filter 4', 'is_public' => 0],
+            ['name' => 'Filter 5', 'is_public' => 0],
+        )->create(['created_by' => $user->id]);
+
+        $response1 = $this->actingAs($user, 'api')
+            ->getJson('/api/v1/predefinedFilters?limit=2&offset=0')
+            ->assertOk();
+
+        $this->assertCount(2, $response1->json('rows'));
+        $this->assertEquals(5, $response1->json('total'));
+
+        $response2 = $this->actingAs($user, 'api')
+            ->getJson('/api/v1/predefinedFilters?limit=2&offset=2')
+            ->assertOk();
+
+        $this->assertCount(2, $response2->json('rows'));
+        $this->assertEquals(5, $response2->json('total'));
+    }
+
     //------SHOW TESTS------
 
     public function test_show_404_when_missing(): void