soheilkhaledabadi/law-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated apis

Browse Source
This commit is contained in:
m.razaghi
2026-07-10 13:38:47 +03:30
parent 3b47d78ee8
commit d19d4b8667
4 changed files with 105 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Http/Controllers/api/BylawApiController.php
View File

@@ -44,6 +44,7 @@ class BylawApiController extends Controller
'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',
]);
@@ -63,8 +64,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);
@@ -88,6 +96,8 @@ class BylawApiController 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',
]);
@@ -105,8 +115,18 @@ class BylawApiController extends Controller
});
}
$sortBy = $request->input('sort_by', 'date');
$sortOrder = $request->input('sort', 'desc');
$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->orderBy('approval_date', 'desc')->paginate($perPage);
$paginator = $query->paginate($perPage);
$items = collect($paginator->items())->map(function ($item) {
return $this->formatBylaw($item);
@@ -140,7 +160,6 @@ class BylawApiController extends Controller
}
$count = $query->count();
// Limit to 5 results for fast search dropdown
$items = $query->orderBy('approval_date', 'desc')->take(5)->get()->map(function ($item) {
return $this->formatBylaw($item);
});