openinfra
/
openstackid-resources
Code Issues Proposed changes

Updated 

GET api/v1/summits/{id}/selection-plans/{selection_plan_id}/presentations/all/category-change-requests
filtering

added

presentation_title

ordering

added

* presentation_title
* new_category_title
* old_category_title
* requester_fullname

Change-Id: I8b85aefcfaeeb17281471999dd5b5d421bb6022b
Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
smarcet 2021-03-09 13:39:12 -03:00
parent d4b4a05eef
commit 384e6a3c52
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitSelectionPlansApiController.php
View File

@ -565,6 +565,7 @@ final class OAuth2SummitSelectionPlansApiController extends OAuth2ProtectedContr
'requester_email' => ['=@', '=='],
'aprover_fullname' => ['=@', '=='],
'aprover_email' => ['=@', '=='],
'presentation_title' => ['=@', '=='],
];
},
function () {
@ -578,13 +579,18 @@ final class OAuth2SummitSelectionPlansApiController extends OAuth2ProtectedContr
'requester_fullname' => 'sometimes|string',
'aprover_fullname' => 'sometimes|string',
'aprover_email' => 'sometimes|string',
'presentation_title' => 'sometimes|string',
];
},
function () {
return [
'id',
'approval_date',
'status'
'status',
'presentation_title',
'new_category_title',
'old_category_title',
'requester_fullname',
];
},
function ($filter) use ($summit, $selection_plan_id) {

6
app/ModelSerializers/Summit/Presentation/SummitCategoryChangeSerializer.php
View File

@ -52,7 +52,11 @@ final class SummitCategoryChangeSerializer extends SilverStripeSerializer
case 'presentation':
{
unset($values['presentation_id']);
$values['presentation'] = SerializerRegistry::getInstance()->getSerializer($request->getPresentation())->serialize(AbstractSerializer::filterExpandByPrefix($expand, $relation));
$values['presentation'] = SerializerRegistry::getInstance()->getSerializer
(
$request->getPresentation(),
IPresentationSerializerTypes::TrackChairs
)->serialize(AbstractSerializer::filterExpandByPrefix($expand, $relation));
}
break;
case 'new_category':

5
app/Repositories/Summit/DoctrineSummitCategoryChangeRepository.php
View File

@ -59,6 +59,7 @@ final class DoctrineSummitCategoryChangeRepository
'old_category_id' => 'ocat.id',
'new_category_title' => 'ncat.title',
'old_category_title' => 'ocat.title',
'presentation_title' => 'p.title',
'requester_fullname' => "concat(r.first_name, ' ', r.last_name) :operator :value",
'requester_email' => 'r.email',
'aprover_fullname' => "concat(a.first_name, ' ', a.last_name) :operator :value",
@ -75,7 +76,11 @@ final class DoctrineSummitCategoryChangeRepository
return [
'id' => 'e.id',
'approval_date' => 'e.approval_date',
'presentation_title' => 'p.id',
'status' => 'e.status',
'new_category_title' => 'ncat.title',
'old_category_title' => 'ocat.title',
'requester_fullname' => "concat(r.first_name, ' ', r.last_name)",
];
}
}

1
tests/OAuth2SelectionPlansApiTest.php
View File

@ -720,6 +720,7 @@ final class OAuth2SelectionPlansApiTest extends ProtectedApiTest
'summit' => self::$summit->getId(),
'selection_plan_id' => self::$default_selection_plan->getId(),
'expand' => 'presentation, new_category, old_category',
'order' => '+requester_fullname'
];
$response = $this->action(