openinfra
/
openstackid-resources
Code Issues Proposed changes

Added missing summit fields 

* eventbrite_id / external_summit_id
* secondary_registration_link
* secondary_registration_label
* calendar_sync_name
* calendar_sync_desc
* time_zone_id

Change-Id: I9966add955923727c705c0435ed319e066173290
This commit is contained in:
Sebastian Marcet 2018-04-16 19:28:37 -03:00
parent c3746d60fb
commit e1b4a16bc5
5 changed files with 81 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,8 @@ final class SummitValidationRulesFactory
'link' => 'sometimes|url',
'registration_link' => 'sometimes|url',
'max_submission_allowed_per_user' => 'sometimes|integer|min:1',
'secondary_registration_link' => 'sometimes|url',
'secondary_registration_label' => 'sometimes|string',
];
}
@ -71,6 +73,8 @@ final class SummitValidationRulesFactory
'link' => 'sometimes|url',
'registration_link' => 'sometimes|url',
'max_submission_allowed_per_user' => 'sometimes|integer|min:1',
'secondary_registration_link' => 'sometimes|url',
'secondary_registration_label' => 'sometimes|string',
];
}
}

9
app/ModelSerializers/Summit/AdminSummitSerializer.php
View File

@ -19,9 +19,12 @@ use ModelSerializers\SummitSerializer;
final class AdminSummitSerializer extends SummitSerializer
{
protected static $array_mappings = [
'AvailableOnApi' => 'available_on_api:json_boolean',
'AvailableOnApi' => 'available_on_api:json_boolean',
'MaxSubmissionAllowedPerUser' => 'max_submission_allowed_per_user:json_int',
'RegistrationLink' => 'registration_link:json_string',
'Link' => 'link:json_string',
'RegistrationLink' => 'registration_link:json_string',
'Link' => 'link:json_string',
'ExternalSummitId' => 'external_summit_id:json_string',
'CalendarSyncName' => 'calendar_sync_name:json_string',
'CalendarSyncDesc' => 'calendar_sync_desc:json_string',
];
}

3
app/ModelSerializers/Summit/SummitSerializer.php
View File

@ -52,6 +52,9 @@ class SummitSerializer extends SilverStripeSerializer
'SpeakerAnnouncementEmailAcceptedAlternateCount' => 'speaker_announcement_email_accepted_alternate_count:json_int',
'SpeakerAnnouncementEmailAcceptedRejectedCount' => 'speaker_announcement_email_accepted_rejected_count:json_int',
'SpeakerAnnouncementEmailAlternateRejectedCount' => 'speaker_announcement_email_alternate_rejected_count:json_int',
'TimeZoneId' => 'time_zone_id:json_string',
'SecondaryRegistrationLink' => 'secondary_registration_link:json_string',
'SecondaryRegistrationLabel' => 'secondary_registration_label:json_string',
];
protected static $allowed_relations = [

8
app/Models/Foundation/Summit/Factories/SummitFactory.php
View File

@ -148,6 +148,14 @@ final class SummitFactory
$summit->setScheduleDefaultStartDate($start_datetime);
}
if(isset($data['secondary_registration_link']) ){
$summit->setSecondaryRegistrationLink(trim($data['secondary_registration_link']));
}
if(isset($data['secondary_registration_label']) ){
$summit->setSecondaryRegistrationLabel(trim($data['secondary_registration_label']));
}
return $summit;
}
}

60
app/Models/Foundation/Summit/Summit.php
View File

@ -172,6 +172,18 @@ class Summit extends SilverstripeBaseModel
*/
private $time_zone_id;
/**
* @ORM\Column(name="SecondaryRegistrationLink", type="string")
* @var string
*/
private $secondary_registration_link;
/**
* @ORM\Column(name="SecondaryRegistrationBtnText", type="string")
* @var string
*/
private $secondary_registration_label;
/**
* @ORM\Column(name="CalendarSyncName", type="string")
* @var string
@ -1953,4 +1965,52 @@ SQL;
$notification->setSummit($this);
return $this;
}
/**
* @return string
*/
public function getTimeZoneId()
{
return $this->time_zone_id;
}
/**
* @param string $time_zone_id
*/
public function setTimeZoneId($time_zone_id)
{
$this->time_zone_id = $time_zone_id;
}
/**
* @return string
*/
public function getSecondaryRegistrationLink()
{
return $this->secondary_registration_link;
}
/**
* @param string $secondary_registration_link
*/
public function setSecondaryRegistrationLink($secondary_registration_link)
{
$this->secondary_registration_link = $secondary_registration_link;
}
/**
* @return string
*/
public function getSecondaryRegistrationLabel()
{
return $this->secondary_registration_label;
}
/**
* @param string $secondary_registration_label
*/
public function setSecondaryRegistrationLabel($secondary_registration_label)
{
$this->secondary_registration_label = $secondary_registration_label;
}
}