openinfra
/
openstackid-resources
Code Issues Proposed changes

Presentation video endpoints 

Added update video and remove video endpoints

Change-Id: Ibd5cffcfc275f9b5af2c87af7831e80ffea44f53
This commit is contained in:
Sebastian Marcet 2016-09-19 11:49:07 -03:00
parent dbda548174
commit 68015ac8ae
10 changed files with 294 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Factories/PresentationVideoFactory.php
View File

@ -28,6 +28,7 @@ final class PresentationVideoFactory implements IPresentationVideoFactory
public function build(array $data){
$video = new PresentationVideo;
$utc_now = new \DateTime();
$video->setYoutubeId(trim($data['you_tube_id']));
$video->setDateUploaded($utc_now);

80
app/Http/Controllers/apis/protected/summit/OAuth2PresentationApiController.php
View File

@ -82,6 +82,7 @@ final class OAuth2PresentationApiController extends OAuth2ProtectedController
public function addVideo(LaravelRequest $request, $summit_id, $presentation_id){
try {
$summit = SummitFinderStrategyFactory::build($this->summit_repository)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -130,4 +131,83 @@ final class OAuth2PresentationApiController extends OAuth2ProtectedController
return $this->error500($ex);
}
}
public function updateVideo(LaravelRequest $request, $summit_id, $presentation_id, $video_id){
try {
$summit = SummitFinderStrategyFactory::build($this->summit_repository)->find($summit_id);
if (is_null($summit)) return $this->error404();
if (!$request->isJson()) {
return $this->error412(array('invalid content type!'));
}
if(!Request::isJson()) return $this->error403();
$data = Input::json();
$rules = array
(
'you_tube_id' => 'required|alpha_dash',
'name' => 'sometimes|required|text:512',
'description' => 'sometimes|required|text|max:512',
'display_on_site' => 'sometimes|required|boolean',
);
$data = $data->all();
// Creates a Validator instance and validates the data.
$validation = Validator::make($data, $rules);
if ($validation->fails()) {
$ex = new ValidationException;
$ex->setMessages($validation->messages()->toArray());
throw $ex;
}
$this->presentation_service->updateVideo($presentation_id, $video_id, $data);
return $this->updated();
}
catch (EntityNotFoundException $ex1)
{
Log::warning($ex1);
return $this->error404();
}
catch (ValidationException $ex2)
{
Log::warning($ex2);
return $this->error412($ex2->getMessages());
}
catch (Exception $ex)
{
Log::error($ex);
return $this->error500($ex);
}
}
public function deleteVideo($summit_id, $presentation_id, $video_id){
try {
$summit = SummitFinderStrategyFactory::build($this->summit_repository)->find($summit_id);
if (is_null($summit)) return $this->error404();
$this->presentation_service->deleteVideo($presentation_id, $video_id);
return $this->deleted();
}
catch (EntityNotFoundException $ex1)
{
Log::warning($ex1);
return $this->error404();
}
catch (ValidationException $ex2)
{
Log::warning($ex2);
return $this->error412($ex2->getMessages());
}
catch (Exception $ex)
{
Log::error($ex);
return $this->error500($ex);
}
}
}

4
app/Http/routes.php
View File

@ -117,6 +117,10 @@ Route::group(array(
Route::get('', 'OAuth2PresentationApiController@getPresentationVideos');
Route::get('{video_id}', 'OAuth2PresentationApiController@getPresentationVideo');
Route::post('', 'OAuth2PresentationApiController@addVideo');
Route::group(array('prefix' => '{video_id}'), function () {
Route::put('', 'OAuth2PresentationApiController@updateVideo');
Route::delete('', 'OAuth2PresentationApiController@deleteVideo');
});
});
});
});

5
app/Models/Foundation/Summit/Events/Presentations/Materials/PresentationMaterial.php
View File

@ -58,6 +58,11 @@ abstract class PresentationMaterial extends SilverstripeBaseModel
$this->presentation = $presentation;
}
public function unsetPresentation(){
$this->presentation = null;
}
/**
* @return int
*/

20
app/Models/Foundation/Summit/Events/Presentations/Presentation.php
View File

@ -182,6 +182,24 @@ class Presentation extends SummitEvent
return count($this->getVideos()) > 0;
}
/**
* @param int $video_id
* @return PresentationVideo
*/
public function getVideoBy($video_id){
return $this->materials
->filter(function( $element) use($video_id) { return $element instanceof PresentationVideo && $element->getId() == $video_id; })
->first();
}
/**
* @param PresentationVideo $video
*/
public function removeVideo(PresentationVideo $video){
$this->materials->removeElement($video);
$video->unsetPresentation();
}
/**
* @return PresentationSlide[]
*/
@ -302,7 +320,7 @@ class Presentation extends SummitEvent
public function unsetModerator(){
$this->moderator = nul;
$this->moderator = null;
}
}

1
app/Models/Foundation/Summit/Factories/IPresentationVideoFactory.php
View File

@ -11,6 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use models\summit\PresentationVideo;
/**
* Interface IPresentationVideoFactory

16
app/Services/Model/IPresentationService.php
View File

@ -27,4 +27,20 @@ interface IPresentationService
* @return PresentationVideo
*/
public function addVideoTo($presentation_id, array $video_data);
/**
* @param int $presentation_id
* @param int $video_id
* @param array $video_data
* @return PresentationVideo
*/
public function updateVideo($presentation_id, $video_id, array $video_data);
/**
* @param int $presentation_id
* @param int $video_id
* @return void
*/
public function deleteVideo($presentation_id, $video_id);
}

