From 50dfec4844d4c7e3753dcbc8ffa8812da728f6a1 Mon Sep 17 00:00:00 2001 From: Paulo Massingue Date: Tue, 17 Nov 2026 14:12:02 +0200 Subject: [PATCH] filtros de biblioteca e legislacao --- .../Controllers/PortalServicesController.php | 4 +- tests/Feature/PortalServicesTest.php | 45 +++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/PortalServicesController.php b/app/Http/Controllers/PortalServicesController.php index ce46c80d..99fa1b3c 100644 --- a/app/Http/Controllers/PortalServicesController.php +++ b/app/Http/Controllers/PortalServicesController.php @@ -120,13 +120,13 @@ class PortalServicesController extends Controller ->orWhere('r.source_reference', 'ilike', $term)->orWhere('r.category', 'ilike', $term)->orWhere('r.topic', 'ilike', $term)); } $pageResult = $query->orderByRaw("CASE WHEN r.document_type IN ('official_form','digital_adaptation','guidance_template') THEN 1 ELSE 0 END") - ->orderByDesc('r.essential')->orderBy('r.title')->select([ + ->orderByDesc('r.essential')->orderBy('r.title')->orderBy('r.id')->select([ 'r.id', 'r.document_id', 'r.title', 'r.description', 'r.category', 'r.topic', 'r.document_type', 'r.document_number', 'r.document_date', 'r.applicable_from', 'r.applicable_until', 'r.source_url', 'r.language', 'r.version_label', 'r.document_group_id', 'r.territorial_scope', 'r.territory_id', 'r.source_confirmation', 'r.legal_status', 'r.rights_status', 'r.last_reviewed_at', 'r.last_reviewed_by', 'r.independent_review', 'r.metadata_version', 'r.source_reference', 'r.essential', 'd.file_name', 'd.media_type', 'd.size_bytes', 'd.issuer', 'd.issued_on', 'd.valid_until', 'd.version_no', - ])->paginate(20)->withQueryString(); + ])->paginate(5)->withQueryString(); $pageResult->getCollection()->transform(fn ($resource) => app(PublicDocumentPresentation::class)->resource($resource)); $props['resources'] = $pageResult; app(PublicSearchMetrics::class)->candidate($request, 'documents', $pageResult->total(), $filters); diff --git a/tests/Feature/PortalServicesTest.php b/tests/Feature/PortalServicesTest.php index 43209209..1f56cbeb 100644 --- a/tests/Feature/PortalServicesTest.php +++ b/tests/Feature/PortalServicesTest.php @@ -225,6 +225,51 @@ class PortalServicesTest extends TestCase $this->assertDatabaseCount('portal_resource_links', 20); } + public function test_public_document_lists_paginate_five_results_and_preserve_filters(): void + { + Storage::fake('local'); + $this->withoutMiddleware(\Illuminate\Routing\Middleware\ThrottleRequests::class); + $manager = User::factory()->create(); + config(['portal.managers' => [$manager->email]]); + $this->actingAs($manager); + + for ($number = 1; $number <= 12; $number++) { + $filename = sprintf('pagination-%02d.txt', $number); + $this->post('/management/portal-services/upload', [ + 'file' => UploadedFile::fake()->createWithContent($filename, 'pagination fixture '.$number), + ])->assertRedirect()->assertSessionHasNoErrors(); + $document = DB::table('documents')->where('file_name', $filename)->firstOrFail(); + $id = $this->registerDocumentResource($document->id, sprintf('Pagination QA %02d', $number), [ + 'legislation' => true, + ]); + if ($number <= 11) { + // The transaction-wrapped test does not run the after-commit scan job. + DB::table('documents')->where('id', $document->id)->update([ + 'status' => 'active', 'data_classification' => 'public', + 'malware_scan_status' => 'clean', 'malware_scanned_sha256' => $document->sha256, + ]); + $this->post('/management/portal-services/resources/'.$id, ['published' => true])->assertSessionHasNoErrors(); + } + } + + auth()->logout(); + foreach (['documentos', 'legislacao'] as $path) { + foreach ([1 => [5, 1, 5], 2 => [5, 6, 10], 3 => [1, 11, 11]] as $number => [$count, $from, $to]) { + $this->get('/'.$path.'?topic=Investimento&page='.$number)->assertOk()->assertInertia(fn (Assert $page) => $page + ->has('resources.data', $count)->where('resources.total', 11) + ->where('resources.current_page', $number)->where('resources.last_page', 3) + ->where('resources.from', $from)->where('resources.to', $to) + ->where('resources.data.0.title', sprintf('Pagination QA %02d', $from)) + ->where('resources.prev_page_url', fn ($url) => $number === 1 ? $url === null : str_contains($url, 'topic=Investimento') && str_contains($url, 'page='.($number - 1))) + ->where('resources.next_page_url', fn ($url) => $number === 3 ? $url === null : str_contains($url, 'topic=Investimento') && str_contains($url, 'page='.($number + 1)))); + } + $this->get('/'.$path.'?q=Pagination%20QA%2001')->assertOk()->assertInertia(fn (Assert $page) => $page + ->has('resources.data', 1)->where('resources.total', 1)->where('resources.data.0.title', 'Pagination QA 01')); + $this->get('/'.$path.'?q=nao-existe')->assertOk()->assertInertia(fn (Assert $page) => $page + ->has('resources.data', 0)->where('resources.total', 0)); + } + } + public function test_legislation_with_an_identified_source_can_be_published_for_consultation_without_claiming_confirmation(): void { Storage::fake('local');