openinfra/openstackid-resources
Code Issues Proposed changes

Fix on merge speakers

Browse Source 
* fixed same speaker merge ( added validation)
* fixed summit event serialization error

Change-Id: Iadcaab456f6f82df6ba3294354da7a0436591bba
This commit is contained in:
Sebastian Marcet 2018-01-15 20:28:59 -03:00
parent 1c0b1a24e4
commit e0dddf3558
3 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Foundation/Summit/Events/SummitEvent.php
View File

@ -504,7 +504,7 @@ class SummitEvent extends SilverstripeBaseModel
public function getTypeId()
{
try {
return $this->type->getId();
return !is_null($this->type) ? $this->type->getId() : 0;
}
catch(\Exception $ex){
return 0;

3
app/Services/Model/SpeakerService.php
View File

@ -405,6 +405,9 @@ final class SpeakerService implements ISpeakerService
public function merge(PresentationSpeaker $speaker_from, PresentationSpeaker $speaker_to, array $data)
{
return $this->tx_service->transaction(function () use ($speaker_from, $speaker_to, $data) {
if($speaker_from->getIdentifier() == $speaker_to->getIdentifier())
throw new ValidationException("You can not merge the same speaker!");
// bio
if (!isset($data['bio'])) throw new ValidationException("bio field is required");
$speaker_id = intval($data['bio']);

43
tests/OAuth2SpeakersApiTest.php
View File

@ -290,7 +290,7 @@ class OAuth2SpeakersApiTest extends ProtectedApiTest
public function testGetSpeaker(){
$params = [
'speaker_id' => 1
'speaker_id' => 2884
];
$headers = [
@ -355,4 +355,45 @@ class OAuth2SpeakersApiTest extends ProtectedApiTest
$this->assertTrue(!is_null($speaker));
}
public function testMergeSpeakersSame(){
$params = [
'speaker_from_id' => 1,
'speaker_to_id' => 1
];
$headers = [
"HTTP_Authorization" => " Bearer " . $this->access_token,
"CONTENT_TYPE" => "application/json"
];
$data = [
'title' => 1,
'bio' => 1,
'first_name' => 1,
'last_name' => 1,
'irc' => 1,
'twitter' => 1,
'pic' => 1,
'registration_request' => 1,
'member' => 1,
];
$response = $this->action(
"PUT",
"OAuth2SummitSpeakersApiController@merge",
$params,
[],
[],
[],
$headers,
json_encode($data)
);
$content = $response->getContent();
$this->assertResponseStatus(412);
$speaker = json_decode($content);
$this->assertTrue(!is_null($speaker));
}
}