71
app/Services/Model/PresentationService.php
View File

@ -16,6 +16,7 @@ use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use models\summit\factories\IPresentationVideoFactory;
use models\summit\ISummitEventRepository;
use models\summit\Presentation;
use models\summit\PresentationVideo;
use libs\utils\ITransactionService;
@ -80,4 +81,74 @@ final class PresentationService implements IPresentationService
return $video;
}
/**
* @param int $presentation_id
* @param int $video_id
* @param array $video_data
* @return PresentationVideo
*/
public function updateVideo($presentation_id, $video_id, array $video_data)
{
return $this->tx_service->transaction(function() use($presentation_id, $video_id, $video_data){
$presentation = $this->presentation_repository->getById($presentation_id);
if(is_null($presentation))
throw new EntityNotFoundException('presentation not found!');
$video = $presentation->getVideoBy($video_id);
if(is_null($video))
throw new EntityNotFoundException('video not found!');
if(!$video instanceof PresentationVideo)
throw new EntityNotFoundException('video not found!');
if(isset($video_data['name']))
$video->setName(trim($video_data['name']));
if(isset($video_data['you_tube_id']))
$video->setYoutubeId(trim($video_data['you_tube_id']));
if(isset($video_data['description']))
$video->setDescription(trim($video_data['description']));
if(isset($video_data['display_on_site']))
$video->setDisplayOnSite((bool)$video_data['display_on_site']);
return $video;
});
}
/**
* @param int $presentation_id
* @param int $video_id
* @return void
*/
public function deleteVideo($presentation_id, $video_id)
{
$this->tx_service->transaction(function() use($presentation_id, $video_id){
$presentation = $this->presentation_repository->getById($presentation_id);
if(is_null($presentation))
throw new EntityNotFoundException('presentation not found!');
if(!$presentation instanceof Presentation)
throw new EntityNotFoundException('presentation not found!');
$video = $presentation->getVideoBy($video_id);
if(is_null($video))
throw new EntityNotFoundException('video not found!');
if(!$video instanceof PresentationVideo)
throw new EntityNotFoundException('video not found!');
$presentation->removeVideo($video);
});
}
}

28
database/seeds/ApiEndpointsSeeder.php
View File

@ -561,6 +561,26 @@ class ApiEndpointsSeeder extends Seeder
)
);
ApiEndpoint::create(
array(
'name' => 'update-presentation-video',
'active' => true,
'api_id' => $summit->id,
'route' => '/api/v1/summits/{id}/presentations/{presentation_id}/videos/{video_id}',
'http_method' => 'PUT'
)
);
ApiEndpoint::create(
array(
'name' => 'delete-presentation-video',
'active' => true,
'api_id' => $summit->id,
'route' => '/api/v1/summits/{id}/presentations/{presentation_id}/videos/{video_id}',
'http_method' => 'DELETE'
)
);
//members
ApiEndpoint::create(
@ -575,7 +595,6 @@ class ApiEndpointsSeeder extends Seeder
// notifications
ApiEndpoint::create(
array(
'name' => 'get-notifications',
@ -689,9 +708,16 @@ class ApiEndpointsSeeder extends Seeder
$endpoint->scopes()->attach($summit_external_order_confirm->id);
//write videos
$endpoint = ApiEndpoint::where('name', '=', 'create-presentation-video')->first();
$endpoint->scopes()->attach($write_videos_scope->id);
$endpoint = ApiEndpoint::where('name', '=', 'update-presentation-video')->first();
$endpoint->scopes()->attach($write_videos_scope->id);
$endpoint = ApiEndpoint::where('name', '=', 'delete-presentation-video')->first();
$endpoint->scopes()->attach($write_videos_scope->id);
}

70
tests/OAuth2SummitApiTest.php
View File

@ -1695,6 +1695,76 @@ final class OAuth2SummitApiTest extends ProtectedApiTest
}
public function testUpdatePresentationVideo()
{
$params = array
(
'id' => 7,
'presentation_id' => 15404,
'video_id' => 32801
);
$headers = array
(
"HTTP_Authorization" => " Bearer " .$this->access_token,
"CONTENT_TYPE" => "application/json"
);
$video_data = array
(
'you_tube_id' => 'cpHa7kSOur0',
'name' => 'test video update',
);
$response = $this->action
(
"PUT",
"OAuth2PresentationApiController@updateVideo",
$params,
array(),
array(),
array(),
$headers,
json_encode($video_data)
);
$content = $response->getContent();
$this->assertResponseStatus(204);
}
public function testDeletePresentationVideo()
{
$params = array
(
'id' => 7,
'presentation_id' => 15404,
'video_id' => 32800
);
$headers = array
(
"HTTP_Authorization" => " Bearer " .$this->access_token,
"CONTENT_TYPE" => "application/json"
);
$response = $this->action
(
"DELETE",
"OAuth2PresentationApiController@deleteVideo",
$params,
array(),
array(),
array(),
$headers
);
$content = $response->getContent();
$this->assertResponseStatus(204);
}
public function testGetMyMemberFromCurrentSummit(){
$params = array