Fixed api issue

Reviewed-on: #11

README.md

@@ -1 +1 @@
-Persian ping 
+## Law

app/Http/Controllers/api/BylawApiController.php

@@ -6,16 +6,16 @@ use App\Http\Controllers\Controller;
 use App\Models\BylawDocument;
 use App\Models\BylawLegalAuthority;
 use App\Models\BylawSubjectCategory;
+use App\Models\BylawNode;
+use App\Models\BylawCodificationLink;
 use App\Traits\BaseApiResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class BylawApiController extends Controller
 {
     use BaseApiResponse;
 
-    /**
-     * Get all Bylaw Subject Categories
-     */
     public function categories()
     {
         $categories = BylawSubjectCategory::all()->map(function ($category) {
@@ -28,9 +28,6 @@ class BylawApiController extends Controller
         return $this->success($categories, 'Success', 'Bylaw Categories List');
     }
 
-    /**
-     * Get all Bylaw Legal Authorities
-     */
     public function authorities()
     {
         $authorities = BylawLegalAuthority::all()->map(function ($authority) {
@@ -44,15 +41,13 @@ class BylawApiController extends Controller
         return $this->success($authorities, 'Success', 'Bylaw Authorities List');
     }
 
-    /**
-     * Get Paginated Bylaws (Filtered & Sorted by Approval Date)
-     */
     public function index(Request $request)
     {
         $request->validate([
             'category_id'           => 'nullable|exists:bylaw_subject_categories,id',
             'approval_authority_id' => 'nullable|exists:bylaw_legal_authorities,id',
             'bylaw_type'            => 'nullable|in:executive,delegated,independent',
+            'sort_by'               => 'nullable|in:date,number',
             'sort'                  => 'nullable|in:asc,desc',
             'per_page'              => 'nullable|integer|min:1|max:100',
         ]);
@@ -72,8 +67,15 @@ class BylawApiController extends Controller
             $query->where('bylaw_type', $request->bylaw_type);
         }
 
+        $sortBy = $request->input('sort_by', 'date');
         $sortOrder = $request->input('sort', 'desc');
-        $query->orderBy('approval_date', $sortOrder);
+        $sortColumn = $sortBy === 'number' ? 'promulgation_number' : 'approval_date';
+
+        if ($sortBy === 'number') {
+            $query->orderByRaw("LENGTH({$sortColumn}) {$sortOrder}")->orderBy($sortColumn, $sortOrder);
+        } else {
+            $query->orderBy($sortColumn, $sortOrder);
+        }
 
         $perPage = min(max((int) $request->input('per_page', 15), 10), 100);
         $paginator = $query->paginate($perPage);
@@ -93,13 +95,69 @@ class BylawApiController extends Controller
         return $this->success($responseData, 'Success', 'Bylaws Fetched');
     }
 
-    /**
-     * Search Bylaws by Keyword
-     */
+    public function single($id)
+    {
+        $bylaw = BylawDocument::with(['category', 'approvalAuthority', 'promulgationAuthority'])
+            ->where('is_published', true)
+            ->find($id);
+
+        if (!$bylaw) {
+            return $this->failed([], [
+                'title' => 'خطا',
+                'message' => 'آیین‌نامه مورد نظر یافت نشد.'
+            ], 404);
+        }
+
+        $formatted = $this->formatBylaw($bylaw);
+
+        if (!$formatted['is_locked']) {
+            $nodes = BylawNode::with('type')
+                ->where('document_id', $bylaw->id)
+                ->orderBy('sort_order', 'asc')
+                ->get()
+                ->map(function ($node) {
+                    return [
+                        'id'              => $node->id,
+                        'parent_id'       => $node->parent_id,
+                        'node_type'       => optional($node->type)->name,
+                        'node_identifier' => $node->node_identifier,
+                        'title'           => $node->title,
+                        'node_content'    => $node->node_content,
+                        'sort_order'      => $node->sort_order,
+                        'valid_from'      => $node->valid_from,
+                        'valid_to'        => $node->valid_to,
+                        'node_status'     => $node->node_status,
+                    ];
+                });
+
+            $formatted['nodes'] = $nodes->toArray();
+
+            $links = BylawCodificationLink::where('source_entity_type', 'bylaw_doc')
+                ->where('source_entity_id', $bylaw->id)
+                ->get()
+                ->map(function ($link) {
+                    return [
+                        'id'                 => $link->id,
+                        'target_entity_type' => $link->target_entity_type,
+                        'target_entity_id'   => $link->target_entity_id,
+                        'link_type'          => $link->link_type,
+                        'effective_date'     => $link->effective_date,
+                        'justification'      => $link->justification,
+                    ];
+                });
+
+            $formatted['links'] = $links->toArray();
+        }
+
+        return $this->success($formatted, 'Success', 'Bylaw Document Details Fetched');
+    }
+
     public function search(Request $request)
     {
         $request->validate([
             'search'   => 'nullable|string',
+            'sort_by'  => 'nullable|in:date,number',
+            'sort'     => 'nullable|in:asc,desc',
             'per_page' => 'nullable|integer|min:1|max:100',
         ]);
 
@@ -113,14 +171,27 @@ class BylawApiController extends Controller
                 $q->where('title', 'LIKE', "%{$searchTerm}%")
                     ->orWhere('description', 'LIKE', "%{$searchTerm}%")
                     ->orWhere('promulgation_number', 'LIKE', "%{$searchTerm}%")
-                    ->orWhere('official_gazette_number', 'LIKE', "%{$searchTerm}%");
+                    ->orWhere('official_gazette_number', 'LIKE', "%{$searchTerm}%")
+                    ->orWhereIn('id', function($subQuery) use ($searchTerm) {
+                        $subQuery->select('document_id')
+                            ->from('bylaw_nodes')
+                            ->where('node_content', 'LIKE', "%{$searchTerm}%");
+                    });
             });
         }
 
-        $perPage = min(max((int) $request->input('per_page', 15), 10), 100);
+        $sortBy = $request->input('sort_by', 'date');
+        $sortOrder = $request->input('sort', 'desc');
+        $sortColumn = $sortBy === 'number' ? 'promulgation_number' : 'approval_date';
 
-        // Default search sort to newest first
-        $paginator = $query->orderBy('approval_date', 'desc')->paginate($perPage);
+        if ($sortBy === 'number') {
+            $query->orderByRaw("LENGTH({$sortColumn}) {$sortOrder}")->orderBy($sortColumn, $sortOrder);
+        } else {
+            $query->orderBy($sortColumn, $sortOrder);
+        }
+
+        $perPage = min(max((int) $request->input('per_page', 15), 10), 100);
+        $paginator = $query->paginate($perPage);
 
         $items = collect($paginator->items())->map(function ($item) {
             return $this->formatBylaw($item);
@@ -137,9 +208,38 @@ class BylawApiController extends Controller
         return $this->success($responseData, 'Success', 'Search Results Fetched');
     }
 
-    /**
-     * Contextual Pager API
-     */
+    public function fast_search(Request $request)
+    {
+        $searchTerm = $request->input('search');
+
+        $query = BylawDocument::with(['category', 'approvalAuthority', 'promulgationAuthority'])
+            ->where('is_published', true);
+
+        if (!empty($searchTerm)) {
+            $query->where(function ($q) use ($searchTerm) {
+                $q->where('title', 'LIKE', "%{$searchTerm}%")
+                    ->orWhere('description', 'LIKE', "%{$searchTerm}%")
+                    ->orWhere('promulgation_number', 'LIKE', "%{$searchTerm}%")
+                    ->orWhere('official_gazette_number', 'LIKE', "%{$searchTerm}%")
+                    ->orWhereIn('id', function($subQuery) use ($searchTerm) {
+                        $subQuery->select('document_id')
+                            ->from('bylaw_nodes')
+                            ->where('node_content', 'LIKE', "%{$searchTerm}%");
+                    });
+            });
+        }
+
+        $count = $query->count();
+        $items = $query->orderBy('approval_date', 'desc')->take(5)->get()->map(function ($item) {
+            return $this->formatBylaw($item);
+        });
+
+        return $this->success([
+            'items' => $items,
+            'count' => $count
+        ], 'Success', 'Fast Search Results');
+    }
+
     public function pager($id)
     {
         $current = BylawDocument::with(['category', 'approvalAuthority', 'promulgationAuthority'])
@@ -199,18 +299,40 @@ class BylawApiController extends Controller
         return $this->success($results, 'Success', 'Pager Window Details');
     }
 
-    /**
-     * Helper to uniformly format the Bylaw Document payload
-     */
+    private function isLockedForCurrentUser($item): bool
+    {
+        return ! auth()->user()->isSubscriber() && (bool) ($item->is_locked ?? false);
+    }
+
     private function formatBylaw($item)
     {
+        $isLocked = $this->isLockedForCurrentUser($item);
+
+        $description = $item->description;
+
+        // Check if description is practically empty (null, empty string, or just empty WYSIWYG HTML like <p></p>)
+        $cleanDesc = trim(strip_tags($description ?? ''));
+
+        // Direct Query Fallback: Fetch node_content manually via DB facade to bypass any Model restrictions
+        if (empty($cleanDesc)) {
+            $nodeContents = DB::table('bylaw_nodes')
+                ->where('document_id', $item->id)
+                ->orderBy('sort_order', 'asc')
+                ->pluck('node_content')
+                ->toArray();
+
+            $description = implode("\n\n", array_filter($nodeContents));
+        }
+
         return [
             'id'                        => $item->id,
             'title'                     => $item->title,
             'category_id'               => $item->category_id,
             'category_name'             => optional($item->category)->name,
+            'approval_authority_id'     => $item->approval_authority_id,
             'approval_authority_name'   => optional($item->approvalAuthority)->name,
             'approval_date'             => $item->approval_date,
+            'promulgation_authority_id' => $item->promulgation_authority_id,
             'promulgation_authority_name'=> optional($item->promulgationAuthority)->name,
             'promulgation_date'         => $item->promulgation_date,
             'promulgation_number'       => $item->promulgation_number,
@@ -219,8 +341,9 @@ class BylawApiController extends Controller
             'execution_date'            => $item->execution_date,
             'bylaw_type'                => $item->bylaw_type,
             'global_status'             => $item->global_status,
-            'pdf_file_url'              => $item->pdf_file_path ? asset('storage/' . $item->pdf_file_path) : null,
-            'description'               => $item->description,
+            'pdf_file_url'              => $isLocked ? null : ($item->pdf_file_path ? asset('storage/' . $item->pdf_file_path) : null),
+            'description'               => $isLocked ? null : $description,
+            'is_locked'                 => $isLocked,
         ];
     }
 }

app/Http/Controllers/api/GlobalSearchApiController.php

@@ -19,6 +19,7 @@ use App\Models\Volum;
 use App\Traits\BaseApiResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\DB;
 
 class GlobalSearchApiController extends Controller
 {
@@ -31,6 +32,8 @@ class GlobalSearchApiController extends Controller
     {
         $request->validate([
             'search'   => 'nullable|string',
+            'sort_by'  => 'nullable|in:date,number',
+            'sort'     => 'nullable|in:asc,desc',
             'per_page' => 'nullable|integer|min:1|max:100',
             'page'     => 'nullable|integer|min:1',
         ]);
@@ -39,27 +42,77 @@ class GlobalSearchApiController extends Controller
         $perPage = min(max((int) $request->input('per_page', 15), 10), 100);
         $page = (int) $request->input('page', 1);
 
-        $results = collect();
+        $staticResults = collect();   // Arts and Structures (Always at the top)
+        $sortableResults = collect(); // Bylaws, Opinions, Precedents (Sorted if requested)
 
         if (!empty($searchTerm)) {
-            $limitPerTable = 100; // Performance safeguard
+            $limitPerTable = 100;
 
-            // 1. Search Bylaw Documents
+            // =========================================================
+            // 1. Search Arts (Exact match to ArtController)
+            // =========================================================
+            $arts = Art::with(['law.category', 'chapter', 'part', 'volum', 'book', 'section', 'gate'])
+                ->where(function ($q) use ($searchTerm) {
+                    $q->where('title', 'LIKE', "%{$searchTerm}%")
+                        ->orWhere('text', 'LIKE', "%{$searchTerm}%");
+                })
+                ->take($limitPerTable)->get()->map(function($item) use ($searchTerm) {
+                    $formatted = $this->formatArt($item, $searchTerm, Art::class);
+                    $formatted['type'] = 'art';
+                    return $formatted;
+                });
+            $staticResults = $staticResults->concat($arts);
+
+            // =========================================================
+            // 2. Search Laws and Structural Models (Exact match to ArtController)
+            // =========================================================
+            $structuralModels = [
+                Law::class, Volum::class, Book::class, Division::class,
+                Section::class, Chapter::class, Part::class, Gate::class,
+                Branch::class
+            ];
+
+            foreach ($structuralModels as $modelClass) {
+                $query = $modelClass::query();
+                $modelInstance = new $modelClass;
+                $table = $modelInstance->getTable();
+
+                $query->where('title', 'LIKE', "%{$searchTerm}%");
+
+                $items = $query->take($limitPerTable)->get()->map(function($item) use ($modelClass, $table) {
+                    $formatted = $this->formatStructure($item, $modelClass);
+                    $formatted['type'] = ($table === 'section') ? 'sections' : $table;
+                    return $formatted;
+                });
+
+                $staticResults = $staticResults->concat($items);
+            }
+
+            // =========================================================
+            // 3. Search Bylaw Documents
+            // =========================================================
             $bylaws = BylawDocument::with(['category', 'approvalAuthority', 'promulgationAuthority'])
                 ->where('is_published', true)
                 ->where(function ($q) use ($searchTerm) {
                     $q->where('title', 'LIKE', "%{$searchTerm}%")
                         ->orWhere('description', 'LIKE', "%{$searchTerm}%")
                         ->orWhere('promulgation_number', 'LIKE', "%{$searchTerm}%")
-                        ->orWhere('official_gazette_number', 'LIKE', "%{$searchTerm}%");
+                        ->orWhere('official_gazette_number', 'LIKE', "%{$searchTerm}%")
+                        ->orWhereIn('id', function($subQuery) use ($searchTerm) {
+                            $subQuery->select('document_id')
+                                ->from('bylaw_nodes')
+                                ->where('node_content', 'LIKE', "%{$searchTerm}%");
+                        });
                 })->take($limitPerTable)->get()->map(function($item) {
                     $formatted = $this->formatBylaw($item);
                     $formatted['type'] = 'bylaw';
                     return $formatted;
                 });
-            $results = $results->merge($bylaws);
+            $sortableResults = $sortableResults->concat($bylaws);
 
-            // 2. Search Judicial Precedents
+            // =========================================================
+            // 4. Search Judicial Precedents
+            // =========================================================
             $judicials = JudicialPrecedent::with('category')
                 ->where(function ($q) use ($searchTerm) {
                     $q->where('ruling_number', 'LIKE', "%{$searchTerm}%")
@@ -70,9 +123,11 @@ class GlobalSearchApiController extends Controller
                     $formatted['type'] = 'judicial_precedent';
                     return $formatted;
                 });
-            $results = $results->merge($judicials);
+            $sortableResults = $sortableResults->concat($judicials);
 
-            // 3. Search Legal Opinions
+            // =========================================================
+            // 5. Search Legal Opinions
+            // =========================================================
             $opinions = LegalOpinion::with('category')
                 ->where(function ($q) use ($searchTerm) {
                     $q->where('opinion_number', 'LIKE', "%{$searchTerm}%")
@@ -84,49 +139,44 @@ class GlobalSearchApiController extends Controller
                     $formatted['type'] = 'legal_opinion';
                     return $formatted;
                 });
-            $results = $results->merge($opinions);
+            $sortableResults = $sortableResults->concat($opinions);
+        }
 
-            // 4. Search Laws, Arts, and Structural Models
-            $structuralModels = [
-                Law::class, Volum::class, Book::class, Division::class,
-                Section::class, Chapter::class, Part::class, Gate::class,
-                Branch::class, Art::class,
-            ];
+        // --- Apply Dynamic Memory Sorting ONLY to Legal Docs ---
+        if ($request->has('sort_by') && $request->input('sort_by') != null) {
+            $sortBy = $request->input('sort_by');
+            $sortOrder = $request->input('sort', 'desc');
 
-            foreach ($structuralModels as $modelClass) {
-                $query = $modelClass::query();
-                $modelInstance = new $modelClass;
-                $table = $modelInstance->getTable();
+            if ($sortBy === 'number') {
+                $sortCallback = function ($item) {
+                    return (string) ($item['promulgation_number'] ?? $item['ruling_number'] ?? $item['opinion_number'] ?? '0');
+                };
 
-                if ($table === 'art') {
-                    $query->where('title', 'LIKE', "%{$searchTerm}%")
-                        ->orWhere('text', 'LIKE', "%{$searchTerm}%");
+                if ($sortOrder === 'asc') {
+                    $sortableResults = $sortableResults->sortBy($sortCallback, SORT_NATURAL)->values();
                 } else {
-                    $query->where('title', 'LIKE', "%{$searchTerm}%");
+                    $sortableResults = $sortableResults->sortByDesc($sortCallback, SORT_NATURAL)->values();
                 }
+            } elseif ($sortBy === 'date') {
+                $sortCallback = function ($item) {
+                    return (string) ($item['approval_date'] ?? $item['ruling_date'] ?? $item['opinion_date'] ?? '1970-01-01');
+                };
 
-                $items = $query->take($limitPerTable)->get()->map(function($item) use ($modelClass, $table, $searchTerm) {
-                    if ($table === 'art') {
-                        $formatted = $this->formatArt($item, $searchTerm, $modelClass);
-                        $formatted['type'] = 'art';
+                if ($sortOrder === 'asc') {
+                    $sortableResults = $sortableResults->sortBy($sortCallback)->values();
                 } else {
-                        $formatted = $this->formatStructure($item, $modelClass);
-                        // Standardize the structural type names (laws, sections, etc.)
-                        $formatted['type'] = ($table === 'section') ? 'sections' : $table;
+                    $sortableResults = $sortableResults->sortByDesc($sortCallback)->values();
                 }
-                    return $formatted;
-                });
-
-                $results = $results->merge($items);
             }
         }
 
-        // --- Execute Manual Pagination on the Combined Collection ---
+        // Combine Results: Arts and Structures ALWAYS pin to the top!
+        $results = $staticResults->concat($sortableResults);
+
+        // --- Execute Manual Pagination on the final Collection ---
         $total = $results->count();
-        // Slice the array for the exact page requested
         $paginatedItems = $results->forPage($page, $perPage)->values();
 
-        // Build a proper Laravel paginator object so the response metadata remains identical
         $paginator = new LengthAwarePaginator(
             $paginatedItems,
             $total,
@@ -143,15 +193,148 @@ class GlobalSearchApiController extends Controller
             'total'        => $paginator->total(),
         ];
 
-        return $this->success($responseData, 'Success', 'Global Search Results Fetched');
+        return $this->success($responseData, '', '');
+    }
+
+    /**
+     * Top-level fast search for quick dropdown UI elements
+     */
+    public function fast_search(Request $request)
+    {
+        $searchTerm = $request->input('search');
+        $results = collect();
+        $totalCount = 0;
+
+        $limitPerTable = 3;
+
+        if (!empty($searchTerm)) {
+
+            // 1. Search Arts FIRST
+            $artQuery = Art::with(['law', 'law.category', 'chapter', 'part', 'volum', 'book', 'section', 'gate'])
+                ->where(function ($q) use ($searchTerm) {
+                    $q->where('title', 'LIKE', "%{$searchTerm}%")
+                        ->orWhere('text', 'LIKE', "%{$searchTerm}%");
+                });
+            $totalCount += $artQuery->count();
+            $arts = $artQuery->take($limitPerTable)->get()->map(function($item) use ($searchTerm) {
+                $formatted = $this->formatArt($item, $searchTerm, Art::class);
+                $formatted['type'] = 'art';
+                return $formatted;
+            });
+            $results = $results->concat($arts);
+
+            // 2. Structural Models
+            $structuralModels = [
+                Law::class, Volum::class, Book::class, Division::class,
+                Section::class, Chapter::class, Part::class, Gate::class,
+                Branch::class
+            ];
+
+            foreach ($structuralModels as $modelClass) {
+                $query = $modelClass::query();
+                $modelInstance = new $modelClass;
+                $table = $modelInstance->getTable();
+
+                $query->where('title', 'LIKE', "%{$searchTerm}%");
+
+                $totalCount += $query->count();
+
+                if ($results->count() < 15) {
+                    $items = $query->take($limitPerTable)->get()->map(function($item) use ($modelClass, $table) {
+                        $formatted = $this->formatStructure($item, $modelClass);
+                        $formatted['type'] = ($table === 'section') ? 'sections' : $table;
+                        return $formatted;
+                    });
+                    $results = $results->concat($items);
+                }
+            }
+
+            // 3. Bylaw Documents
+            $bylawQuery = BylawDocument::with(['category', 'approvalAuthority', 'promulgationAuthority'])
+                ->where('is_published', true)
+                ->where(function ($q) use ($searchTerm) {
+                    $q->where('title', 'LIKE', "%{$searchTerm}%")
+                        ->orWhere('description', 'LIKE', "%{$searchTerm}%")
+                        ->orWhere('promulgation_number', 'LIKE', "%{$searchTerm}%")
+                        ->orWhere('official_gazette_number', 'LIKE', "%{$searchTerm}%")
+                        ->orWhereIn('id', function($subQuery) use ($searchTerm) {
+                            $subQuery->select('document_id')
+                                ->from('bylaw_nodes')
+                                ->where('node_content', 'LIKE', "%{$searchTerm}%");
+                        });
+                });
+            $totalCount += $bylawQuery->count();
+            $bylaws = $bylawQuery->take($limitPerTable)->get()->map(function($item) {
+                $formatted = $this->formatBylaw($item);
+                $formatted['type'] = 'bylaw';
+                return $formatted;
+            });
+            $results = $results->concat($bylaws);
+
+            // 4. Judicial Precedents
+            $judicialQuery = JudicialPrecedent::with('category')
+                ->where(function ($q) use ($searchTerm) {
+                    $q->where('ruling_number', 'LIKE', "%{$searchTerm}%")
+                        ->orWhere('subject', 'LIKE', "%{$searchTerm}%")
+                        ->orWhere('full_text', 'LIKE', "%{$searchTerm}%");
+                });
+            $totalCount += $judicialQuery->count();
+            $judicials = $judicialQuery->take($limitPerTable)->get()->map(function($item) {
+                $formatted = $this->formatJudicial($item);
+                $formatted['type'] = 'judicial_precedent';
+                return $formatted;
+            });
+            $results = $results->concat($judicials);
+
+            // 5. Legal Opinions
+            $opinionQuery = LegalOpinion::with('category')
+                ->where(function ($q) use ($searchTerm) {
+                    $q->where('opinion_number', 'LIKE', "%{$searchTerm}%")
+                        ->orWhere('subject', 'LIKE', "%{$searchTerm}%")
+                        ->orWhere('full_text', 'LIKE', "%{$searchTerm}%")
+                        ->orWhere('issuing_authority', 'LIKE', "%{$searchTerm}%");
+                });
+            $totalCount += $opinionQuery->count();
+            $opinions = $opinionQuery->take($limitPerTable)->get()->map(function($item) {
+                $formatted = $this->formatOpinion($item);
+                $formatted['type'] = 'legal_opinion';
+                return $formatted;
+            });
+            $results = $results->concat($opinions);
+        }
+
+        return $this->success([
+            'items' => $results->take(15)->values(),
+            'count' => $totalCount
+        ], '', '');
     }
 
     /* -----------------------------------------------------------------
      * FORMATTING HELPERS
      * ----------------------------------------------------------------- */
 
+    private function isLockedForCurrentUserGeneric($item): bool
+    {
+        return ! auth()->user()->isSubscriber() && (bool) ($item->is_locked ?? false);
+    }
+
     private function formatBylaw($item)
     {
+        $isLocked = $this->isLockedForCurrentUserGeneric($item);
+        $description = $item->description;
+
+        $cleanDesc = trim(strip_tags($description ?? ''));
+
+        if (empty($cleanDesc)) {
+            $nodeContents = DB::table('bylaw_nodes')
+                ->where('document_id', $item->id)
+                ->orderBy('sort_order', 'asc')
+                ->pluck('node_content')
+                ->toArray();
+
+            $description = implode("\n\n", array_filter($nodeContents));
+        }
+
         return [
             'id'                        => $item->id,
             'title'                     => $item->title,
@@ -159,46 +342,56 @@ class GlobalSearchApiController extends Controller
             'approval_authority_name'   => optional($item->approvalAuthority)->name,
             'approval_date'             => $item->approval_date,
             'promulgation_number'       => $item->promulgation_number,
-            'description'               => $item->description,
+            'description'               => $isLocked ? null : $description,
+            'is_locked'                 => $isLocked,
         ];
     }
 
     private function formatJudicial($item)
     {
+        $isLocked = $this->isLockedForCurrentUserGeneric($item);
+
         return [
             'id'                => $item->id,
-            'title'             => $item->subject, // Map subject to title for universal UI parsing
+            'title'             => $item->subject,
             'ruling_number'     => $item->ruling_number,
             'ruling_date'       => $item->ruling_date,
-            'text'              => $item->full_text,
+            'text'              => $isLocked ? null : $item->full_text,
             'issuing_authority' => $item->issuing_authority,
             'category_name'     => optional($item->category)->name,
+            'is_locked'         => $isLocked,
         ];
     }
 
     private function formatOpinion($item)
     {
+        $isLocked = $this->isLockedForCurrentUserGeneric($item);
+
         return [
             'id'                => $item->id,
-            'title'             => $item->subject, // Map subject to title for universal UI parsing
+            'title'             => $item->subject,
             'opinion_number'    => $item->opinion_number,
             'opinion_date'      => $item->opinion_date,
-            'text'              => $item->full_text,
+            'text'              => $isLocked ? null : $item->full_text,
             'issuing_authority' => $item->issuing_authority,
             'category_name'     => optional($item->category)->name,
+            'is_locked'         => $isLocked,
         ];
     }
 
+    /**
+     * Exact 1:1 match with ArtController::searchModel mapping
+     * All relations (law, chapter, etc) are strictly Strings to prevent App Crashes!
+     */
     private function formatArt($item, $searchTerm, $modelClass)
     {
-        $law = Law::find($item->law_id);
-        $isLocked = $this->isLockedForCurrentUser($law);
+        $law = $item->law ?? Law::find($item->law_id);
+        $isLocked = ! auth()->user()->isSubscriber() && (bool) ($law?->is_locked ?? false);
 
-        // Text snippet highlighting logic (from ArtController)
         $text = $item->text ?? '';
         $searchQuoted = preg_quote($searchTerm, '/');
-        if (!empty($text) && preg_match('/\b(.{0,50})\b('.$searchQuoted.')\b(.{0,50})\b/i', $text, $matches)) {
-            $context = trim($matches[1] ?? '') . ' ' . $matches[2] . ' ' . trim($matches[3] ?? '');
+        if (!empty($searchTerm) && preg_match('/\b(.{0,50})\b('.$searchQuoted.')\b(.{0,50})\b/i', $text, $matches)) {
+            $context = trim($matches[1] ?? '').' '.($matches[2] ?? '').' '.trim($matches[3] ?? '');
         } else {
             $context = $text;
         }
@@ -206,13 +399,15 @@ class GlobalSearchApiController extends Controller
         return [
             'id'           => $item->id,
             'title'        => $item->title,
+            'number'       => $item->number,
             'text'         => $isLocked ? null : $context,
             'is_locked'    => $isLocked,
             'route'        => array_values($this->route($modelClass, $item)),
-            'category'    => optional($law->category)->name,
-            'law'         => $law?->title,
+            'category'     => optional($law?->category)->name,
+            'law'          => $law?->title ?? '', // STRICLY STRING! Prevents Android App Crash!
             'count_art'    => $law?->arts?->count() ?? 0,
-            'count_volums'=> $law?->volums?->count() ?? 0,
+            'count_volums' => $law?->volums?->count() ?? 0, // WITH S
+            'count_volum'  => $law?->volums?->count() ?? 0, // WITHOUT S (Fallback)
             'price'        => $law?->price,
             'image'        => $law?->image,
         ];
@@ -221,7 +416,7 @@ class GlobalSearchApiController extends Controller
     private function formatStructure($item, $modelClass)
     {
         $law = Law::find($item?->law_id ?? $item->id);
-        $isLocked = $this->isLockedForCurrentUser($law);
+        $isLocked = ! auth()->user()->isSubscriber() && (bool) ($law?->is_locked ?? false);
 
         $payload = [
             'id'        => $item->id,
@@ -229,7 +424,7 @@ class GlobalSearchApiController extends Controller
             'number'    => $item->number,
             'is_locked' => $isLocked,
             'route'     => array_values($this->route($modelClass, $item)),
-            'law'       => $law?->title ?? '',
+            'law'       => $law?->title ?? '', // STRICTLY STRING
         ];
 
         if ((new $modelClass)->getTable() == 'laws') {
@@ -240,27 +435,18 @@ class GlobalSearchApiController extends Controller
         return $payload;
     }
 
-    /* -----------------------------------------------------------------
-     * UTILITY METHODS
-     * ----------------------------------------------------------------- */
-
-    private function isLockedForCurrentUser(?Law $law): bool
-    {
-        return ! auth()->user()->isSubscriber() && (bool) $law?->is_locked;
-    }
-
     private function route($modelClass, $query)
     {
         if ((new $modelClass)->getTable() == 'art') {
             $route = array_filter([
-                Law::find($query->law_id)?->title,
-                Volum::find($query->volum_id)?->title,
-                Book::find($query->book_id)?->title,
+                $query->relationLoaded('law') ? $query->law?->title : Law::find($query->law_id)?->title,
+                $query->relationLoaded('volum') ? $query->volum?->title : Volum::find($query->volum_id)?->title,
+                $query->relationLoaded('book') ? $query->book?->title : Book::find($query->book_id)?->title,
                 Division::find($query->division_id)?->title,
-                Section::find($query->section_id)?->title,
-                Chapter::find($query->chapter_id)?->title,
-                Part::find($query->part_id)?->title,
-                Gate::find($query->gate_id)?->title,
+                $query->relationLoaded('section') ? $query->section?->title : Section::find($query->section_id)?->title,
+                $query->relationLoaded('chapter') ? $query->chapter?->title : Chapter::find($query->chapter_id)?->title,
+                $query->relationLoaded('part') ? $query->part?->title : Part::find($query->part_id)?->title,
+                $query->relationLoaded('gate') ? $query->gate?->title : Gate::find($query->gate_id)?->title,
                 Branch::find($query->branch_id)?->title,
             ]);
             return array_values($route);

app/Http/Controllers/api/HomeController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\api;
 use App\Http\Controllers\Controller;
 use App\Models\Law;
 use App\Models\Notification;
+use App\Models\Category;
 use App\Models\RecentArt;
 use App\Models\UserSubscriber;
 use App\Services\AppMarketPurchaseVerifier;

app/Http/Controllers/api/JudicialPrecedentApiController.php

@@ -28,6 +28,7 @@ class JudicialPrecedentApiController extends Controller
     {
         $request->validate([
             'category_id' => 'nullable|exists:judicial_precedent_categories,id',
+            'sort_by'     => 'nullable|in:date,number',
             'sort'        => 'nullable|in:asc,desc',
             'per_page'    => 'nullable|integer|min:1|max:100',
         ]);
@@ -38,8 +39,16 @@ class JudicialPrecedentApiController extends Controller
             $query->where('category_id', $request->category_id);
         }
 
+        $sortBy = $request->input('sort_by', 'date');
         $sortOrder = $request->input('sort', 'desc');
-        $query->orderBy('ruling_date', $sortOrder);
+        $sortColumn = $sortBy === 'number' ? 'ruling_number' : 'ruling_date';
+
+        if ($sortBy === 'number') {
+            // Natural numeric sorting for string numbers
+            $query->orderByRaw("LENGTH({$sortColumn}) {$sortOrder}")->orderBy($sortColumn, $sortOrder);
+        } else {
+            $query->orderBy($sortColumn, $sortOrder);
+        }
 
         $perPage = min(max((int) $request->input('per_page', 15), 10), 100);
         $paginator = $query->paginate($perPage);
@@ -59,13 +68,12 @@ class JudicialPrecedentApiController extends Controller
         return $this->success($responseData, 'Success', 'Judicial Precedents Fetched');
     }
 
-    /**
-     * Search Judicial Precedents by Keyword
-     */
     public function search(Request $request)
     {
         $request->validate([
             'search'   => 'nullable|string',
+            'sort_by'  => 'nullable|in:date,number',
+            'sort'     => 'nullable|in:asc,desc',
             'per_page' => 'nullable|integer|min:1|max:100',
         ]);
 
@@ -81,8 +89,18 @@ class JudicialPrecedentApiController extends Controller
             });
         }
 
+        $sortBy = $request->input('sort_by', 'date');
+        $sortOrder = $request->input('sort', 'desc');
+        $sortColumn = $sortBy === 'number' ? 'ruling_number' : 'ruling_date';
+
+        if ($sortBy === 'number') {
+            $query->orderByRaw("LENGTH({$sortColumn}) {$sortOrder}")->orderBy($sortColumn, $sortOrder);
+        } else {
+            $query->orderBy($sortColumn, $sortOrder);
+        }
+
         $perPage = min(max((int) $request->input('per_page', 15), 10), 100);
-        $paginator = $query->orderBy('ruling_date', 'desc')->paginate($perPage);
+        $paginator = $query->paginate($perPage);
 
         $items = collect($paginator->items())->map(function ($item) {
             return $this->formatItem($item);
@@ -99,6 +117,30 @@ class JudicialPrecedentApiController extends Controller
         return $this->success($responseData, 'Success', 'Search Results Fetched');
     }
 
+    public function fast_search(Request $request)
+    {
+        $searchTerm = $request->input('search');
+        $query = JudicialPrecedent::query();
+
+        if (!empty($searchTerm)) {
+            $query->where(function ($q) use ($searchTerm) {
+                $q->where('ruling_number', 'LIKE', "%{$searchTerm}%")
+                    ->orWhere('subject', 'LIKE', "%{$searchTerm}%")
+                    ->orWhere('full_text', 'LIKE', "%{$searchTerm}%");
+            });
+        }
+
+        $count = $query->count();
+        $items = $query->orderBy('ruling_date', 'desc')->take(5)->get()->map(function ($item) {
+            return $this->formatItem($item);
+        });
+
+        return $this->success([
+            'items' => $items,
+            'count' => $count
+        ], 'Success', 'Fast Search Results');
+    }
+
     public function pager($id)
     {
         $current = JudicialPrecedent::find($id);
@@ -141,20 +183,25 @@ class JudicialPrecedentApiController extends Controller
         return $this->success($results, 'Success', 'Pager Window Details');
     }
 
-    /**
-     * Helper method to format payload uniformly
-     */
+    private function isLockedForCurrentUser($item): bool
+    {
+        return ! auth()->user()->isSubscriber() && (bool) ($item->is_locked ?? false);
+    }
+
     private function formatItem($item)
     {
+        $isLocked = $this->isLockedForCurrentUser($item);
+
         return [
             'id'                => $item->id,
             'ruling_number'     => $item->ruling_number,
             'ruling_date'       => $item->ruling_date,
             'subject'           => $item->subject,
-            'full_text'         => $item->full_text,
+            'full_text'         => $isLocked ? null : $item->full_text,
             'issuing_authority' => $item->issuing_authority,
             'category_id'       => $item->category_id,
             'category_name'     => optional($item->category)->name,
+            'is_locked'         => $isLocked,
         ];
     }
 }

app/Http/Controllers/api/LegalOpinionApiController.php

@@ -28,6 +28,7 @@ class LegalOpinionApiController extends Controller
     {
         $request->validate([
             'category_id' => 'nullable|exists:legal_opinion_categories,id',
+            'sort_by'     => 'nullable|in:date,number',
             'sort'        => 'nullable|in:asc,desc',
             'per_page'    => 'nullable|integer|min:1|max:100',
         ]);
@@ -38,8 +39,15 @@ class LegalOpinionApiController extends Controller
             $query->where('category_id', $request->category_id);
         }
 
+        $sortBy = $request->input('sort_by', 'date');
         $sortOrder = $request->input('sort', 'desc');
-        $query->orderBy('opinion_date', $sortOrder);
+        $sortColumn = $sortBy === 'number' ? 'opinion_number' : 'opinion_date';
+
+        if ($sortBy === 'number') {
+            $query->orderByRaw("LENGTH({$sortColumn}) {$sortOrder}")->orderBy($sortColumn, $sortOrder);
+        } else {
+            $query->orderBy($sortColumn, $sortOrder);
+        }
 
         $perPage = min(max((int) $request->input('per_page', 15), 10), 100);
         $paginator = $query->paginate($perPage);
@@ -59,13 +67,12 @@ class LegalOpinionApiController extends Controller
         return $this->success($responseData, 'Success', 'Legal Opinions Fetched');
     }
 
-    /**
-     * Search Legal Opinions by Keyword
-     */
     public function search(Request $request)
     {
         $request->validate([
             'search'   => 'nullable|string',
+            'sort_by'  => 'nullable|in:date,number',
+            'sort'     => 'nullable|in:asc,desc',
             'per_page' => 'nullable|integer|min:1|max:100',
         ]);
 
@@ -82,8 +89,18 @@ class LegalOpinionApiController extends Controller
             });
         }
 
+        $sortBy = $request->input('sort_by', 'date');
+        $sortOrder = $request->input('sort', 'desc');
+        $sortColumn = $sortBy === 'number' ? 'opinion_number' : 'opinion_date';
+
+        if ($sortBy === 'number') {
+            $query->orderByRaw("LENGTH({$sortColumn}) {$sortOrder}")->orderBy($sortColumn, $sortOrder);
+        } else {
+            $query->orderBy($sortColumn, $sortOrder);
+        }
+
         $perPage = min(max((int) $request->input('per_page', 15), 10), 100);
-        $paginator = $query->orderBy('opinion_date', 'desc')->paginate($perPage);
+        $paginator = $query->paginate($perPage);
 
         $items = collect($paginator->items())->map(function ($item) {
             return $this->formatItem($item);
@@ -100,6 +117,31 @@ class LegalOpinionApiController extends Controller
         return $this->success($responseData, 'Success', 'Search Results Fetched');
     }
 
+    public function fast_search(Request $request)
+    {
+        $searchTerm = $request->input('search');
+        $query = LegalOpinion::query();
+
+        if ($request->filled('search')) {
+            $query->where(function ($q) use ($searchTerm) {
+                $q->where('opinion_number', 'LIKE', "%{$searchTerm}%")
+                    ->orWhere('subject', 'LIKE', "%{$searchTerm}%")
+                    ->orWhere('full_text', 'LIKE', "%{$searchTerm}%")
+                    ->orWhere('issuing_authority', 'LIKE', "%{$searchTerm}%");
+            });
+        }
+
+        $count = $query->count();
+        $items = $query->orderBy('opinion_date', 'desc')->take(5)->get()->map(function ($item) {
+            return $this->formatItem($item);
+        });
+
+        return $this->success([
+            'items' => $items,
+            'count' => $count
+        ], 'Success', 'Fast Search Results');
+    }
+
     public function pager($id)
     {
         $current = LegalOpinion::find($id);
@@ -153,20 +195,25 @@ class LegalOpinionApiController extends Controller
         return $this->success($results, 'Success', 'Pager Window Details');
     }
 
-    /**
-     * Helper method to format payload uniformly
-     */
+    private function isLockedForCurrentUser($item): bool
+    {
+        return ! auth()->user()->isSubscriber() && (bool) ($item->is_locked ?? false);
+    }
+
     private function formatItem($item)
     {
+        $isLocked = $this->isLockedForCurrentUser($item);
+
         return [
             'id'                => $item->id,
             'opinion_number'    => $item->opinion_number,
             'opinion_date'      => $item->opinion_date,
             'subject'           => $item->subject,
-            'full_text'         => $item->full_text,
+            'full_text'         => $isLocked ? null : $item->full_text,
             'issuing_authority' => $item->issuing_authority,
             'category_id'       => $item->category_id,
             'category_name'     => optional($item->category)->name,
+            'is_locked'         => $isLocked,
         ];
     }
 }

routes/api.php

@@ -25,7 +25,6 @@ Route::prefix('v1')->group(function () {
     Route::post('verify', [AuthController::class, 'verify']);
     Route::post('version', [VersionController::class, 'index']);
     Route::post('/payment/callback', [SubscribePlanController::class, 'paymentCallback'])->name('payment.callback');
-
 });
 
 Route::prefix('v1')->middleware('auth:sanctum')->group(function () {
@@ -35,7 +34,7 @@ Route::prefix('v1')->middleware('auth:sanctum')->group(function () {
     Route::get('art', [ArtController::class, 'index']);
     Route::get('categories', [CategoriesController::class, 'index']);
     Route::post('art/search', [ArtController::class, 'search']);
-    Route::post('fast-search', [ArtController::class, 'fash_search']);
+    Route::post('fast-search', [ArtController::class, 'fash_search']); // Legacy Art fast search
     Route::post('art/note', [NoteController::class, 'create']);
     Route::put('art/note/{id}', [NoteController::class, 'update']);
     Route::delete('art/note/{id}', [NoteController::class, 'destroy']);
@@ -71,25 +70,29 @@ Route::prefix('v1')->middleware('auth:sanctum')->group(function () {
 
     Route::post('suggestions', [SuggestionController::class, 'index']);
 
-
+    // Judicial Precedents
     Route::get('judicial-precedents/categories', [\App\Http\Controllers\api\JudicialPrecedentApiController::class, 'categories']);
     Route::get('judicial-precedents', [\App\Http\Controllers\api\JudicialPrecedentApiController::class, 'index']);
     Route::get('judicial-precedents/{id}/pager', [\App\Http\Controllers\api\JudicialPrecedentApiController::class, 'pager']);
-    Route::post('judicial-precedents/search', [\App\Http\Controllers\api\JudicialPrecedentApiController::class, 'search']); // NEW
+    Route::post('judicial-precedents/search', [\App\Http\Controllers\api\JudicialPrecedentApiController::class, 'search']);
+    Route::post('judicial-precedents/fast-search', [\App\Http\Controllers\api\JudicialPrecedentApiController::class, 'fast_search']); // NEW
 
+    // Legal Opinions
     Route::get('legal-opinions/categories', [\App\Http\Controllers\api\LegalOpinionApiController::class, 'categories']);
     Route::get('legal-opinions', [\App\Http\Controllers\api\LegalOpinionApiController::class, 'index']);
     Route::get('legal-opinions/{id}/pager', [\App\Http\Controllers\api\LegalOpinionApiController::class, 'pager']);
-    Route::post('legal-opinions/search', [\App\Http\Controllers\api\LegalOpinionApiController::class, 'search']); // NEW
+    Route::post('legal-opinions/search', [\App\Http\Controllers\api\LegalOpinionApiController::class, 'search']);
+    Route::post('legal-opinions/fast-search', [\App\Http\Controllers\api\LegalOpinionApiController::class, 'fast_search']); // NEW
 
+    // Bylaws
     Route::get('bylaws/categories', [\App\Http\Controllers\api\BylawApiController::class, 'categories']);
     Route::get('bylaws/authorities', [\App\Http\Controllers\api\BylawApiController::class, 'authorities']);
     Route::get('bylaws', [\App\Http\Controllers\api\BylawApiController::class, 'index']);
     Route::get('bylaws/{id}/pager', [\App\Http\Controllers\api\BylawApiController::class, 'pager']);
     Route::post('bylaws/search', [\App\Http\Controllers\api\BylawApiController::class, 'search']);
+    Route::post('bylaws/fast-search', [\App\Http\Controllers\api\BylawApiController::class, 'fast_search']); // NEW
 
-
-
+    // Global Search
     Route::post('global-search', [\App\Http\Controllers\api\GlobalSearchApiController::class, 'search']);
-
+    Route::post('global-search/fast-search', [\App\Http\Controllers\api\GlobalSearchApiController::class, 'fast_search']); // NEW
 });