From a95826e5e5902bed09fcb02c372711e7645143b3 Mon Sep 17 00:00:00 2001 From: "m.razaghi" Date: Sun, 12 Jul 2026 12:43:28 +0330 Subject: [PATCH 1/2] Fixed api issue --- .../Controllers/api/BylawApiController.php | 16 ++++++++---- .../api/GlobalSearchApiController.php | 25 +++++++++++++------ 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/api/BylawApiController.php b/app/Http/Controllers/api/BylawApiController.php index 16dbf13..3527c87 100644 --- a/app/Http/Controllers/api/BylawApiController.php +++ b/app/Http/Controllers/api/BylawApiController.php @@ -10,6 +10,7 @@ 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 { @@ -309,13 +310,18 @@ class BylawApiController extends Controller $description = $item->description; - // Direct Query Fallback: If description is empty, fetch node_content manually - if (empty($description)) { - $description = BylawNode::where('document_id', $item->id) + // Check if description is practically empty (null, empty string, or just empty WYSIWYG HTML like

) + $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') - ->filter() - ->implode("\n\n"); + ->toArray(); + + $description = implode("\n\n", array_filter($nodeContents)); } return [ diff --git a/app/Http/Controllers/api/GlobalSearchApiController.php b/app/Http/Controllers/api/GlobalSearchApiController.php index bb2722c..405b40c 100644 --- a/app/Http/Controllers/api/GlobalSearchApiController.php +++ b/app/Http/Controllers/api/GlobalSearchApiController.php @@ -7,7 +7,6 @@ use App\Models\Art; use App\Models\Book; use App\Models\Branch; use App\Models\BylawDocument; -use App\Models\BylawNode; use App\Models\Chapter; use App\Models\Division; use App\Models\Gate; @@ -20,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 { @@ -48,7 +48,7 @@ class GlobalSearchApiController extends Controller $limitPerTable = 100; // Performance safeguard // 1. Search Bylaw Documents - $bylaws = BylawDocument::with(['category', 'approvalAuthority', 'promulgationAuthority', 'nodes']) + $bylaws = BylawDocument::with(['category', 'approvalAuthority', 'promulgationAuthority']) ->where('is_published', true) ->where(function ($q) use ($searchTerm) { $q->where('title', 'LIKE', "%{$searchTerm}%") @@ -94,7 +94,7 @@ class GlobalSearchApiController extends Controller }); $results = $results->merge($opinions); - // 4. Search Arts (Removed missing 'division' and 'branch' from eager load) + // 4. Search Arts $arts = Art::with(['law.category', 'chapter', 'part', 'volum', 'book', 'section', 'gate']) ->where(function ($q) use ($searchTerm) { $q->where('title', 'LIKE', "%{$searchTerm}%") @@ -202,7 +202,7 @@ class GlobalSearchApiController extends Controller if (!empty($searchTerm)) { // 1. Bylaw Documents - $bylawQuery = BylawDocument::with(['category', 'approvalAuthority', 'promulgationAuthority', 'nodes']) + $bylawQuery = BylawDocument::with(['category', 'approvalAuthority', 'promulgationAuthority']) ->where('is_published', true) ->where(function ($q) use ($searchTerm) { $q->where('title', 'LIKE', "%{$searchTerm}%") @@ -321,8 +321,19 @@ class GlobalSearchApiController extends Controller $isLocked = $this->isLockedForCurrentUserGeneric($item); $description = $item->description; - if (empty($description) && $item->relationLoaded('nodes')) { - $description = $item->nodes->pluck('node_content')->filter()->implode("\n\n"); + + // Check if description is practically empty (null, empty string, or just empty WYSIWYG HTML like

) + $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 [ @@ -463,8 +474,6 @@ class GlobalSearchApiController extends Controller private function route($modelClass, $query) { - // Safe Breadcrumb Building - Uses relation if loaded, else manual lookup. - // Explicitly forces manual lookup for division and branch to avoid crash. if ((new $modelClass)->getTable() == 'art') { $route = array_filter([ $query->relationLoaded('law') ? $query->law?->title : Law::find($query->law_id)?->title, From 737f06f68e1abd91c526de5e6362100a3d366fa8 Mon Sep 17 00:00:00 2001 From: "m.razaghi" Date: Sun, 12 Jul 2026 13:16:57 +0330 Subject: [PATCH 2/2] Fixed api issue --- .../api/GlobalSearchApiController.php | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/api/GlobalSearchApiController.php b/app/Http/Controllers/api/GlobalSearchApiController.php index 405b40c..df101cd 100644 --- a/app/Http/Controllers/api/GlobalSearchApiController.php +++ b/app/Http/Controllers/api/GlobalSearchApiController.php @@ -7,6 +7,7 @@ use App\Models\Art; use App\Models\Book; use App\Models\Branch; use App\Models\BylawDocument; +use App\Models\BylawNode; use App\Models\Chapter; use App\Models\Division; use App\Models\Gate; @@ -94,17 +95,11 @@ class GlobalSearchApiController extends Controller }); $results = $results->merge($opinions); - // 4. Search Arts + // 4. Search Arts (Optimized to mirror ArtController speed) $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}%") - ->orWhereHas('law', function ($sub) use ($searchTerm) { $sub->where('title', 'LIKE', "%{$searchTerm}%"); }) - ->orWhereHas('volum', function ($sub) use ($searchTerm) { $sub->where('title', 'LIKE', "%{$searchTerm}%"); }) - ->orWhereHas('book', function ($sub) use ($searchTerm) { $sub->where('title', 'LIKE', "%{$searchTerm}%"); }) - ->orWhereHas('section', function ($sub) use ($searchTerm) { $sub->where('title', 'LIKE', "%{$searchTerm}%"); }) - ->orWhereHas('chapter', function ($sub) use ($searchTerm) { $sub->where('title', 'LIKE', "%{$searchTerm}%"); }) - ->orWhereHas('part', function ($sub) use ($searchTerm) { $sub->where('title', 'LIKE', "%{$searchTerm}%"); }); + ->orWhere('text', 'LIKE', "%{$searchTerm}%"); }) ->take($limitPerTable)->get()->map(function($item) use ($searchTerm) { $formatted = $this->formatArt($item, $searchTerm, Art::class); @@ -258,13 +253,7 @@ class GlobalSearchApiController extends Controller $artQuery = Art::with(['law.category', 'chapter', 'part', 'volum', 'book', 'section', 'gate']) ->where(function ($q) use ($searchTerm) { $q->where('title', 'LIKE', "%{$searchTerm}%") - ->orWhere('text', 'LIKE', "%{$searchTerm}%") - ->orWhereHas('law', function ($sub) use ($searchTerm) { $sub->where('title', 'LIKE', "%{$searchTerm}%"); }) - ->orWhereHas('volum', function ($sub) use ($searchTerm) { $sub->where('title', 'LIKE', "%{$searchTerm}%"); }) - ->orWhereHas('book', function ($sub) use ($searchTerm) { $sub->where('title', 'LIKE', "%{$searchTerm}%"); }) - ->orWhereHas('section', function ($sub) use ($searchTerm) { $sub->where('title', 'LIKE', "%{$searchTerm}%"); }) - ->orWhereHas('chapter', function ($sub) use ($searchTerm) { $sub->where('title', 'LIKE', "%{$searchTerm}%"); }) - ->orWhereHas('part', function ($sub) use ($searchTerm) { $sub->where('title', 'LIKE', "%{$searchTerm}%"); }); + ->orWhere('text', 'LIKE', "%{$searchTerm}%"); }); $totalCount += $artQuery->count(); $arts = $artQuery->take($limitPerTable)->get()->map(function($item) use ($searchTerm) { @@ -407,7 +396,7 @@ class GlobalSearchApiController extends Controller 'price' => $law?->price, 'image' => $law?->image, - // Relational Objects + // Relational Objects matching ArtController exactly 'law' => $item->law != null ? [ 'id' => $item->law->id, 'title' => $item->law->title, @@ -474,6 +463,7 @@ class GlobalSearchApiController extends Controller private function route($modelClass, $query) { + // Safe Breadcrumb Building - Uses relation if loaded, else manual lookup. if ((new $modelClass)->getTable() == 'art') { $route = array_filter([ $query->relationLoaded('law') ? $query->law?->title : Law::find($query->law_id)?->title,