openinfra/openstackid-resources
Code Issues Proposed changes

Added endpoint to get my speaker presentations

Browse Source 
by role and selection plan

GET /api/v1/speakers/me/presentations/{role}/selection-plans/{selection_plan_id}

where role could be

* creator
* speaker
* moderator

required scopes

* /summits/read
* /summits/read/all

Change-Id: Ic99a9c3c919eb6cf6a27887834012571c15c8eb8
This commit is contained in:
Sebastian Marcet 2018-08-13 17:18:03 -03:00
parent 0e42b881bc
commit abfb97dbd0
8 changed files with 356 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

319
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitSpeakersApiController.php
View File

@ -1,4 +1,5 @@
<?php namespace App\Http\Controllers; <?php namespace App\Http\Controllers;
/** /**
* Copyright 2016 OpenStack Foundation * Copyright 2016 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -11,6 +12,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
**/ **/
use App\Models\Foundation\Summit\Repositories\ISelectionPlanRepository;
use App\Services\Model\ISummitSelectionPlanService;
use Exception; use Exception;
use Illuminate\Support\Facades\Input; use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
@ -25,6 +28,7 @@ use models\summit\IEventFeedbackRepository;
use models\summit\ISpeakerRepository; use models\summit\ISpeakerRepository;
use models\summit\ISummitEventRepository; use models\summit\ISummitEventRepository;
use models\summit\ISummitRepository; use models\summit\ISummitRepository;
use models\summit\PresentationSpeaker;
use ModelSerializers\ISerializerTypeSelector; use ModelSerializers\ISerializerTypeSelector;
use ModelSerializers\SerializerRegistry; use ModelSerializers\SerializerRegistry;
use services\model\ISpeakerService; use services\model\ISpeakerService;
@ -32,6 +36,8 @@ use utils\FilterParser;
use utils\OrderParser; use utils\OrderParser;
use utils\PagingInfo; use utils\PagingInfo;
use Illuminate\Http\Request as LaravelRequest; use Illuminate\Http\Request as LaravelRequest;
use utils\PagingResponse;
/** /**
* Class OAuth2SummitSpeakersApiController * Class OAuth2SummitSpeakersApiController
* @package App\Http\Controllers * @package App\Http\Controllers
@ -68,6 +74,12 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
*/ */
private $serializer_type_selector; private $serializer_type_selector;
/**
* @var ISelectionPlanRepository
*/
private $selection_plan_repository;
/** /**
* OAuth2SummitSpeakersApiController constructor. * OAuth2SummitSpeakersApiController constructor.
* @param ISummitRepository $summit_repository * @param ISummitRepository $summit_repository
@ -75,6 +87,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
* @param ISpeakerRepository $speaker_repository * @param ISpeakerRepository $speaker_repository
* @param IEventFeedbackRepository $event_feedback_repository * @param IEventFeedbackRepository $event_feedback_repository
* @param IMemberRepository $member_repository * @param IMemberRepository $member_repository
* @param ISelectionPlanRepository $selection_plan_repository
* @param ISpeakerService $service * @param ISpeakerService $service
* @param ISerializerTypeSelector $serializer_type_selector * @param ISerializerTypeSelector $serializer_type_selector
* @param IResourceServerContext $resource_server_context * @param IResourceServerContext $resource_server_context
@ -86,16 +99,19 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
ISpeakerRepository $speaker_repository, ISpeakerRepository $speaker_repository,
IEventFeedbackRepository $event_feedback_repository, IEventFeedbackRepository $event_feedback_repository,
IMemberRepository $member_repository, IMemberRepository $member_repository,
ISelectionPlanRepository $selection_plan_repository,
ISpeakerService $service, ISpeakerService $service,
ISerializerTypeSelector $serializer_type_selector, ISerializerTypeSelector $serializer_type_selector,
IResourceServerContext $resource_server_context IResourceServerContext $resource_server_context
) { )
{
parent::__construct($resource_server_context); parent::__construct($resource_server_context);
$this->repository = $summit_repository; $this->repository = $summit_repository;
$this->speaker_repository = $speaker_repository; $this->speaker_repository = $speaker_repository;
$this->event_repository = $event_repository; $this->event_repository = $event_repository;
$this->member_repository = $member_repository; $this->member_repository = $member_repository;
$this->event_feedback_repository = $event_feedback_repository; $this->event_feedback_repository = $event_feedback_repository;
$this->selection_plan_repository = $selection_plan_repository;
$this->service = $service; $this->service = $service;
$this->serializer_type_selector = $serializer_type_selector; $this->serializer_type_selector = $serializer_type_selector;
} }
@ -124,8 +140,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
$validation = Validator::make($values, $rules); $validation = Validator::make($values, $rules);
if ($validation->fails()) if ($validation->fails()) {
{
$messages = $validation->messages()->toArray(); $messages = $validation->messages()->toArray();
return $this->error412($messages); return $this->error412($messages);
@ -135,16 +150,14 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
$page = 1; $page = 1;
$per_page = 10; $per_page = 10;
if (Input::has('page')) if (Input::has('page')) {
{
$page = intval(Input::get('page')); $page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page')); $per_page = intval(Input::get('per_page'));
} }
$filter = null; $filter = null;
if (Input::has('filter')) if (Input::has('filter')) {
{
$filter = FilterParser::parse(Input::get('filter'), [ $filter = FilterParser::parse(Input::get('filter'), [
'first_name' => ['=@', '=='], 'first_name' => ['=@', '=='],
@ -155,8 +168,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
} }
$order = null; $order = null;
if (Input::has('order')) if (Input::has('order')) {
{
$order = OrderParser::parse(Input::get('order'), [ $order = OrderParser::parse(Input::get('order'), [
'first_name', 'first_name',
'last_name', 'last_name',
@ -170,20 +182,15 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
return $this->ok return $this->ok
( (
$result->toArray(Request::input('expand', ''),[],[],['summit_id' => $summit_id, 'published' => true, 'summit' => $summit], $serializer_type) $result->toArray(Request::input('expand', ''), [], [], ['summit_id' => $summit_id, 'published' => true, 'summit' => $summit], $serializer_type)
); );
} } catch (ValidationException $ex1) {
catch(ValidationException $ex1){
Log::warning($ex1); Log::warning($ex1);
return $this->error412($ex1->getMessages()); return $this->error412($ex1->getMessages());
} } catch (EntityNotFoundException $ex2) {
catch(EntityNotFoundException $ex2)
{
Log::warning($ex2); Log::warning($ex2);
return $this->error404(array('message'=> $ex2->getMessage())); return $this->error404(array('message' => $ex2->getMessage()));
} } catch (Exception $ex) {
catch (Exception $ex)
{
Log::error($ex); Log::error($ex);
return $this->error500($ex); return $this->error500($ex);
} }
@ -193,7 +200,8 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
* get all speakers without summit * get all speakers without summit
* @return mixed * @return mixed
*/ */
public function getAll(){ public function getAll()
{
try { try {
$values = Input::all(); $values = Input::all();
@ -205,8 +213,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
$validation = Validator::make($values, $rules); $validation = Validator::make($values, $rules);
if ($validation->fails()) if ($validation->fails()) {
{
$messages = $validation->messages()->toArray(); $messages = $validation->messages()->toArray();
return $this->error412($messages); return $this->error412($messages);
@ -216,16 +223,14 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
$page = 1; $page = 1;
$per_page = 10; $per_page = 10;
if (Input::has('page')) if (Input::has('page')) {
{
$page = intval(Input::get('page')); $page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page')); $per_page = intval(Input::get('per_page'));
} }
$filter = null; $filter = null;
if (Input::has('filter')) if (Input::has('filter')) {
{
$filter = FilterParser::parse(Input::get('filter'), [ $filter = FilterParser::parse(Input::get('filter'), [
'first_name' => ['=@', '=='], 'first_name' => ['=@', '=='],
@ -236,8 +241,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
} }
$order = null; $order = null;
if (Input::has('order')) if (Input::has('order')) {
{
$order = OrderParser::parse(Input::get('order'), [ $order = OrderParser::parse(Input::get('order'), [
'id', 'id',
'email', 'email',
@ -250,20 +254,15 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
return $this->ok return $this->ok
( (
$result->toArray(Request::input('expand', ''),[] ,[], [], $serializer_type) $result->toArray(Request::input('expand', ''), [], [], [], $serializer_type)
); );
} } catch (ValidationException $ex1) {
catch(ValidationException $ex1){
Log::warning($ex1); Log::warning($ex1);
return $this->error412($ex1->getMessages()); return $this->error412($ex1->getMessages());
} } catch (EntityNotFoundException $ex2) {
catch(EntityNotFoundException $ex2)
{
Log::warning($ex2); Log::warning($ex2);
return $this->error404(array('message'=> $ex2->getMessage())); return $this->error404(array('message' => $ex2->getMessage()));
} } catch (Exception $ex) {
catch (Exception $ex)
{
Log::error($ex); Log::error($ex);
return $this->error500($ex); return $this->error500($ex);
} }
@ -276,8 +275,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
*/ */
public function getSummitSpeaker($summit_id, $speaker_id) public function getSummitSpeaker($summit_id, $speaker_id)
{ {
try try {
{
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id); $summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404(); if (is_null($summit)) return $this->error404();
@ -297,31 +295,27 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
) )
); );
} } catch (ValidationException $ex1) {
catch(ValidationException $ex1){
Log::warning($ex1); Log::warning($ex1);
return $this->error412($ex1->getMessages()); return $this->error412($ex1->getMessages());
} } catch (EntityNotFoundException $ex2) {
catch(EntityNotFoundException $ex2)
{
Log::warning($ex2); Log::warning($ex2);
return $this->error404(array('message'=> $ex2->getMessage())); return $this->error404(array('message' => $ex2->getMessage()));
} } catch (Exception $ex) {
catch (Exception $ex) {
Log::error($ex); Log::error($ex);
return $this->error500($ex); return $this->error500($ex);
} }
} }
public function getMySpeaker(){ public function getMySpeaker()
try
{ {
try {
$current_member_id = $this->resource_server_context->getCurrentUserExternalId(); $current_member_id = $this->resource_server_context->getCurrentUserExternalId();
if(is_null($current_member_id)) if (is_null($current_member_id))
return $this->error403(); return $this->error403();
$member = $this->member_repository->getById($current_member_id); $member = $this->member_repository->getById($current_member_id);
if(is_null($member)) if (is_null($member))
return $this->error403(); return $this->error403();
$speaker = $this->speaker_repository->getByMember($member); $speaker = $this->speaker_repository->getByMember($member);
@ -340,17 +334,13 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
) )
); );
} } catch (ValidationException $ex1) {
catch(ValidationException $ex1){
Log::warning($ex1); Log::warning($ex1);
return $this->error412($ex1->getMessages()); return $this->error412($ex1->getMessages());
} } catch (EntityNotFoundException $ex2) {
catch(EntityNotFoundException $ex2)
{
Log::warning($ex2); Log::warning($ex2);
return $this->error404(array('message'=> $ex2->getMessage())); return $this->error404(array('message' => $ex2->getMessage()));
} } catch (Exception $ex) {
catch (Exception $ex) {
Log::error($ex); Log::error($ex);
return $this->error500($ex); return $this->error500($ex);
} }
@ -359,15 +349,15 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
/** /**
* @return mixed * @return mixed
*/ */
public function createMySpeaker(){ public function createMySpeaker()
try
{ {
try {
$current_member_id = $this->resource_server_context->getCurrentUserExternalId(); $current_member_id = $this->resource_server_context->getCurrentUserExternalId();
if(is_null($current_member_id)) if (is_null($current_member_id))
return $this->error403(); return $this->error403();
$member = $this->member_repository->getById($current_member_id); $member = $this->member_repository->getById($current_member_id);
if(is_null($member)) if (is_null($member))
return $this->error403(); return $this->error403();
// set data from current member ... // set data from current member ...
@ -393,17 +383,13 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
) )
); );
} } catch (ValidationException $ex1) {
catch(ValidationException $ex1){
Log::warning($ex1); Log::warning($ex1);
return $this->error412($ex1->getMessages()); return $this->error412($ex1->getMessages());
} } catch (EntityNotFoundException $ex2) {
catch(EntityNotFoundException $ex2)
{
Log::warning($ex2); Log::warning($ex2);
return $this->error404(array('message'=> $ex2->getMessage())); return $this->error404(array('message' => $ex2->getMessage()));
} } catch (Exception $ex) {
catch (Exception $ex) {
Log::error($ex); Log::error($ex);
return $this->error500($ex); return $this->error500($ex);
} }
@ -415,8 +401,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
*/ */
public function getSpeaker($speaker_id) public function getSpeaker($speaker_id)
{ {
try try {
{
$speaker = $this->speaker_repository->getById($speaker_id); $speaker = $this->speaker_repository->getById($speaker_id);
if (is_null($speaker)) return $this->error404(); if (is_null($speaker)) return $this->error404();
@ -434,17 +419,13 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
) )
); );
} } catch (ValidationException $ex1) {
catch(ValidationException $ex1){
Log::warning($ex1); Log::warning($ex1);
return $this->error412($ex1->getMessages()); return $this->error412($ex1->getMessages());
} } catch (EntityNotFoundException $ex2) {
catch(EntityNotFoundException $ex2)
{
Log::warning($ex2); Log::warning($ex2);
return $this->error404(array('message'=> $ex2->getMessage())); return $this->error404(array('message' => $ex2->getMessage()));
} } catch (Exception $ex) {
catch (Exception $ex) {
Log::error($ex); Log::error($ex);
return $this->error500($ex); return $this->error500($ex);
} }
@ -454,9 +435,10 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
* @param $summit_id * @param $summit_id
* @return mixed * @return mixed
*/ */
public function addSpeakerBySummit($summit_id){ public function addSpeakerBySummit($summit_id)
{
try { try {
if(!Request::isJson()) return $this->error400(); if (!Request::isJson()) return $this->error400();
$data = Input::json(); $data = Input::json();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id); $summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
@ -499,17 +481,13 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
$speaker = $this->service->addSpeaker($summit, HTMLCleaner::cleanData($data->all(), $fields)); $speaker = $this->service->addSpeaker($summit, HTMLCleaner::cleanData($data->all(), $fields));
return $this->created(SerializerRegistry::getInstance()->getSerializer($speaker)->serialize()); return $this->created(SerializerRegistry::getInstance()->getSerializer($speaker)->serialize());
} } catch (ValidationException $ex1) {
catch (ValidationException $ex1) {
Log::warning($ex1); Log::warning($ex1);
return $this->error412(array($ex1->getMessage())); return $this->error412(array($ex1->getMessage()));
} } catch (EntityNotFoundException $ex2) {
catch(EntityNotFoundException $ex2)
{
Log::warning($ex2); Log::warning($ex2);
return $this->error404(array('message'=> $ex2->getMessage())); return $this->error404(array('message' => $ex2->getMessage()));
} } catch (Exception $ex) {
catch (Exception $ex) {
Log::error($ex); Log::error($ex);
return $this->error500($ex); return $this->error500($ex);
} }
@ -520,9 +498,10 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
* @param $speaker_id * @param $speaker_id
* @return mixed * @return mixed
*/ */
public function updateSpeakerBySummit($summit_id, $speaker_id){ public function updateSpeakerBySummit($summit_id, $speaker_id)
{
try { try {
if(!Request::isJson()) return $this->error400(); if (!Request::isJson()) return $this->error400();
$data = Input::json(); $data = Input::json();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id); $summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
@ -568,17 +547,13 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
$speaker = $this->service->updateSpeakerBySummit($summit, $speaker, HTMLCleaner::cleanData($data->all(), $fields)); $speaker = $this->service->updateSpeakerBySummit($summit, $speaker, HTMLCleaner::cleanData($data->all(), $fields));
return $this->updated(SerializerRegistry::getInstance()->getSerializer($speaker)->serialize()); return $this->updated(SerializerRegistry::getInstance()->getSerializer($speaker)->serialize());
} } catch (ValidationException $ex1) {
catch (ValidationException $ex1) {
Log::warning($ex1); Log::warning($ex1);
return $this->error412(array($ex1->getMessage())); return $this->error412(array($ex1->getMessage()));
} } catch (EntityNotFoundException $ex2) {
catch(EntityNotFoundException $ex2)
{
Log::warning($ex2); Log::warning($ex2);
return $this->error404(array('message'=> $ex2->getMessage())); return $this->error404(array('message' => $ex2->getMessage()));
} } catch (Exception $ex) {
catch (Exception $ex) {
Log::error($ex); Log::error($ex);
return $this->error500($ex); return $this->error500($ex);
} }
@ -589,7 +564,8 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
* @param $speaker_id * @param $speaker_id
* @return mixed * @return mixed
*/ */
public function addSpeakerPhoto(LaravelRequest $request, $speaker_id){ public function addSpeakerPhoto(LaravelRequest $request, $speaker_id)
{
try { try {
@ -601,22 +577,16 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
$res = $this->service->addSpeakerPhoto($speaker_id, $file); $res = $this->service->addSpeakerPhoto($speaker_id, $file);
return !is_null($res) ? $this->created($res->getId()) : $this->error400(); return !is_null($res) ? $this->created($res->getId()) : $this->error400();
} } catch (EntityNotFoundException $ex1) {
catch (EntityNotFoundException $ex1) {
Log::warning($ex1); Log::warning($ex1);
return $this->error404(); return $this->error404();
} } catch (ValidationException $ex2) {
catch(ValidationException $ex2)
{
Log::warning($ex2); Log::warning($ex2);
return $this->error412(array($ex2->getMessage())); return $this->error412(array($ex2->getMessage()));
} } catch (\HTTP401UnauthorizedException $ex3) {
catch(\HTTP401UnauthorizedException $ex3)
{
Log::warning($ex3); Log::warning($ex3);
return $this->error401(); return $this->error401();
} } catch (Exception $ex) {
catch (Exception $ex) {
Log::error($ex); Log::error($ex);
return $this->error500($ex); return $this->error500($ex);
} }
@ -627,9 +597,10 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
* @param $speaker_to_id * @param $speaker_to_id
* @return mixed * @return mixed
*/ */
public function merge($speaker_from_id, $speaker_to_id){ public function merge($speaker_from_id, $speaker_to_id)
{
try { try {
if(!Request::isJson()) return $this->error400(); if (!Request::isJson()) return $this->error400();
$data = Input::json(); $data = Input::json();
$speaker_from = $this->speaker_repository->getById($speaker_from_id); $speaker_from = $this->speaker_repository->getById($speaker_from_id);
@ -641,17 +612,13 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
$this->service->merge($speaker_from, $speaker_to, $data->all()); $this->service->merge($speaker_from, $speaker_to, $data->all());
return $this->updated(); return $this->updated();
} } catch (ValidationException $ex1) {
catch (ValidationException $ex1) {
Log::warning($ex1); Log::warning($ex1);
return $this->error412(array($ex1->getMessage())); return $this->error412(array($ex1->getMessage()));
} } catch (EntityNotFoundException $ex2) {
catch(EntityNotFoundException $ex2)
{
Log::warning($ex2); Log::warning($ex2);
return $this->error404(array('message'=> $ex2->getMessage())); return $this->error404(array('message' => $ex2->getMessage()));
} } catch (Exception $ex) {
catch (Exception $ex) {
Log::error($ex); Log::error($ex);
return $this->error500($ex); return $this->error500($ex);
} }
@ -660,9 +627,10 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
/** /**
* @return mixed * @return mixed
*/ */
public function addSpeaker(){ public function addSpeaker()
{
try { try {
if(!Request::isJson()) return $this->error400(); if (!Request::isJson()) return $this->error400();
$data = Input::json(); $data = Input::json();
$rules = [ $rules = [
@ -702,17 +670,13 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
$speaker = $this->service->addSpeaker(HTMLCleaner::cleanData($data->all(), $fields)); $speaker = $this->service->addSpeaker(HTMLCleaner::cleanData($data->all(), $fields));
return $this->created(SerializerRegistry::getInstance()->getSerializer($speaker, SerializerRegistry::SerializerType_Private)->serialize()); return $this->created(SerializerRegistry::getInstance()->getSerializer($speaker, SerializerRegistry::SerializerType_Private)->serialize());
} } catch (ValidationException $ex1) {
catch (ValidationException $ex1) {
Log::warning($ex1); Log::warning($ex1);
return $this->error412(array($ex1->getMessage())); return $this->error412(array($ex1->getMessage()));
} } catch (EntityNotFoundException $ex2) {
catch(EntityNotFoundException $ex2)
{
Log::warning($ex2); Log::warning($ex2);
return $this->error404(array('message'=> $ex2->getMessage())); return $this->error404(array('message' => $ex2->getMessage()));
} } catch (Exception $ex) {
catch (Exception $ex) {
Log::error($ex); Log::error($ex);
return $this->error500($ex); return $this->error500($ex);
} }
@ -722,9 +686,10 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
* @param $speaker_id * @param $speaker_id
* @return mixed * @return mixed
*/ */
public function updateSpeaker($speaker_id){ public function updateSpeaker($speaker_id)
{
try { try {
if(!Request::isJson()) return $this->error400(); if (!Request::isJson()) return $this->error400();
$data = Input::json(); $data = Input::json();
@ -769,17 +734,13 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
$speaker = $this->service->updateSpeaker($speaker, HTMLCleaner::cleanData($data->all(), $fields)); $speaker = $this->service->updateSpeaker($speaker, HTMLCleaner::cleanData($data->all(), $fields));
return $this->updated(SerializerRegistry::getInstance()->getSerializer($speaker, SerializerRegistry::SerializerType_Private)->serialize()); return $this->updated(SerializerRegistry::getInstance()->getSerializer($speaker, SerializerRegistry::SerializerType_Private)->serialize());
} } catch (ValidationException $ex1) {
catch (ValidationException $ex1) {
Log::warning($ex1); Log::warning($ex1);
return $this->error412(array($ex1->getMessage())); return $this->error412(array($ex1->getMessage()));
} } catch (EntityNotFoundException $ex2) {
catch(EntityNotFoundException $ex2)
{
Log::warning($ex2); Log::warning($ex2);
return $this->error404(array('message'=> $ex2->getMessage())); return $this->error404(array('message' => $ex2->getMessage()));
} } catch (Exception $ex) {
catch (Exception $ex) {
Log::error($ex); Log::error($ex);
return $this->error500($ex); return $this->error500($ex);
} }
@ -789,24 +750,80 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
* @param $speaker_id * @param $speaker_id
* @return mixed * @return mixed
*/ */
public function deleteSpeaker($speaker_id){ public function deleteSpeaker($speaker_id)
{
try { try {
$speaker = $this->speaker_repository->getById($speaker_id); $speaker = $this->speaker_repository->getById($speaker_id);
if (is_null($speaker)) return $this->error404(); if (is_null($speaker)) return $this->error404();
$this->service->deleteSpeaker($speaker_id); $this->service->deleteSpeaker($speaker_id);
return $this->deleted(); return $this->deleted();
} } catch (ValidationException $ex1) {
catch (ValidationException $ex1) {
Log::warning($ex1); Log::warning($ex1);
return $this->error412(array($ex1->getMessage())); return $this->error412(array($ex1->getMessage()));
} } catch (EntityNotFoundException $ex2) {
catch(EntityNotFoundException $ex2)
{
Log::warning($ex2); Log::warning($ex2);
return $this->error404(array('message'=> $ex2->getMessage())); return $this->error404(array('message' => $ex2->getMessage()));
} catch (Exception $ex) {
Log::error($ex);
return $this->error500($ex);
} }
catch (Exception $ex) { }
/**
* @param $role
* @param $selection_plan_id
* @return mixed
*/
public function getMySpeakerPresentationsByRoleAndBySelectionPlan($role, $selection_plan_id)
{
try {
$current_member_id = $this->resource_server_context->getCurrentUserExternalId();
if (is_null($current_member_id))
return $this->error403();
$member = $this->member_repository->getById($current_member_id);
if (is_null($member))
return $this->error403();
$speaker = $this->speaker_repository->getByMember($member);
if (is_null($speaker))
return $this->error403();
$selection_plan = $this->selection_plan_repository->getById($selection_plan_id);
if (is_null($selection_plan))
return $this->error404(['message' => 'missing selection plan']);
switch ($role) {
case 'creator':
$role = PresentationSpeaker::ROLE_CREATOR;
break;
case 'speaker':
$role = PresentationSpeaker::ROLE_SPEAKER;
break;
case 'moderator':
$role = PresentationSpeaker::ROLE_MODERATOR;
break;
}
$presentations = $speaker->getPresentationsBySelectionPlanAndRole($selection_plan, $role);
$response = new PagingResponse
(
count($presentations),
count($presentations),
1,
1,
$presentations
);
return $this->ok($response->toArray($expand = Input::get('expand', '')));
} catch (ValidationException $ex1) {
Log::warning($ex1);
return $this->error412(array($ex1->getMessage()));
} catch (EntityNotFoundException $ex2) {
Log::warning($ex2);
return $this->error404(array('message' => $ex2->getMessage()));
} catch (Exception $ex) {
Log::error($ex); Log::error($ex);
return $this->error500($ex); return $this->error500($ex);
} }

10
app/Http/routes.php
View File

@ -532,6 +532,16 @@ Route::group([
Route::group(['prefix' => 'me'], function(){ Route::group(['prefix' => 'me'], function(){
Route::get('', 'OAuth2SummitSpeakersApiController@getMySpeaker'); Route::get('', 'OAuth2SummitSpeakersApiController@getMySpeaker');
Route::post('', 'OAuth2SummitSpeakersApiController@createMySpeaker'); Route::post('', 'OAuth2SummitSpeakersApiController@createMySpeaker');
Route::group(['prefix' => 'presentations'], function(){
Route::group(['prefix' => '{role}'], function(){
Route::group(['prefix' => 'selection-plans'], function(){
Route::group(['prefix' => '{selection_plan_id}'], function(){
Route::get("", "OAuth2SummitSpeakersApiController@getMySpeakerPresentationsByRoleAndBySelectionPlan")
->where('role', 'creator|speaker|moderator');
});
});
});
});
}); });
Route::group(['prefix' => '{speaker_id}'], function () { Route::group(['prefix' => '{speaker_id}'], function () {

22
app/Models/Foundation/Summit/Repositories/ISelectionPlanRepository.php Normal file
View File

@ -0,0 +1,22 @@
<?php namespace App\Models\Foundation\Summit\Repositories;
/**
* Copyright 2018 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use models\utils\IBaseRepository;
/**
* Interface ISelectionPlanRepository
* @package App\Models\Foundation\Summit\Repositories
*/
interface ISelectionPlanRepository extends IBaseRepository
{
}

2
app/Models/Foundation/Summit/SelectionPlan.php
View File

@ -22,7 +22,7 @@ use models\summit\SummitOwned;
use models\utils\SilverstripeBaseModel; use models\utils\SilverstripeBaseModel;
use DateTime; use DateTime;
/** /**
* @ORM\Entity * @ORM\Entity(repositoryClass="App\Repositories\Summit\DoctrineSelectionPlanRepository")
* @ORM\Table(name="SelectionPlan") * @ORM\Table(name="SelectionPlan")
* Class SelectionPlan * Class SelectionPlan
* @package App\Models\Foundation\Summit * @package App\Models\Foundation\Summit

9
app/Repositories/RepositoriesProvider.php
View File

@ -18,10 +18,12 @@ use App\Models\Foundation\Summit\Repositories\IDefaultSummitEventTypeRepository;
use App\Models\Foundation\Summit\Repositories\IPresentationCategoryGroupRepository; use App\Models\Foundation\Summit\Repositories\IPresentationCategoryGroupRepository;
use App\Models\Foundation\Summit\Repositories\IPresentationSpeakerSummitAssistanceConfirmationRequestRepository; use App\Models\Foundation\Summit\Repositories\IPresentationSpeakerSummitAssistanceConfirmationRequestRepository;
use App\Models\Foundation\Summit\Repositories\IRSVPTemplateRepository; use App\Models\Foundation\Summit\Repositories\IRSVPTemplateRepository;
use App\Models\Foundation\Summit\Repositories\ISelectionPlanRepository;
use App\Models\Foundation\Summit\Repositories\ISummitEventTypeRepository; use App\Models\Foundation\Summit\Repositories\ISummitEventTypeRepository;
use App\Models\Foundation\Summit\Repositories\ISummitLocationBannerRepository; use App\Models\Foundation\Summit\Repositories\ISummitLocationBannerRepository;
use App\Models\Foundation\Summit\Repositories\ISummitLocationRepository; use App\Models\Foundation\Summit\Repositories\ISummitLocationRepository;
use App\Models\Foundation\Summit\Repositories\ISummitTrackRepository; use App\Models\Foundation\Summit\Repositories\ISummitTrackRepository;
use App\Models\Foundation\Summit\SelectionPlan;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use LaravelDoctrine\ORM\Facades\EntityManager; use LaravelDoctrine\ORM\Facades\EntityManager;
@ -327,5 +329,12 @@ final class RepositoriesProvider extends ServiceProvider
return EntityManager::getRepository(PresentationCategoryGroup::class); return EntityManager::getRepository(PresentationCategoryGroup::class);
} }
); );
App::singleton(
ISelectionPlanRepository::class,
function(){
return EntityManager::getRepository(SelectionPlan::class);
}
);
} }
} }

33
app/Repositories/Summit/DoctrineSelectionPlanRepository.php Normal file
View File

@ -0,0 +1,33 @@
<?php namespace App\Repositories\Summit;
/**
* Copyright 2018 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use App\Models\Foundation\Summit\Repositories\ISelectionPlanRepository;
use App\Models\Foundation\Summit\SelectionPlan;
use App\Repositories\SilverStripeDoctrineRepository;
/**
* Class DoctrineSelectionPlanRepository
* @package App\Repositories\Summit
*/
final class DoctrineSelectionPlanRepository
extends SilverStripeDoctrineRepository
implements ISelectionPlanRepository
{
/**
* @return string
*/
protected function getBaseEntity()
{
return SelectionPlan::class;
}
}

9
database/seeds/ApiEndpointsSeeder.php
View File

@ -320,6 +320,15 @@ class ApiEndpointsSeeder extends Seeder
sprintf(SummitScopes::ReadAllSummitData, $current_realm) sprintf(SummitScopes::ReadAllSummitData, $current_realm)
], ],
), ),
array(
'name' => 'get-my-speaker-presentations-by-role-by-selection-plan',
'route' => '/api/v1/speakers/me/presentations/{role}/selection-plans/{selection_plan_id}',
'http_method' => 'GET',
'scopes' => [
sprintf(SummitScopes::ReadSummitData, $current_realm),
sprintf(SummitScopes::ReadAllSummitData, $current_realm)
],
),
array( array(
'name' => 'create-my-speaker', 'name' => 'create-my-speaker',
'route' => '/api/v1/speakers/me', 'route' => '/api/v1/speakers/me',

27
tests/OAuth2SpeakersApiTest.php
View File

@ -555,4 +555,31 @@ final class OAuth2SpeakersApiTest extends ProtectedApiTest
$this->assertTrue(!is_null($speaker)); $this->assertTrue(!is_null($speaker));
} }
public function testGetMySpeakerPresentationsByRoleAndSelectionPlan()
{
$params = [
'role' => 'speaker',
'selection_plan_id' => 8,
];
$headers = [
"HTTP_Authorization" => " Bearer " . $this->access_token,
"CONTENT_TYPE" => "application/json"
];
$response = $this->action(
"GET",
"OAuth2SummitSpeakersApiController@getMySpeakerPresentationsByRoleAndBySelectionPlan",
$params,
[],
[],
[],
$headers
);
$content = $response->getContent();
$this->assertResponseStatus(200);
$presentations = json_decode($content);
$this->assertTrue(!is_null($presentations));
}
} }