openinfra
/
openstackid-resources
Code Issues Proposed changes

Updated filter/order param 

updated filter/order param from
title to name for tracks

Change-Id: Ib3007f7bf85a0943eca5343d7decfbbaa76a1e06
This commit is contained in:
Sebastian Marcet 2018-04-19 11:52:58 -03:00
parent 3d4a95a002
commit 2f78e6d460
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitTracksApiController.php
View File

@ -13,6 +13,7 @@
**/
use App\Http\Utils\BooleanCellFormatter;
use App\Http\Utils\EpochCellFormatter;
use App\Http\Utils\PagingConstants;
use App\Models\Foundation\Summit\Repositories\ISummitTrackRepository;
use App\Services\Model\ISummitTrackService;
use Illuminate\Support\Facades\Request;
@ -77,7 +78,7 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
$rules = [
'page' => 'integer|min:1',
'per_page' => 'required_with:page|integer|min:5|max:100',
'per_page' => sprintf('required_with:page|integer|min:%s|max:%s', PagingConstants::MinPageSize, PagingConstants::MaxPageSize),
];
try {
@ -94,7 +95,7 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
// default values
$page = 1;
$per_page = 5;
$per_page = PagingConstants::DefaultPageSize;;
if (Input::has('page')) {
$page = intval(Input::get('page'));
@ -105,13 +106,23 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
'title' => ['=@', '=='],
'name' => ['=@', '=='],
'description' => ['=@', '=='],
'code' => ['=@', '=='],
'group_name' => ['=@', '=='],
]);
}
if(is_null($filter)) $filter = new Filter();
$filter->validate([
'name' => 'sometimes|string',
'description' => 'sometimes|string',
'code' => 'sometimes|string',
'group_name' => 'sometimes|string',
]);
$order = null;
if (Input::has('order'))
@ -120,12 +131,10 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
'id',
'code',
'title'
'name'
]);
}
if(is_null($filter)) $filter = new Filter();
$data = $this->repository->getBySummit($summit, new PagingInfo($page, $per_page), $filter, $order);
return $this->ok

4
app/Repositories/Summit/DoctrineSummitTrackRepository.php
View File

@ -41,7 +41,7 @@ final class DoctrineSummitTrackRepository
protected function getFilterMappings()
{
return [
'title' => 't.title:json_string',
'name' => 't.title:json_string',
'description' => 't.description:json_string',
'code' => 't.code:json_string',
'group_name' => new DoctrineFilterMapping
@ -58,7 +58,7 @@ final class DoctrineSummitTrackRepository
{
return [
'code' => 't.code',
'title' => 't.title',
'name' => 't.title',
'id' => 't.id',
];
}