openinfra
/
openstackid-resources
Code Issues Proposed changes

Fixed wrong mapping on tracks endpoints 

changed mapping from title to name

Change-Id: I6b1e778ab75d472a2cf2e2b3be6a837d54ee49e7
This commit is contained in:
Sebastian Marcet 2018-06-19 14:02:09 -07:00
parent a32759f2dd
commit 0713cc835e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,7 +307,7 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
if (is_null($summit)) return $this->error404();
$rules = [
'title' => 'required|string|max:50',
'name' => 'required|string|max:50',
'description' => 'required|string|max:500',
'code' => 'sometimes|string|max:5',
'session_count' => 'sometimes|integer',
@ -405,7 +405,7 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
if (is_null($summit)) return $this->error404();
$rules = [
'title' => 'sometimes|string|max:50',
'name' => 'sometimes|string|max:50',
'description' => 'sometimes|string|max:500',
'code' => 'sometimes|string|max:5',
'session_count' => 'sometimes|integer',

4
app/Models/Foundation/Summit/Factories/PresentationCategoryFactory.php
View File

@ -36,8 +36,8 @@ final class PresentationCategoryFactory
* @return PresentationCategory
*/
public static function populate(PresentationCategory $track, array $data){
if(isset($data['title']))
$track->setTitle(trim($data['title']));
if(isset($data['name']))
$track->setTitle(trim($data['name']));
if(isset($data['code']) && !empty($data['code']))
$track->setCode(trim($data['code']));

10
app/Services/Model/SummitTrackService.php
View File

@ -64,9 +64,9 @@ final class SummitTrackService
throw new ValidationException(sprintf("track id %s already has code %s assigned on summit id %s", $former_track->getId(), $data['code'], $summit->getId()));
}
$former_track = $summit->getPresentationCategoryByTitle($data['title']);
$former_track = $summit->getPresentationCategoryByTitle($data['name']);
if (!is_null($former_track))
throw new ValidationException(sprintf("track id %s already has title %s assigned on summit id %s", $former_track->getId(), $data['title'], $summit->getId()));
throw new ValidationException(sprintf("track id %s already has title %s assigned on summit id %s", $former_track->getId(), $data['name'], $summit->getId()));
$track = PresentationCategoryFactory::build($summit, $data);
@ -105,10 +105,10 @@ final class SummitTrackService
throw new ValidationException(sprintf("track id %s already has code %s assigned on summit id %s", $former_track->getId(), $data['code'], $summit->getId()));
}
if (isset($data['title'])) {
$former_track = $summit->getPresentationCategoryByTitle($data['title']);
if (isset($data['name'])) {
$former_track = $summit->getPresentationCategoryByTitle($data['name']);
if (!is_null($former_track) && $former_track->getId() != $track_id)
throw new ValidationException(sprintf("track id %s already has title %s assigned on summit id %s", $former_track->getId(), $data['title'], $summit->getId()));
throw new ValidationException(sprintf("track id %s already has title %s assigned on summit id %s", $former_track->getId(), $data['name'], $summit->getId()));
}
$track = PresentationCategoryFactory::populate($track, $data);