openinfra
/
openstackid-resources
Code Issues Proposed changes

Selection Plan extra questions 

Added extra questions by selection plan

Change-Id: Ia4ca535f16826c30cc66ce642f4ad667d352aa2b
Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
smarcet 2021-05-20 19:08:02 -03:00
parent 1e167ebab1
commit 4086002ba3
59 changed files with 3082 additions and 750 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
app/Http/Controllers/Apis/Protected/Summit/Factories/ExtraQuestionTypeValidationRulesFactory.php Normal file
View File

@ -0,0 +1,49 @@
<?php namespace App\Http\Controllers;
/**
* Copyright 2021 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\ExtraQuestions\ExtraQuestionTypeConstants;
/**
* Class ExtraQuestionTypeValidationRulesFactory
* @package App\Http\Controllers
*/
abstract class ExtraQuestionTypeValidationRulesFactory
{
/**
* @param array $data
* @param bool $update
* @return array
*/
public static function build(array $data, $update = false){
if($update){
return [
'name' => 'sometimes|string',
'type' => 'sometimes|string|in:'.implode(",", ExtraQuestionTypeConstants::ValidQuestionTypes),
'label' => 'sometimes|string',
'mandatory' => 'sometimes|boolean',
'placeholder' => 'sometimes|string',
'order' => 'sometimes|integer|min:1',
];
}
return [
'name' => 'required|string',
'type' => 'required|string|in:'.implode(",", ExtraQuestionTypeConstants::ValidQuestionTypes),
'label' => 'required|string',
'mandatory' => 'required|boolean',
'placeholder' => 'sometimes|string',
];
}
}

42
app/Http/Controllers/Apis/Protected/Summit/Factories/ExtraQuestionTypeValueValidationRulesFactory.php Normal file
View File

@ -0,0 +1,42 @@
<?php namespace App\Http\Controllers;
/**
* Copyright 2021 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.
**/
/**
* Class ExtraQuestionTypeValueValidationRulesFactory
* @package App\Http\Controllers
*/
final class ExtraQuestionTypeValueValidationRulesFactory
{
/**
* @param array $data
* @param bool $update
* @return array
*/
public static function build(array $data, $update = false){
if($update){
return [
'label' => 'sometimes|string',
'value' => 'sometimes|string',
'order' => 'sometimes|integer|min:1'
];
}
return [
'label' => 'sometimes|string',
'value' => 'required|string',
];
}
}

25
app/Http/Controllers/Apis/Protected/Summit/Factories/Registration/SummitOrderExtraQuestionTypeValidationRulesFactory.php
View File

@ -16,7 +16,8 @@ use models\summit\SummitOrderExtraQuestionTypeConstants;
* Class SummitOrderExtraQuestionTypeValidationRulesFactory
* @package App\Http\Controllers
*/
final class SummitOrderExtraQuestionTypeValidationRulesFactory
class SummitOrderExtraQuestionTypeValidationRulesFactory
extends ExtraQuestionTypeValidationRulesFactory
{
/**
* @param array $data
@ -25,27 +26,19 @@ final class SummitOrderExtraQuestionTypeValidationRulesFactory
*/
public static function build(array $data, $update = false){
$rules = static::build($data,$update);
if($update){
return [
'name' => 'sometimes|string',
'type' => 'sometimes|string|in:'.implode(",", SummitOrderExtraQuestionTypeConstants::ValidQuestionTypes),
'label' => 'sometimes|string',
'mandatory' => 'sometimes|boolean',
return array_merge([
'usage' => 'sometimes|string|in:'.implode(",", SummitOrderExtraQuestionTypeConstants::ValidQuestionUsages),
'printable' => 'sometimes|boolean',
'placeholder' => 'sometimes|string',
'order' => 'sometimes|integer|min:1',
];
], $rules);
}
return [
'name' => 'required|string',
'type' => 'required|string|in:'.implode(",", SummitOrderExtraQuestionTypeConstants::ValidQuestionTypes),
'label' => 'required|string',
'mandatory' => 'required|boolean',
return array_merge([
'usage' => 'required|string|in:'.implode(",", SummitOrderExtraQuestionTypeConstants::ValidQuestionUsages),
'printable' => 'sometimes|boolean',
'placeholder' => 'sometimes|string',
];
], $rules);
}
}

22
app/Http/Controllers/Apis/Protected/Summit/Factories/SelectionPlanExtraQuestionValidationRulesFactory.php Normal file
View File

@ -0,0 +1,22 @@
<?php namespace App\Http\Controllers;
/**
* Copyright 2021 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.
**/
/**
* Class SelectionPlanExtraQuestionValidationRulesFactory
* @package App\Http\Controllers
*/
final class SelectionPlanExtraQuestionValidationRulesFactory extends ExtraQuestionTypeValidationRulesFactory
{
}

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

@ -326,8 +326,8 @@ final class OAuth2PresentationApiController extends OAuth2ProtectedController
'attending_media' => 'required|boolean',
'will_all_speakers_attend' => 'sometimes|boolean',
'links' => 'sometimes|url_array',
'extra_questions' => 'sometimes|entity_value_array',
'tags' => 'sometimes|string_array',
'extra_questions' => 'sometimes|entity_value_array',
];
$data = $data->all();
@ -397,8 +397,8 @@ final class OAuth2PresentationApiController extends OAuth2ProtectedController
'track_id' => 'required|integer',
'attending_media' => 'required|boolean',
'links' => 'sometimes|url_array',
'extra_questions' => 'sometimes|entity_value_array',
'tags' => 'sometimes|string_array',
'extra_questions' => 'sometimes|entity_value_array',
];
$data = $data->all();

11
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitOrderExtraQuestionTypeApiController.php
View File

@ -205,10 +205,7 @@ final class OAuth2SummitOrderExtraQuestionTypeApiController
if (is_null($summit)) return $this->error404();
// Creates a Validator instance and validates the data.
$validation = Validator::make($payload, [
'label' => 'sometimes|string',
'value' => 'required|string',
]);
$validation = Validator::make($payload, ExtraQuestionTypeValueValidationRulesFactory::build($payload));
if ($validation->fails()) {
$messages = $validation->messages()->toArray();
@ -254,11 +251,7 @@ final class OAuth2SummitOrderExtraQuestionTypeApiController
if (is_null($summit)) return $this->error404();
// Creates a Validator instance and validates the data.
$validation = Validator::make($payload, [
'label' => 'sometimes|string',
'value' => 'sometimes|string',
'order' => 'sometimes|integer|min:1'
]);
$validation = Validator::make($payload, ExtraQuestionTypeValueValidationRulesFactory::build($payload, true));
if ($validation->fails()) {
$messages = $validation->messages()->toArray();

285
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitSelectionPlansApiController.php
View File

@ -15,6 +15,8 @@
use App\Http\Utils\EpochCellFormatter;
use App\Models\Exceptions\AuthzException;
use App\Models\Foundation\Summit\Repositories\ISummitCategoryChangeRepository;
use App\Models\Foundation\Summit\Repositories\ISummitSelectionPlanExtraQuestionTypeRepository;
use App\Services\Model\ISelectionPlanExtraQuestionTypeService;
use App\Services\Model\ISummitSelectionPlanService;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator;
@ -58,12 +60,23 @@ final class OAuth2SummitSelectionPlansApiController extends OAuth2ProtectedContr
*/
private $category_change_request_repository;
/**
* ISelectionPlanOrderExtraQuestionTypeService
*/
private $selection_plan_extra_questions_service;
/**
* @var ISummitSelectionPlanExtraQuestionTypeRepository
*/
private $selection_plan_extra_questions_repository;
/**
* OAuth2SummitSelectionPlansApiController constructor.
* @param ISummitRepository $summit_repository
* @param ISummitEventRepository $summit_event_repository
* @param ISummitCategoryChangeRepository $category_change_request_repository
* @param ISummitSelectionPlanExtraQuestionTypeRepository $selection_plan_extra_questions_repository
* @param ISummitSelectionPlanService $selection_plan_service
* @param ISelectionPlanExtraQuestionTypeService $selection_plan_extra_questions_service
* @param IResourceServerContext $resource_server_context
*/
public function __construct
@ -71,7 +84,9 @@ final class OAuth2SummitSelectionPlansApiController extends OAuth2ProtectedContr
ISummitRepository $summit_repository,
ISummitEventRepository $summit_event_repository,
ISummitCategoryChangeRepository $category_change_request_repository,
ISummitSelectionPlanExtraQuestionTypeRepository $selection_plan_extra_questions_repository,
ISummitSelectionPlanService $selection_plan_service,
ISelectionPlanExtraQuestionTypeService $selection_plan_extra_questions_service,
IResourceServerContext $resource_server_context
)
{
@ -81,6 +96,8 @@ final class OAuth2SummitSelectionPlansApiController extends OAuth2ProtectedContr
$this->summit_event_repository = $summit_event_repository;
$this->category_change_request_repository = $category_change_request_repository;
$this->selection_plan_service = $selection_plan_service;
$this->selection_plan_extra_questions_service = $selection_plan_extra_questions_service;
$this->selection_plan_extra_questions_repository = $selection_plan_extra_questions_repository;
}
/**
@ -911,4 +928,272 @@ final class OAuth2SummitSelectionPlansApiController extends OAuth2ProtectedContr
return $this->error500($ex);
}
}
/**
* Extra questions
*/
/**
* @param $summit_id
* @param $selection_plan_id
* @return \Illuminate\Http\JsonResponse|mixed
*/
public function getExtraQuestions($summit_id, $selection_plan_id){
try {
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
return $this->_getAll(
function () {
return [
'name' => ['=@', '=='],
'type' => ['=@', '=='],
'label' => ['=@', '=='],
];
},
function () {
return [
'name' => 'sometimes|string',
'type' => 'sometimes|string',
'label' => 'sometimes|string',
];
},
function () {
return [
'id',
'name',
'label',
'order',
];
},
function ($filter) use ($summit, $selection_plan_id) {
if ($filter instanceof Filter) {
$filter->addFilterCondition
(
FilterElement::makeEqual('selection_plan_id', intval($selection_plan_id))
);
}
return $filter;
},
function () {
return SerializerRegistry::SerializerType_Public;
},
null,
null,
function ($page, $per_page, $filter, $order, $applyExtraFilters) {
return $this->selection_plan_extra_questions_repository->getAllByPage
(
new PagingInfo($page, $per_page),
call_user_func($applyExtraFilters, $filter),
$order
);
}
);
} catch (ValidationException $ex) {
Log::warning($ex);
return $this->error412($ex->getMessages());
}
catch (EntityNotFoundException $ex) {
Log::warning($ex);
return $this->error404($ex->getMessage());
}
catch (AuthzException $ex) {
Log::warning($ex);
return $this->error403($ex);
}
catch (Exception $ex) {
Log::error($ex);
return $this->error500($ex);
}
}
/**
* @param $summit_id
* @param $selection_plan_id
* @return \Illuminate\Http\JsonResponse|mixed
*/
public function getExtraQuestionsMetadata($summit_id, $selection_plan_id){
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
return $this->ok
(
$this->selection_plan_extra_questions_repository->getQuestionsMetadata()
);
}
use ParametrizedAddEntity;
/**
* @param $summit_id
* @param $selection_plan_id
* @return \Illuminate\Http\JsonResponse
*/
public function addExtraQuestion($summit_id, $selection_plan_id){
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$selection_plan = $summit->getSelectionPlanById($selection_plan_id);
if (is_null($selection_plan)) return $this->error404();
$args = [$selection_plan];
return $this->_add(
function ($payload) {
return SelectionPlanExtraQuestionValidationRulesFactory::build($payload);
},
function ($payload, $selection_plan){
return $this->selection_plan_extra_questions_service->addExtraQuestion($selection_plan, $payload);
},
...$args
);
}
use ParametrizedGetEntity;
/**
* @param $summit_id
* @param $selection_plan_id
* @param $question_id
* @return \Illuminate\Http\JsonResponse
*/
public function getExtraQuestion($summit_id, $selection_plan_id, $question_id){
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$selection_plan = $summit->getSelectionPlanById($selection_plan_id);
if (is_null($selection_plan)) return $this->error404();
return $this->_get($question_id, function($id) use($selection_plan){
return $selection_plan->getExtraQuestionById(intval($id));
});
}
use ParametrizedUpdateEntity;
/**
* @param $summit_id
* @param $selection_plan_id
* @param $question_id
* @return \Illuminate\Http\JsonResponse|mixed
*/
public function updateExtraQuestion($summit_id, $selection_plan_id, $question_id){
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$selection_plan = $summit->getSelectionPlanById($selection_plan_id);
if (is_null($selection_plan)) return $this->error404();
$args = [$selection_plan];
return $this->_update($question_id, function($payload){
return SelectionPlanExtraQuestionValidationRulesFactory::build($payload, true);
},
function ($question_id, $payload, $selection_plan){
return $this->selection_plan_extra_questions_service->updateExtraQuestion($selection_plan, $question_id, $payload);
}, ...$args);
}
use ParametrizedDeleteEntity;
/**
* @param $summit_id
* @param $selection_plan_id
* @param $question_id
* @return \Illuminate\Http\JsonResponse
*/
public function deleteExtraQuestion($summit_id, $selection_plan_id, $question_id){
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$selection_plan = $summit->getSelectionPlanById($selection_plan_id);
if (is_null($selection_plan)) return $this->error404();
$args = [$selection_plan];
return $this->_delete(intval($question_id) , function($question_id, $selection_plan){
$this->selection_plan_extra_questions_service->deleteExtraQuestion($selection_plan, $question_id);
}, ...$args);
}
/**
* @param $summit_id
* @param $selection_plan_id
* @param $question_id
* @return \Illuminate\Http\JsonResponse
*/
public function addExtraQuestionValue($summit_id, $selection_plan_id, $question_id){
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$selection_plan = $summit->getSelectionPlanById($selection_plan_id);
if (is_null($selection_plan)) return $this->error404();
$args = [$selection_plan, intval($question_id)];
return $this->_add(
function($payload){
return ExtraQuestionTypeValueValidationRulesFactory::build($payload);
},
function($payload, $selection_plan, $question_id){
return $this->selection_plan_extra_questions_service->
addExtraQuestionValue($selection_plan, $question_id, $payload);
},
...$args);
}
/**
* @param $summit_id
* @param $selection_plan_id
* @param $question_id
* @param $value_id
* @return \Illuminate\Http\JsonResponse|mixed
*/
public function updateExtraQuestionValue($summit_id, $selection_plan_id, $question_id, $value_id){
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$selection_plan = $summit->getSelectionPlanById($selection_plan_id);
if (is_null($selection_plan)) return $this->error404();
$args = [$selection_plan, intval($question_id)];
return $this->_update($value_id, function($payload){
return ExtraQuestionTypeValueValidationRulesFactory::build($payload, false);
},
function($value_id, $payload, $selection_plan, $question_id){
return $this->selection_plan_extra_questions_service->updateExtraQuestionValue
(
$selection_plan,
$question_id,
$value_id,
$payload
);
}, ...$args);
}
/**
* @param $summit_id
* @param $selection_plan_id
* @param $question_id
* @param $value_id
* @return \Illuminate\Http\JsonResponse|mixed
*/
public function deleteExtraQuestionValue($summit_id, $selection_plan_id, $question_id, $value_id){
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$selection_plan = $summit->getSelectionPlanById($selection_plan_id);
if (is_null($selection_plan)) return $this->error404();
$args = [$selection_plan, intval($question_id)];
return $this->_delete($value_id, function($value_id, $selection_plan, $question_id){
$this->selection_plan_extra_questions_service->deleteExtraQuestionValue($selection_plan, $question_id, $value_id);
}
, ...$args);
}
}

1
app/Http/Controllers/Apis/Protected/Summit/Traits/ParametrizedAddEntity.php
View File

@ -19,6 +19,7 @@ use Illuminate\Support\Facades\Validator;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use ModelSerializers\SerializerRegistry;
use Exception;
/**
* Trait ParametrizedAddEntity
* @package App\Http\Controllers

20
app/Http/routes.php
View File

@ -244,6 +244,26 @@ Route::group([
Route::delete('{track_group_id}', [ 'middleware' => 'auth.user', 'uses' => 'OAuth2SummitSelectionPlansApiController@deleteTrackGroupToSelectionPlan']);
});
// extra questions
Route::group(['prefix' => 'extra-questions'], function(){
Route::get('', ['uses' => 'OAuth2SummitSelectionPlansApiController@getExtraQuestions']);
Route::get('metadata', [ 'uses' => 'OAuth2SummitSelectionPlansApiController@getExtraQuestionsMetadata']);
Route::post('', [ 'middleware' => 'auth.user', 'uses' => 'OAuth2SummitSelectionPlansApiController@addExtraQuestion']);
Route::group(['prefix' => '{question_id}'], function(){
Route::get('', ['uses' => 'OAuth2SummitSelectionPlansApiController@getExtraQuestion']);
Route::put('', ['uses' => 'OAuth2SummitSelectionPlansApiController@updateExtraQuestion']);
Route::delete('', ['uses' => 'OAuth2SummitSelectionPlansApiController@deleteExtraQuestion']);
Route::group(['prefix' => 'values'], function () {
Route::post('', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitSelectionPlansApiController@addExtraQuestionValue']);
Route::group(['prefix' => '{value_id}'], function () {
Route::put('', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitSelectionPlansApiController@updateExtraQuestionValue']);
Route::delete('', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitSelectionPlansApiController@deleteExtraQuestionValue']);
});
});
});
});
// presentations
Route::group(['prefix' => 'presentations'], function () {

65
app/ModelSerializers/ExtraQuestionAnswerSerializer.php Normal file
View File

@ -0,0 +1,65 @@
<?php namespace ModelSerializers;
/**
* Copyright 2021 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\ExtraQuestions\ExtraQuestionAnswer;
use Libs\ModelSerializers\AbstractSerializer;
/**
* Class ExtraQuestionAnswerSerializer
* @package ModelSerializers
*/
class ExtraQuestionAnswerSerializer extends SilverStripeSerializer
{
protected static $array_mappings = [
'Value' => 'value:json_string',
'QuestionId' => 'question_id:json_int',
];
/**
* @param null $expand
* @param array $fields
* @param array $relations
* @param array $params
* @return array
*/
public function serialize($expand = null, array $fields = array(), array $relations = array(), array $params = array())
{
$answer = $this->object;
if (!$answer instanceof ExtraQuestionAnswer) return [];
$values = parent::serialize($expand, $fields, $relations, $params);
if (!count($relations)) $relations = $this->getAllowedRelations();
if (!empty($expand)) {
$exp_expand = explode(',', $expand);
foreach ($exp_expand as $relation) {
switch (trim($relation)) {
case 'question':
{
if ($answer->hasQuestion()) {
unset($values['question_id']);
$values['question'] = SerializerRegistry::getInstance()->getSerializer($answer->getQuestion())
->serialize(AbstractSerializer::getExpandForPrefix('question', $expand));
}
}
break;
}
}
}
return $values;
}
}

79
app/ModelSerializers/ExtraQuestionTypeSerializer.php Normal file
View File

@ -0,0 +1,79 @@
<?php namespace ModelSerializers;
/**
* Copyright 2021 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\ExtraQuestions\ExtraQuestionType;
/**
* Class ExtraQuestionTypeSerializer
* @package ModelSerializers
*/
class ExtraQuestionTypeSerializer extends SilverStripeSerializer
{
protected static $array_mappings = [
'Name' => 'name:json_string',
'Type' => 'type:json_string',
'Label' => 'label:json_string',
'Placeholder' => 'placeholder:json_string',
'Order' => 'order:json_int',
'Mandatory' => 'mandatory:json_boolean',
];
protected static $allowed_relations = [
'values',
];
/**
* @param null $expand
* @param array $fields
* @param array $relations
* @param array $params
* @return array
*/
public function serialize($expand = null, array $fields = array(), array $relations = array(), array $params = array() )
{
$question = $this->object;
if (!$question instanceof ExtraQuestionType) return [];
if(!count($relations)) $relations = $this->getAllowedRelations();
$values = parent::serialize($expand, $fields, $relations, $params);
if(in_array('values', $relations) && $question->allowsValues()) {
$question_values = [];
foreach ($question->getValues() as $value) {
$question_values[] = $value->getId();
}
$values['values'] = $question_values;
}
if (!empty($expand)) {
$exp_expand = explode(',', $expand);
foreach ($exp_expand as $relation) {
switch (trim($relation)) {
case 'values':
{
if (!$question->allowsValues())
break;
unset($values['values']);
$question_values = [];
foreach ($question->getValues() as $value) {
$question_values[] = SerializerRegistry::getInstance()->getSerializer($value)->serialize();
}
$values['values'] = $question_values;
}
break;
}
}
}
return $values;
}
}

4
app/ModelSerializers/Summit/Registration/SummitOrderExtraQuestionValueSerializer.php → app/ModelSerializers/ExtraQuestionTypeValueSerializer.php
View File

@ -13,10 +13,10 @@
**/
/**
* Class SummitOrderExtraQuestionValueSerializer
* Class ExtraQuestionTypeValueSerializer
* @package ModelSerializers
*/
final class SummitOrderExtraQuestionValueSerializer extends SilverStripeSerializer
class ExtraQuestionTypeValueSerializer extends SilverStripeSerializer
{
protected static $array_mappings = [
'Label' => 'label:json_string',

339
app/ModelSerializers/SerializerRegistry.php
View File

@ -11,6 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use App\ModelSerializers\CCLA\TeamSerializer;
use App\ModelSerializers\FileSerializer;
use App\ModelSerializers\ISummitAttendeeTicketSerializerTypes;
@ -21,6 +22,7 @@ use App\ModelSerializers\Locations\SummitBookableVenueRoomAttributeValueSerializ
use App\ModelSerializers\Locations\SummitBookableVenueRoomAvailableSlotSerializer;
use App\ModelSerializers\Locations\SummitBookableVenueRoomSerializer;
use App\ModelSerializers\Locations\SummitRoomReservationSerializer;
use App\ModelSerializers\Marketplace\ApplianceSerializer;
use App\ModelSerializers\Marketplace\CloudServiceOfferedSerializer;
use App\ModelSerializers\Marketplace\ConfigurationManagementTypeSerializer;
use App\ModelSerializers\Marketplace\ConsultantClientSerializer;
@ -62,11 +64,6 @@ use App\ModelSerializers\Summit\Presentation\TrackQuestions\TrackQuestionValueTe
use App\ModelSerializers\Summit\Presentation\TrackQuestions\TrackSingleValueTemplateQuestionSerializer;
use App\ModelSerializers\Summit\Registration\SummitAttendeeCSVSerializer;
use App\ModelSerializers\Summit\Registration\SummitAttendeeTicketCSVSerializer;
use App\ModelSerializers\Summit\SponsorBadgeScanCSVSerializer;
use App\ModelSerializers\Summit\SponsorBadgeScanSerializer;
use App\ModelSerializers\Summit\SponsorUserInfoGrantSerializer;
use App\ModelSerializers\Summit\StripePaymentProfileSerializer;
use App\ModelSerializers\Summit\SummitAttendeeBadgeSerializer;
use App\ModelSerializers\Summit\RSVP\Templates\RSVPDropDownQuestionTemplateSerializer;
use App\ModelSerializers\Summit\RSVP\Templates\RSVPLiteralContentQuestionTemplateSerializer;
use App\ModelSerializers\Summit\RSVP\Templates\RSVPMultiValueQuestionTemplateSerializer;
@ -74,13 +71,17 @@ use App\ModelSerializers\Summit\RSVP\Templates\RSVPQuestionValueTemplateSerializ
use App\ModelSerializers\Summit\RSVP\Templates\RSVPSingleValueTemplateQuestionSerializer;
use App\ModelSerializers\Summit\RSVPTemplateSerializer;
use App\ModelSerializers\Summit\ScheduledSummitLocationBannerSerializer;
use App\ModelSerializers\Summit\SelectionPlanSerializer;
use App\ModelSerializers\Summit\SponsorBadgeScanCSVSerializer;
use App\ModelSerializers\Summit\SponsorBadgeScanSerializer;
use App\ModelSerializers\Summit\SponsorUserInfoGrantSerializer;
use App\ModelSerializers\Summit\StripePaymentProfileSerializer;
use App\ModelSerializers\Summit\SummitAttendeeBadgeSerializer;
use App\ModelSerializers\Summit\SummitEmailEventFlowSerializer;
use App\ModelSerializers\Summit\SummitLocationBannerSerializer;
use App\ModelSerializers\Summit\TrackTagGroups\TrackTagGroupAllowedTagSerializer;
use App\ModelSerializers\Summit\TrackTagGroups\TrackTagGroupSerializer;
use Illuminate\Support\Facades\App;
use Libs\ModelSerializers\IModelSerializer;
use models\main\LegalDocument;
use models\oauth2\IResourceServerContext;
use ModelSerializers\ChatTeams\ChatTeamInvitationSerializer;
use ModelSerializers\ChatTeams\ChatTeamMemberSerializer;
@ -93,8 +94,7 @@ use ModelSerializers\Locations\SummitLocationImageSerializer;
use ModelSerializers\Locations\SummitVenueFloorSerializer;
use ModelSerializers\Locations\SummitVenueRoomSerializer;
use ModelSerializers\Locations\SummitVenueSerializer;
use App\ModelSerializers\Marketplace\ApplianceSerializer;
use Illuminate\Support\Facades\App;
/**
* Class SerializerRegistry
* @package ModelSerializers
@ -111,12 +111,14 @@ final class SerializerRegistry
*/
private $resource_server_context;
const SerializerType_Public = 'PUBLIC';
const SerializerType_Public = 'PUBLIC';
const SerializerType_Private = 'PRIVATE';
const SerializerType_Admin = 'ADMIN';
const SerializerType_CSV = 'CSV';
const SerializerType_Admin = 'ADMIN';
const SerializerType_CSV = 'CSV';
private function __clone(){}
private function __clone()
{
}
/**
* @return SerializerRegistry
@ -135,10 +137,13 @@ final class SerializerRegistry
{
$this->resource_server_context = App::make(IResourceServerContext::class);
// resource server config
$this->registry['Api'] = ApiSerializer::class;
$this->registry['ApiEndpoint'] = ApiEndpointSerializer::class;
$this->registry['ApiScope'] = ApiScopeSerializer::class;
$this->registry['Api'] = ApiSerializer::class;
$this->registry['ApiEndpoint'] = ApiEndpointSerializer::class;
$this->registry['ApiScope'] = ApiScopeSerializer::class;
$this->registry['ApiEndpointAuthzGroup'] = ApiEndpointAuthzGroupSerializer::class;
// extra questions base
$this->registry['ExtraQuestionTypeValue'] = ExtraQuestionTypeValueSerializer::class;
// metrics
$this->registry['SummitMetric'] = SummitMetricSerializer::class;
@ -148,32 +153,33 @@ final class SerializerRegistry
// stripe
$this->registry['StripePaymentProfile'] = [
self::SerializerType_Public => StripePaymentProfileSerializer::class,
self::SerializerType_Private => AdminStripePaymentProfileSerializer::class,
self::SerializerType_Private => AdminStripePaymentProfileSerializer::class,
];
$this->registry['SummitAdministratorPermissionGroup'] = SummitAdministratorPermissionGroupSerializer::class;
$this->registry['Summit'] =
$this->registry['Summit'] =
[
self::SerializerType_Public => SummitSerializer::class,
self::SerializerType_Private => AdminSummitSerializer::class
self::SerializerType_Public => SummitSerializer::class,
self::SerializerType_Private => AdminSummitSerializer::class
];
$this->registry['SummitDocument'] = SummitDocumentSerializer::class;
$this->registry['SummitEmailEventFlow'] = SummitEmailEventFlowSerializer::class;
$this->registry['SelectionPlan'] = SelectionPlanSerializer::class;
$this->registry['SummitWIFIConnection'] = SummitWIFIConnectionSerializer::class;
$this->registry['SummitType'] = SummitTypeSerializer::class;
$this->registry['SummitEventType'] = SummitEventTypeSerializer::class;
$this->registry['PresentationType'] = PresentationTypeSerializer::class;
$this->registry['SummitTicketType'] = SummitTicketTypeSerializer::class;
$this->registry['PresentationCategory'] = PresentationCategorySerializer::class;
$this->registry['PresentationCategoryGroup'] = PresentationCategoryGroupSerializer::class;
$this->registry['SummitDocument'] = SummitDocumentSerializer::class;
$this->registry['SummitEmailEventFlow'] = SummitEmailEventFlowSerializer::class;
$this->registry['SelectionPlan'] = SelectionPlanSerializer::class;
$this->registry['SummitSelectionPlanExtraQuestionType'] = SummitSelectionPlanExtraQuestionTypeSerializer::class;
$this->registry['SummitWIFIConnection'] = SummitWIFIConnectionSerializer::class;
$this->registry['SummitType'] = SummitTypeSerializer::class;
$this->registry['SummitEventType'] = SummitEventTypeSerializer::class;
$this->registry['PresentationType'] = PresentationTypeSerializer::class;
$this->registry['SummitTicketType'] = SummitTicketTypeSerializer::class;
$this->registry['PresentationCategory'] = PresentationCategorySerializer::class;
$this->registry['PresentationCategoryGroup'] = PresentationCategoryGroupSerializer::class;
$this->registry['PrivatePresentationCategoryGroup'] = PrivatePresentationCategoryGroupSerializer::class;
$this->registry['Tag'] = TagSerializer::class;
$this->registry['Tag'] = TagSerializer::class;
$this->registry['Language'] = LanguageSerializer::class;
// track questions
$this->registry['TrackAnswer'] = TrackAnswerSerializer::class;
$this->registry['TrackAnswer'] = TrackAnswerSerializer::class;
$this->registry['TrackQuestionValueTemplate'] = TrackQuestionValueTemplateSerializer::class;
$this->registry['TrackTextBoxQuestionTemplate'] = TrackSingleValueTemplateQuestionSerializer::class;
$this->registry['TrackCheckBoxQuestionTemplate'] = TrackSingleValueTemplateQuestionSerializer::class;
@ -183,19 +189,19 @@ final class SerializerRegistry
$this->registry['TrackLiteralContentQuestionTemplate'] = TrackLiteralContentQuestionTemplateSerializer::class;
// events
$this->registry['SummitEvent'] = [
$this->registry['SummitEvent'] = [
self::SerializerType_Public => SummitEventSerializer::class,
self::SerializerType_Private => SummitEventSerializer::class,
self::SerializerType_CSV => AdminSummitEventCSVSerializer::class
];
$this->registry['SummitGroupEvent'] = SummitGroupEventSerializer::class;
$this->registry['TrackTagGroup'] = TrackTagGroupSerializer::class;
$this->registry['Presentation'] =
$this->registry['SummitGroupEvent'] = SummitGroupEventSerializer::class;
$this->registry['TrackTagGroup'] = TrackTagGroupSerializer::class;
$this->registry['Presentation'] =
[
self::SerializerType_Public => PresentationSerializer::class,
self::SerializerType_Private => AdminPresentationSerializer::class,
self::SerializerType_CSV => AdminPresentationCSVSerializer::class,
self::SerializerType_Public => PresentationSerializer::class,
self::SerializerType_Private => AdminPresentationSerializer::class,
self::SerializerType_CSV => AdminPresentationCSVSerializer::class,
IPresentationSerializerTypes::TrackChairs => TrackChairPresentationSerializer::class,
IPresentationSerializerTypes::TrackChairs_CSV => TrackChairPresentationCSVSerializer::class
];
@ -211,71 +217,71 @@ final class SerializerRegistry
$this->registry['SummitSelectedPresentation'] = SummitSelectedPresentationSerializer::class;
$this->registry['SummitTrackChair'] = [
self::SerializerType_Public => SummitTrackChairSerializer::class,
self::SerializerType_Public => SummitTrackChairSerializer::class,
self::SerializerType_CSV => SummitTrackChairCSVSerializer::class
];
$this->registry['SummitPresentationComment'] = SummitPresentationCommentSerializer::class;
$this->registry['SummitMediaFileType'] = SummitMediaFileTypeSerializer::class;
$this->registry['SummitMediaUploadType'] = SummitMediaUploadTypeSerializer::class;
$this->registry['PresentationVideo'] = PresentationVideoSerializer::class;
$this->registry['PresentationSlide'] = PresentationSlideSerializer::class;
$this->registry['PresentationLink'] = PresentationLinkSerializer::class;
$this->registry['SummitPresentationComment'] = SummitPresentationCommentSerializer::class;
$this->registry['SummitMediaFileType'] = SummitMediaFileTypeSerializer::class;
$this->registry['SummitMediaUploadType'] = SummitMediaUploadTypeSerializer::class;
$this->registry['PresentationVideo'] = PresentationVideoSerializer::class;
$this->registry['PresentationSlide'] = PresentationSlideSerializer::class;
$this->registry['PresentationLink'] = PresentationLinkSerializer::class;
$this->registry['PresentationMediaUpload'] = [
self::SerializerType_Public => PresentationMediaUploadSerializer::class,
self::SerializerType_Private => AdminPresentationMediaUploadSerializer::class
self::SerializerType_Public => PresentationMediaUploadSerializer::class,
self::SerializerType_Private => AdminPresentationMediaUploadSerializer::class
];
// Company
$this->registry['Company'] = CompanySerializer::class;
$this->registry['SponsoredProject'] = SponsoredProjectSerializer::class;
$this->registry['Company'] = CompanySerializer::class;
$this->registry['SponsoredProject'] = SponsoredProjectSerializer::class;
$this->registry['ProjectSponsorshipType'] = ProjectSponsorshipTypeSerializer::class;
$this->registry['SupportingCompany'] = SupportingCompanySerializer::class;
$this->registry['SupportingCompany'] = SupportingCompanySerializer::class;
$this->registry['PresentationSpeaker'] =
$this->registry['PresentationSpeaker'] =
[
self::SerializerType_Public => PresentationSpeakerSerializer::class,
self::SerializerType_Private => AdminPresentationSpeakerSerializer::class
self::SerializerType_Public => PresentationSpeakerSerializer::class,
self::SerializerType_Private => AdminPresentationSpeakerSerializer::class
];
$this->registry['SpeakerEditPermissionRequest'] = SpeakerEditPermissionRequestSerializer::class;
// RSVP
$this->registry['RSVP'] = RSVPSerializer::class;
$this->registry['RSVPAnswer'] = RSVPAnswerSerializer::class;
$this->registry['RSVPTemplate'] = RSVPTemplateSerializer::class;
$this->registry['RSVPQuestionValueTemplate'] = RSVPQuestionValueTemplateSerializer::class;
$this->registry['RSVP'] = RSVPSerializer::class;
$this->registry['RSVPAnswer'] = RSVPAnswerSerializer::class;
$this->registry['RSVPTemplate'] = RSVPTemplateSerializer::class;
$this->registry['RSVPQuestionValueTemplate'] = RSVPQuestionValueTemplateSerializer::class;
$this->registry['RSVPSingleValueTemplateQuestion'] = RSVPSingleValueTemplateQuestionSerializer::class;
$this->registry['RSVPTextBoxQuestionTemplate'] = RSVPSingleValueTemplateQuestionSerializer::class;
$this->registry['RSVPTextAreaQuestionTemplate'] = RSVPSingleValueTemplateQuestionSerializer::class;
$this->registry['RSVPLiteralContentQuestionTemplate'] = RSVPLiteralContentQuestionTemplateSerializer::class;
$this->registry['RSVPMemberEmailQuestionTemplate'] = RSVPSingleValueTemplateQuestionSerializer::class;
$this->registry['RSVPSingleValueTemplateQuestion'] = RSVPSingleValueTemplateQuestionSerializer::class;
$this->registry['RSVPTextBoxQuestionTemplate'] = RSVPSingleValueTemplateQuestionSerializer::class;
$this->registry['RSVPTextAreaQuestionTemplate'] = RSVPSingleValueTemplateQuestionSerializer::class;
$this->registry['RSVPLiteralContentQuestionTemplate'] = RSVPLiteralContentQuestionTemplateSerializer::class;
$this->registry['RSVPMemberEmailQuestionTemplate'] = RSVPSingleValueTemplateQuestionSerializer::class;
$this->registry['RSVPMemberFirstNameQuestionTemplate'] = RSVPSingleValueTemplateQuestionSerializer::class;
$this->registry['RSVPMemberLastNameQuestionTemplate'] = RSVPSingleValueTemplateQuestionSerializer::class;
$this->registry['RSVPMemberLastNameQuestionTemplate'] = RSVPSingleValueTemplateQuestionSerializer::class;
$this->registry['RSVPMemberLastNameQuestionTemplate'] = RSVPSingleValueTemplateQuestionSerializer::class;
$this->registry['RSVPMemberLastNameQuestionTemplate'] = RSVPSingleValueTemplateQuestionSerializer::class;
$this->registry['RSVPCheckBoxListQuestionTemplate'] = RSVPMultiValueQuestionTemplateSerializer::class;
$this->registry['RSVPCheckBoxListQuestionTemplate'] = RSVPMultiValueQuestionTemplateSerializer::class;
$this->registry['RSVPRadioButtonListQuestionTemplate'] = RSVPMultiValueQuestionTemplateSerializer::class;
$this->registry['RSVPDropDownQuestionTemplate'] = RSVPDropDownQuestionTemplateSerializer::class;
$this->registry['RSVPDropDownQuestionTemplate'] = RSVPDropDownQuestionTemplateSerializer::class;
$this->registry['SpeakerExpertise'] = SpeakerExpertiseSerializer::class;
$this->registry['SpeakerTravelPreference'] = SpeakerTravelPreferenceSerializer::class;
$this->registry['SpeakerPresentationLink'] = SpeakerPresentationLinkSerializer::class;
$this->registry['SpeakerActiveInvolvement'] = SpeakerActiveInvolvementSerializer::class;
$this->registry['SpeakerOrganizationalRole'] = SpeakerOrganizationalRoleSerializer::class;
$this->registry['SpeakerExpertise'] = SpeakerExpertiseSerializer::class;
$this->registry['SpeakerTravelPreference'] = SpeakerTravelPreferenceSerializer::class;
$this->registry['SpeakerPresentationLink'] = SpeakerPresentationLinkSerializer::class;
$this->registry['SpeakerActiveInvolvement'] = SpeakerActiveInvolvementSerializer::class;
$this->registry['SpeakerOrganizationalRole'] = SpeakerOrganizationalRoleSerializer::class;
$this->registry['SummitEventFeedback'] = SummitEventFeedbackSerializer::class;
$this->registry['SummitMemberSchedule'] = SummitMemberScheduleSerializer::class;
$this->registry['SummitMemberFavorite'] = SummitMemberFavoriteSerializer::class;
$this->registry['SummitEntityEvent'] = SummitEntityEventSerializer::class;
$this->registry['SummitEventWithFile'] = SummitEventWithFileSerializer::class;
$this->registry['SummitScheduleEmptySpot'] = SummitScheduleEmptySpotSerializer::class;
$this->registry['SummitEventFeedback'] = SummitEventFeedbackSerializer::class;
$this->registry['SummitMemberSchedule'] = SummitMemberScheduleSerializer::class;
$this->registry['SummitMemberFavorite'] = SummitMemberFavoriteSerializer::class;
$this->registry['SummitEntityEvent'] = SummitEntityEventSerializer::class;
$this->registry['SummitEventWithFile'] = SummitEventWithFileSerializer::class;
$this->registry['SummitScheduleEmptySpot'] = SummitScheduleEmptySpotSerializer::class;
// promo codes
$this->registry['SummitRegistrationPromoCode'] = SummitRegistrationPromoCodeSerializer::class;
$this->registry['MemberSummitRegistrationPromoCode'] = MemberSummitRegistrationPromoCodeSerializer::class;
$this->registry['SummitRegistrationPromoCode'] = SummitRegistrationPromoCodeSerializer::class;
$this->registry['MemberSummitRegistrationPromoCode'] = MemberSummitRegistrationPromoCodeSerializer::class;
$this->registry['SpeakerSummitRegistrationPromoCode'] = SpeakerSummitRegistrationPromoCodeSerializer::class;
$this->registry['SponsorSummitRegistrationPromoCode'] = SponsorSummitRegistrationPromoCodeSerializer::class;
$this->registry['PresentationSpeakerSummitAssistanceConfirmationRequest'] = PresentationSpeakerSummitAssistanceConfirmationRequestSerializer::class;
@ -286,58 +292,58 @@ final class SerializerRegistry
$this->registry['SponsorSummitRegistrationDiscountCode'] = SponsorSummitRegistrationDiscountCodeSerializer::class;
// registration
$this->registry['SummitRegistrationInvitation'] =
[
self::SerializerType_Public => SummitRegistrationInvitationSerializer::class,
self::SerializerType_CSV => SummitRegistrationInvitationCSVSerializer::class,
];
$this->registry['SummitRegistrationInvitation'] =
[
self::SerializerType_Public => SummitRegistrationInvitationSerializer::class,
self::SerializerType_CSV => SummitRegistrationInvitationCSVSerializer::class,
];
$this->registry['SummitAccessLevelType'] = SummitAccessLevelTypeSerializer::class;
$this->registry['SummitTaxType'] = SummitTaxTypeSerializer::class;
$this->registry['SummitBadgeType'] = SummitBadgeTypeSerializer::class;
$this->registry['SummitAccessLevelType'] = SummitAccessLevelTypeSerializer::class;
$this->registry['SummitTaxType'] = SummitTaxTypeSerializer::class;
$this->registry['SummitBadgeType'] = SummitBadgeTypeSerializer::class;
$this->registry['SummitBadgeFeatureType'] = SummitBadgeFeatureTypeSerializer::class;
$this->registry['SummitRefundPolicyType'] = SummitRefundPolicyTypeSerializer::class;
$this->registry['SummitOrderExtraQuestionValue'] = SummitOrderExtraQuestionValueSerializer::class;
$this->registry['SummitOrderExtraQuestionType'] = SummitOrderExtraQuestionTypeSerializer::class;
// orders
$this->registry['SummitOrder'] = [
self::SerializerType_Public => SummitOrderBaseSerializer::class,
ISummitOrderSerializerTypes::CheckOutType => SummitOrderBaseSerializer::class,
ISummitOrderSerializerTypes::ReservationType => SummitOrderReservationSerializer::class,
ISummitOrderSerializerTypes::AdminType => SummitOrderAdminSerializer::class,
self::SerializerType_Public => SummitOrderBaseSerializer::class,
ISummitOrderSerializerTypes::CheckOutType => SummitOrderBaseSerializer::class,
ISummitOrderSerializerTypes::ReservationType => SummitOrderReservationSerializer::class,
ISummitOrderSerializerTypes::AdminType => SummitOrderAdminSerializer::class,
];
$this->registry['SummitOrderExtraQuestionAnswer'] = SummitOrderExtraQuestionAnswerSerializer::class;
$this->registry['SummitAttendee'] = [
self::SerializerType_Public => SummitAttendeeSerializer::class,
$this->registry['SummitAttendee'] = [
self::SerializerType_Public => SummitAttendeeSerializer::class,
self::SerializerType_Private => SummitAttendeeAdminSerializer::class,
self::SerializerType_CSV => SummitAttendeeCSVSerializer::class,
self::SerializerType_CSV => SummitAttendeeCSVSerializer::class,
];
$this->registry['SummitAttendeeTicket'] = [
self::SerializerType_Public => BaseSummitAttendeeTicketSerializer::class,
ISummitAttendeeTicketSerializerTypes::AdminType => SummitAttendeeTicketSerializer::class,
ISummitAttendeeTicketSerializerTypes::PublicEdition => PublicEditionSummitAttendeeTicketSerializer::class,
ISummitAttendeeTicketSerializerTypes::GuestEdition => GuestEditionSummitAttendeeTicketSerializer::class,
self::SerializerType_CSV => SummitAttendeeTicketCSVSerializer::class,
$this->registry['SummitAttendeeTicket'] = [
self::SerializerType_Public => BaseSummitAttendeeTicketSerializer::class,
ISummitAttendeeTicketSerializerTypes::AdminType => SummitAttendeeTicketSerializer::class,
ISummitAttendeeTicketSerializerTypes::PublicEdition => PublicEditionSummitAttendeeTicketSerializer::class,
ISummitAttendeeTicketSerializerTypes::GuestEdition => GuestEditionSummitAttendeeTicketSerializer::class,
self::SerializerType_CSV => SummitAttendeeTicketCSVSerializer::class,
];
$this->registry['SummitAttendeeBadge'] = SummitAttendeeBadgeSerializer::class;
$this->registry['SummitAttendeeBadge'] = SummitAttendeeBadgeSerializer::class;
$this->registry['SponsorBadgeScan'] = [
self::SerializerType_Public => SponsorBadgeScanSerializer::class,
self::SerializerType_CSV => SponsorBadgeScanCSVSerializer::class,
$this->registry['SponsorBadgeScan'] = [
self::SerializerType_Public => SponsorBadgeScanSerializer::class,
self::SerializerType_CSV => SponsorBadgeScanCSVSerializer::class,
];
$this->registry['SponsorUserInfoGrant'] = [
self::SerializerType_Public => SponsorUserInfoGrantSerializer::class,
self::SerializerType_CSV => SponsorUserInfoGrantSerializer::class,
$this->registry['SponsorUserInfoGrant'] = [
self::SerializerType_Public => SponsorUserInfoGrantSerializer::class,
self::SerializerType_CSV => SponsorUserInfoGrantSerializer::class,
];
$this->registry['SummitAttendeeTicketTax'] = SummitAttendeeTicketTaxSerializer::class;
$this->registry['SummitAttendeeTicketTax'] = SummitAttendeeTicketTaxSerializer::class;
// summit sponsors
@ -345,20 +351,20 @@ final class SerializerRegistry
$this->registry['Sponsor'] = SponsorSerializer::class;
// locations
$this->registry['SummitVenue'] = SummitVenueSerializer::class;
$this->registry['SummitVenueRoom'] = SummitVenueRoomSerializer::class;
$this->registry['SummitVenueFloor'] = SummitVenueFloorSerializer::class;
$this->registry['SummitExternalLocation'] = SummitExternalLocationSerializer::class;
$this->registry['SummitHotel'] = SummitHotelSerializer::class;
$this->registry['SummitAirport'] = SummitAirportSerializer::class;
$this->registry['SummitLocationImage'] = SummitLocationImageSerializer::class;
$this->registry['SummitLocationBanner'] = SummitLocationBannerSerializer::class;
$this->registry['ScheduledSummitLocationBanner'] = ScheduledSummitLocationBannerSerializer::class;
$this->registry['SummitBookableVenueRoom'] = SummitBookableVenueRoomSerializer::class;
$this->registry['SummitBookableVenueRoomAttributeType'] = SummitBookableVenueRoomAttributeTypeSerializer::class;
$this->registry['SummitVenue'] = SummitVenueSerializer::class;
$this->registry['SummitVenueRoom'] = SummitVenueRoomSerializer::class;
$this->registry['SummitVenueFloor'] = SummitVenueFloorSerializer::class;
$this->registry['SummitExternalLocation'] = SummitExternalLocationSerializer::class;
$this->registry['SummitHotel'] = SummitHotelSerializer::class;
$this->registry['SummitAirport'] = SummitAirportSerializer::class;
$this->registry['SummitLocationImage'] = SummitLocationImageSerializer::class;
$this->registry['SummitLocationBanner'] = SummitLocationBannerSerializer::class;
$this->registry['ScheduledSummitLocationBanner'] = ScheduledSummitLocationBannerSerializer::class;
$this->registry['SummitBookableVenueRoom'] = SummitBookableVenueRoomSerializer::class;
$this->registry['SummitBookableVenueRoomAttributeType'] = SummitBookableVenueRoomAttributeTypeSerializer::class;
$this->registry['SummitBookableVenueRoomAttributeValue'] = SummitBookableVenueRoomAttributeValueSerializer::class;
$this->registry['SummitBookableVenueRoomAvailableSlot'] = SummitBookableVenueRoomAvailableSlotSerializer::class;
$this->registry['SummitRoomReservation'] = SummitRoomReservationSerializer::class;
$this->registry['SummitBookableVenueRoomAvailableSlot'] = SummitBookableVenueRoomAvailableSlotSerializer::class;
$this->registry['SummitRoomReservation'] = SummitRoomReservationSerializer::class;
// track tag groups
$this->registry['TrackTagGroup'] = TrackTagGroupSerializer::class;
@ -368,62 +374,62 @@ final class SerializerRegistry
// member
$this->registry['Member'] = [
self::SerializerType_Public => PublicMemberSerializer::class,
self::SerializerType_Public => PublicMemberSerializer::class,
self::SerializerType_Private => OwnMemberSerializer::class,
self::SerializerType_Admin => AdminMemberSerializer::class
self::SerializerType_Admin => AdminMemberSerializer::class
];
$this->registry['LegalAgreement'] = LegalAgreementSerializer::class;
$this->registry['LegalDocument'] = LegalDocumentSerializer::class;
$this->registry['Group'] = GroupSerializer::class;
$this->registry['Affiliation'] = AffiliationSerializer::class;
$this->registry['Organization'] = OrganizationSerializer::class;
$this->registry['Group'] = GroupSerializer::class;
$this->registry['Affiliation'] = AffiliationSerializer::class;
$this->registry['Organization'] = OrganizationSerializer::class;
// push notification
$this->registry['PushNotificationMessage'] = PushNotificationMessageSerializer::class;
$this->registry['SummitPushNotification'] = SummitPushNotificationSerializer::class;
$this->registry['PushNotificationMessage'] = PushNotificationMessageSerializer::class;
$this->registry['SummitPushNotification'] = SummitPushNotificationSerializer::class;
// teams
$this->registry['ChatTeam'] = ChatTeamSerializer::class;
$this->registry['ChatTeamMember'] = ChatTeamMemberSerializer::class;
$this->registry['ChatTeamInvitation'] = ChatTeamInvitationSerializer::class;
$this->registry['ChatTeam'] = ChatTeamSerializer::class;
$this->registry['ChatTeamMember'] = ChatTeamMemberSerializer::class;
$this->registry['ChatTeamInvitation'] = ChatTeamInvitationSerializer::class;
$this->registry['ChatTeamPushNotificationMessage'] = ChatTeamPushNotificationMessageSerializer::class;
// marketplace
$this->registry['Appliance'] = ApplianceSerializer::class;
$this->registry["Distribution"] = DistributionSerializer::class;
$this->registry['MarketPlaceReview'] = MarketPlaceReviewSerializer::class;
$this->registry['Appliance'] = ApplianceSerializer::class;
$this->registry["Distribution"] = DistributionSerializer::class;
$this->registry['MarketPlaceReview'] = MarketPlaceReviewSerializer::class;
$this->registry['OpenStackImplementationApiCoverage'] = OpenStackImplementationApiCoverageSerializer::class;
$this->registry['GuestOSType'] = GuestOSTypeSerializer::class;
$this->registry['HyperVisorType'] = HyperVisorTypeSerializer::class;
$this->registry['Region'] = RegionSerializer::class;
$this->registry['RegionalSupport'] = RegionalSupportSerializer::class;
$this->registry['SupportChannelType'] = SupportChannelTypeSerializer::class;
$this->registry['Office'] = OfficeSerializer::class;
$this->registry['Consultant'] = ConsultantSerializer::class;
$this->registry['ConsultantClient'] = ConsultantClientSerializer::class;
$this->registry['SpokenLanguage'] = SpokenLanguageSerializer::class;
$this->registry['ConfigurationManagementType'] = ConfigurationManagementTypeSerializer::class;
$this->registry['ServiceOfferedType'] = ServiceOfferedTypeSerializer::class;
$this->registry['ConsultantServiceOfferedType'] = ConsultantServiceOfferedTypeSerializer::class;
$this->registry['DataCenterLocation'] = DataCenterLocationSerializer::class;
$this->registry['DataCenterRegion'] = DataCenterRegionSerializer::class;
$this->registry['PricingSchemaType'] = PricingSchemaTypeSerializer::class;
$this->registry['PrivateCloudService'] = PrivateCloudServiceSerializer::class;
$this->registry['PublicCloudService'] = PublicCloudServiceSerializer::class;
$this->registry['RemoteCloudService'] = RemoteCloudServiceSerializer::class;
$this->registry['CloudServiceOffered'] = CloudServiceOfferedSerializer::class;
$this->registry['GuestOSType'] = GuestOSTypeSerializer::class;
$this->registry['HyperVisorType'] = HyperVisorTypeSerializer::class;
$this->registry['Region'] = RegionSerializer::class;
$this->registry['RegionalSupport'] = RegionalSupportSerializer::class;
$this->registry['SupportChannelType'] = SupportChannelTypeSerializer::class;
$this->registry['Office'] = OfficeSerializer::class;
$this->registry['Consultant'] = ConsultantSerializer::class;
$this->registry['ConsultantClient'] = ConsultantClientSerializer::class;
$this->registry['SpokenLanguage'] = SpokenLanguageSerializer::class;
$this->registry['ConfigurationManagementType'] = ConfigurationManagementTypeSerializer::class;
$this->registry['ServiceOfferedType'] = ServiceOfferedTypeSerializer::class;
$this->registry['ConsultantServiceOfferedType'] = ConsultantServiceOfferedTypeSerializer::class;
$this->registry['DataCenterLocation'] = DataCenterLocationSerializer::class;
$this->registry['DataCenterRegion'] = DataCenterRegionSerializer::class;
$this->registry['PricingSchemaType'] = PricingSchemaTypeSerializer::class;
$this->registry['PrivateCloudService'] = PrivateCloudServiceSerializer::class;
$this->registry['PublicCloudService'] = PublicCloudServiceSerializer::class;
$this->registry['RemoteCloudService'] = RemoteCloudServiceSerializer::class;
$this->registry['CloudServiceOffered'] = CloudServiceOfferedSerializer::class;
// software
$this->registry['OpenStackComponent'] = OpenStackComponentSerializer::class;
$this->registry['OpenStackRelease'] = OpenStackReleaseSerializer::class;
$this->registry['OpenStackComponent'] = OpenStackComponentSerializer::class;
$this->registry['OpenStackRelease'] = OpenStackReleaseSerializer::class;
// ccla
$this->registry['Team'] = TeamSerializer::class;
$this->registry['Team'] = TeamSerializer::class;
$this->registry['File'] = FileSerializer::class;
$this->registry['File'] = FileSerializer::class;
}
/**
@ -431,17 +437,18 @@ final class SerializerRegistry
* @param string $type
* @return IModelSerializer
*/
public function getSerializer($object, $type = self::SerializerType_Public){
if(is_null($object)) return null;
public function getSerializer($object, $type = self::SerializerType_Public)
{
if (is_null($object)) return null;
$reflect = new \ReflectionClass($object);
$class = $reflect->getShortName();
if(!isset($this->registry[$class]))
throw new \InvalidArgumentException('Serializer not found for '.$class);
$class = $reflect->getShortName();
if (!isset($this->registry[$class]))
throw new \InvalidArgumentException('Serializer not found for ' . $class);
$serializer_class = $this->registry[$class];
if(is_array($serializer_class)){
if(!isset($serializer_class[$type]))
if (is_array($serializer_class)) {
if (!isset($serializer_class[$type]))
throw new \InvalidArgumentException(sprintf('Serializer not found for %s , type %s', $class, $type));
$serializer_class = $serializer_class[$type];
}

4
app/ModelSerializers/Summit/Presentation/PresentationSerializer.php
View File

@ -148,7 +148,7 @@ class PresentationSerializer extends SummitEventSerializer
if(in_array('extra_questions', $relations))
{
$answers = [];
foreach ($presentation->getAnswers() as $answer) {
foreach ($presentation->getExtraQuestionAnswers() as $answer) {
$answers[] = $answer->getId();
}
$values['extra_questions'] = $answers;
@ -257,7 +257,7 @@ class PresentationSerializer extends SummitEventSerializer
break;
case 'extra_questions':{
$answers = [];
foreach ($presentation->getAnswers() as $answer) {
foreach ($presentation->getExtraQuestionAnswers() as $answer) {
$answers[]= SerializerRegistry::getInstance()->getSerializer($answer)->serialize(AbstractSerializer::filterExpandByPrefix($expand, $relation));
}
$values['extra_questions'] = $answers;

23
app/ModelSerializers/Summit/Registration/SummitOrderExtraQuestionAnswerSerializer.php
View File

@ -11,20 +11,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Libs\ModelSerializers\AbstractSerializer;
use models\summit\SummitOrderExtraQuestionAnswer;
/**
* Class SummitOrderExtraQuestionAnswerSerializer
* @package ModelSerializers
*/
final class SummitOrderExtraQuestionAnswerSerializer extends SilverStripeSerializer
final class SummitOrderExtraQuestionAnswerSerializer extends ExtraQuestionAnswerSerializer
{
protected static $array_mappings = [
'Value' => 'value:json_string',
'OrderId' => 'order_id:json_int',
'AttendeeId' => 'attendee_id:json_int',
'QuestionId' => 'question_id:json_int',
];
/**
@ -42,7 +39,6 @@ final class SummitOrderExtraQuestionAnswerSerializer extends SilverStripeSeriali
if (!count($relations)) $relations = $this->getAllowedRelations();
if (!empty($expand)) {
$exp_expand = explode(',', $expand);
foreach ($exp_expand as $relation) {
@ -53,7 +49,8 @@ final class SummitOrderExtraQuestionAnswerSerializer extends SilverStripeSeriali
if ($answer->hasOrder()) {
unset($values['order_id']);
$values['order'] = SerializerRegistry::getInstance()->getSerializer($answer->getOrder())->serialize(AbstractSerializer::getExpandForPrefix('order', $expand));
$values['order'] = SerializerRegistry::getInstance()->getSerializer($answer->getOrder())
->serialize(AbstractSerializer::getExpandForPrefix('order', $expand));
}
}
break;
@ -63,22 +60,12 @@ final class SummitOrderExtraQuestionAnswerSerializer extends SilverStripeSeriali
if ($answer->hasAttendee()) {
unset($values['attendee_id']);
$values['attendee'] = SerializerRegistry::getInstance()->getSerializer($answer->getAttendee())->serialize(AbstractSerializer::getExpandForPrefix('attendee', $expand));
$values['attendee'] = SerializerRegistry::getInstance()->getSerializer($answer->getAttendee())
->serialize(AbstractSerializer::getExpandForPrefix('attendee', $expand));
}
}
break;
case 'question':
{
if ($answer->hasQuestion()) {
unset($values['question_id']);
$values['question'] = SerializerRegistry::getInstance()->getSerializer($answer->getQuestion())->serialize(AbstractSerializer::getExpandForPrefix('question', $expand));
}
}
break;
}
}
}

42
app/ModelSerializers/Summit/Registration/SummitOrderExtraQuestionTypeSerializer.php
View File

@ -16,24 +16,14 @@ use models\summit\SummitOrderExtraQuestionType;
* Class SummitOrderExtraQuestionTypeSerializer
* @package ModelSerializers
*/
final class SummitOrderExtraQuestionTypeSerializer extends SilverStripeSerializer
final class SummitOrderExtraQuestionTypeSerializer extends ExtraQuestionTypeSerializer
{
protected static $array_mappings = [
'Name' => 'name:json_string',
'Type' => 'type:json_string',
'Label' => 'label:json_string',
'Usage' => 'usage:json_string',
'Placeholder' => 'placeholder:json_string',
'Printable' => 'printable:json_boolean',
'Order' => 'order:json_int',
'Mandatory' => 'mandatory:json_boolean',
'SummitId' => 'summit_id:json_int',
];
protected static $allowed_relations = [
'values',
];
/**
* @param null $expand
* @param array $fields
@ -47,36 +37,6 @@ final class SummitOrderExtraQuestionTypeSerializer extends SilverStripeSerialize
if (!$question instanceof SummitOrderExtraQuestionType) return [];
if(!count($relations)) $relations = $this->getAllowedRelations();
$values = parent::serialize($expand, $fields, $relations, $params);
if(in_array('values', $relations) && $question->allowsValues()) {
$question_values = [];
foreach ($question->getValues() as $value) {
$question_values[] = $value->getId();
}
$values['values'] = $question_values;
}
if (!empty($expand)) {
$exp_expand = explode(',', $expand);
foreach ($exp_expand as $relation) {
switch (trim($relation)) {
case 'values':
{
if (!$question->allowsValues())
break;
unset($values['values']);
$question_values = [];
foreach ($question->getValues() as $value) {
$question_values[] = SerializerRegistry::getInstance()->getSerializer($value)->serialize();
}
$values['values'] = $question_values;
}
break;
}
}
}
return $values;
}
}

17
app/ModelSerializers/Summit/SelectionPlanSerializer.php
View File

@ -1,4 +1,4 @@
<?php namespace App\ModelSerializers\Summit;
<?php namespace ModelSerializers;
/**
* Copyright 2018 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
@ -55,6 +55,13 @@ final class SelectionPlanSerializer extends SilverStripeSerializer
$values['track_groups'] = $category_groups;
$extra_questions = [];
foreach ($selection_plan->getExtraQuestions() as $extraQuestion) {
$extra_questions[] = $extraQuestion->getId();
}
$values['extra_questions'] = $extra_questions;
if (!empty($expand)) {
$relations = explode(',', $expand);
foreach ($relations as $relation) {
@ -68,6 +75,14 @@ final class SelectionPlanSerializer extends SilverStripeSerializer
$values['track_groups'] = $category_groups;
}
break;
case 'extra_questions':{
$extra_questions = [];
foreach ($selection_plan->getExtraQuestions() as $extraQuestion) {
$extra_questions[] = SerializerRegistry::getInstance()->getSerializer($extraQuestion)->serialize(AbstractSerializer::filterExpandByPrefix($expand, $relation));
}
$values['extra_questions'] = $extra_questions;
}
break;
case 'summit':{
unset($values['summit_id']);
$values['summit'] = SerializerRegistry::getInstance()->getSerializer($selection_plan->getSummit())->serialize(AbstractSerializer::filterExpandByPrefix($expand, $relation));

25
app/ModelSerializers/Summit/SummitSelectionPlanExtraQuestionTypeSerializer.php Normal file
View File

@ -0,0 +1,25 @@
<?php namespace ModelSerializers;
/**
* Copyright 2021 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.
**/
/**
* Class SelectionPlanExtraQuestionTypeSerializer
* @package ModelSerializers
*/
final class SummitSelectionPlanExtraQuestionTypeSerializer extends ExtraQuestionTypeSerializer
{
protected static $array_mappings = [
'SelectionPlanId' => 'selection_plan_id:json_int',
];
}

94
app/Models/Foundation/Main/ExtraQuestions/ExtraQuestionAnswer.php Normal file
View File

@ -0,0 +1,94 @@
<?php namespace App\Models\Foundation\ExtraQuestions;
/**
* Copyright 2021 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\One2ManyPropertyTrait;
use models\utils\SilverstripeBaseModel;
use Doctrine\ORM\Mapping AS ORM;
/**
* @ORM\Entity
* @ORM\Table(name="ExtraQuestionAnswer")
* @ORM\InheritanceType("JOINED")
* @ORM\DiscriminatorColumn(name="ClassName", type="string")
* @ORM\DiscriminatorMap({
* "ExtraQuestionAnswer" = "ExtraQuestionAnswer",
* "SummitOrderExtraQuestionAnswer" = "models\summit\SummitOrderExtraQuestionAnswer",
* "PresentationExtraQuestionAnswer" = "models\summit\PresentationExtraQuestionAnswer",
* })
* Class ExtraQuestionAnswer
* @package App\Models\Foundation\ExtraQuestionAnswer
*/
abstract class ExtraQuestionAnswer extends SilverstripeBaseModel
{
/**
* @ORM\ManyToOne(targetEntity="ExtraQuestionType")
* @ORM\JoinColumn(name="QuestionID", referencedColumnName="ID")
* @var ExtraQuestionType
*/
protected $question;
/**
* @ORM\Column(name="Value", type="string")
* @var string
*/
protected $value;
use One2ManyPropertyTrait;
protected $getIdMappings = [
'getQuestionId' => 'question',
];
protected $hasPropertyMappings = [
'hasQuestion' => 'question',
];
/**
* @return bool
*/
public function hasValue():bool {
return !empty($this->value);
}
/**
* @return ExtraQuestionType
*/
public function getQuestion(): ExtraQuestionType
{
return $this->question;
}
/**
* @param ExtraQuestionType $question
*/
public function setQuestion(ExtraQuestionType $question): void
{
$this->question = $question;
}
/**
* @return string
*/
public function getValue(): string
{
return $this->value;
}
/**
* @param string $value
*/
public function setValue(string $value): void
{
$this->value = $value;
}
}

165
app/Models/Foundation/Summit/Registration/Questions/SummitOrderExtraQuestionType.php → app/Models/Foundation/Main/ExtraQuestions/ExtraQuestionType.php
View File

@ -1,6 +1,6 @@
<?php namespace models\summit;
<?php namespace App\Models\Foundation\ExtraQuestions;
/**
* Copyright 2019 OpenStack Foundation
* Copyright 2021 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
@ -11,6 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use App\Models\Foundation\Main\IOrderable;
use App\Models\Foundation\Main\OrderableChilds;
use Doctrine\Common\Collections\Criteria;
@ -19,75 +20,70 @@ use models\utils\SilverstripeBaseModel;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping AS ORM;
/**
* @ORM\Entity(repositoryClass="App\Repositories\Summit\DoctrineSummitOrderExtraQuestionTypeRepository")
* @ORM\AssociationOverrides({
* @ORM\AssociationOverride(
* name="summit",
* inversedBy="order_extra_questions"
* )
* @ORM\Entity
* @ORM\Table(name="ExtraQuestionType")
* @ORM\InheritanceType("JOINED")
* @ORM\DiscriminatorColumn(name="ClassName", type="string")
* @ORM\DiscriminatorMap({
* "ExtraQuestionType" = "ExtraQuestionType",
* "SummitSelectionPlanExtraQuestionType" = "App\Models\Foundation\Summit\ExtraQuestions\SummitSelectionPlanExtraQuestionType",
* "SummitOrderExtraQuestionType" = "models\summit\SummitOrderExtraQuestionType",
* })
* @ORM\Table(name="SummitOrderExtraQuestionType")
* Class SummitOrderExtraQuestionType
* @package models\summit
* Class ExtraQuestionType
* @package App\Models\Foundation\ExtraQuestions
*/
class SummitOrderExtraQuestionType extends SilverstripeBaseModel
implements IOrderable
abstract class ExtraQuestionType extends SilverstripeBaseModel
implements IOrderable
{
use SummitOwned;
/**
* @ORM\Column(name="Name", type="string")
* @var string
*/
private $name;
protected $name;
/**
* @ORM\Column(name="Type", type="string")
* @var string
*/
private $type;
protected $type;
/**
* @ORM\Column(name="Label", type="string")
* @var string
*/
private $label;
protected $label;
/**
* @ORM\Column(name="`Order`", type="integer")
* @var int
*/
private $order;
protected $order;
/**
* @ORM\Column(name="Mandatory", type="boolean")
* @var boolean
*/
private $mandatory;
/**
* @ORM\Column(name="`Usage`", type="string")
* @var string
*/
private $usage;
protected $mandatory;
/**
* @ORM\Column(name="Placeholder", type="string")
* @var string
*/
private $placeholder;
protected $placeholder;
/**
* @ORM\Column(name="Printable", type="boolean")
* @var boolean
* @ORM\OneToMany(targetEntity="ExtraQuestionTypeValue", mappedBy="question", cascade={"persist","remove"}, orphanRemoval=true)
* @var ExtraQuestionTypeValue[]
*/
private $printable;
protected $values;
/**
* @ORM\OneToMany(targetEntity="SummitOrderExtraQuestionValue", mappedBy="question", cascade={"persist","remove"}, orphanRemoval=true)
* @var SummitOrderExtraQuestionValue[]
*/
private $values;
public function __construct()
{
parent::__construct();
$this->values = new ArrayCollection();
$this->mandatory = false;
$this->order = 1;
}
/**
* @return string
@ -116,16 +112,19 @@ implements IOrderable
/**
* @return string
*/
public function getPlaceholder(): string
public function getPlaceholder(): ?string
{
return $this->placeholder;
}
/**
* @param string $placeholder
* @throws ValidationException
*/
public function setPlaceholder(string $placeholder): void
{
if(!in_array($this->type, ExtraQuestionTypeConstants::AllowedPlaceHolderQuestionType))
throw new ValidationException(sprintf("%s type does not allows a placeholder", $this->type));
$this->placeholder = $placeholder;
}
@ -135,7 +134,7 @@ implements IOrderable
*/
public function setType(string $type): void
{
if(!in_array($type, SummitOrderExtraQuestionTypeConstants::ValidQuestionTypes))
if(!in_array($type, ExtraQuestionTypeConstants::ValidQuestionTypes))
throw new ValidationException(sprintf("%s type is not valid", $type));
$this->type = $type;
@ -190,67 +189,16 @@ implements IOrderable
}
/**
* @return string
*/
public function getUsage(): string
{
return $this->usage;
}
/**
* @param string $usage
* @param ExtraQuestionTypeValue $value
* @throws ValidationException
*/
public function setUsage(string $usage): void
{
if(!in_array($usage, SummitOrderExtraQuestionTypeConstants::ValidQuestionUsages))
throw new ValidationException(sprintf("%s usage is not valid", $usage));
$this->usage = $usage;
}
/**
* @return bool
*/
public function isPrintable(): bool
{
return $this->printable;
}
/**
* @param bool $printable
*/
public function setPrintable(bool $printable): void
{
$this->printable = $printable;
}
public function __construct()
{
parent::__construct();
$this->values = new ArrayCollection();
$this->mandatory = false;
$this->printable = false;
}
/**
* @return SummitOrderExtraQuestionValue[]
*/
public function getValues()
{
return $this->values;
}
/**
* @param SummitOrderExtraQuestionValue $value
* @throws ValidationException
*/
public function addValue(SummitOrderExtraQuestionValue $value){
public function addValue(ExtraQuestionTypeValue $value){
if(!$this->allowsValues())
throw new ValidationException(sprintf("%s type does not allow multivalues", $this->type));
throw new ValidationException(sprintf("%s type does not allow multiple values.", $this->type));
if($this->values->contains($value)) return;
$value->setOrder($this->getValueMaxOrder() + 1);
$this->values->add($value);
$value->setQuestion($this);
$value->setOrder($this->getValueMaxOrder() + 1);
}
/**
@ -264,15 +212,15 @@ implements IOrderable
}
public function allowsValues():bool {
return in_array($this->type, SummitOrderExtraQuestionTypeConstants::AllowedMultivalueQuestionType);
return in_array($this->type, ExtraQuestionTypeConstants::AllowedMultiValueQuestionType);
}
/**
* @param SummitOrderExtraQuestionValue $value
* @param ExtraQuestionTypeValue $value
* @throws ValidationException
*/
public function removeValue(SummitOrderExtraQuestionValue $value){
public function removeValue(ExtraQuestionTypeValue $value){
if(!$this->allowsValues())
throw new ValidationException(sprintf("%s type does not allow multivalues", $this->type));
throw new ValidationException(sprintf("%s type does not allow multiple values.", $this->type));
if(!$this->values->contains($value)) return;
$this->values->removeElement($value);
@ -280,9 +228,9 @@ implements IOrderable
/**
* @param string $label
* @return SummitOrderExtraQuestionValue|null
* @return ExtraQuestionTypeValue|null
*/
public function getValueByLabel(string $label):?SummitOrderExtraQuestionValue{
public function getValueByLabel(string $label):?ExtraQuestionTypeValue{
$criteria = Criteria::create();
$criteria->where(Criteria::expr()->eq('label', trim($label)));
$value = $this->values->matching($criteria)->first();
@ -291,9 +239,9 @@ implements IOrderable
/**
* @param string $name
* @return SummitOrderExtraQuestionValue|null
* @return ExtraQuestionTypeValue|null
*/
public function getValueByName(string $name):?SummitOrderExtraQuestionValue{
public function getValueByName(string $name):?ExtraQuestionTypeValue{
$criteria = Criteria::create();
$criteria->where(Criteria::expr()->eq('value', trim($name)));
$value = $this->values->matching($criteria)->first();
@ -308,7 +256,7 @@ implements IOrderable
if(empty($value) && !$this->isMandatory()) return true;
if($this->type == SummitOrderExtraQuestionTypeConstants::ComboBoxQuestionType)
if($this->type == ExtraQuestionTypeConstants::ComboBoxQuestionType)
return !is_null($this->getValueById(intval($value)));
foreach (explode(',',$value) as $v)
@ -321,9 +269,9 @@ implements IOrderable
/**
* @param int $id
* @return SummitOrderExtraQuestionValue|null
* @return ExtraQuestionTypeValue|null
*/
public function getValueById(int $id):?SummitOrderExtraQuestionValue{
public function getValueById(int $id):?ExtraQuestionTypeValue{
$criteria = Criteria::create();
$criteria->where(Criteria::expr()->eq('id', $id));
$value = $this->values->matching($criteria)->first();
@ -333,11 +281,11 @@ implements IOrderable
use OrderableChilds;
/**
* @param SummitOrderExtraQuestionValue $value
* @param ExtraQuestionTypeValue $value
* @param int $new_order
* @throws ValidationException
*/
public function recalculateValueOrder(SummitOrderExtraQuestionValue $value, $new_order){
public function recalculateValueOrder(ExtraQuestionTypeValue $value, $new_order){
self::recalculateOrderForSelectable($this->values, $value, $new_order);
}
@ -366,4 +314,11 @@ implements IOrderable
return implode(',', $niceValues);
}
/**
* @return ExtraQuestionTypeValue[]|ArrayCollection
*/
public function getValues(){
return $this->values;
}
}

24
app/Models/Foundation/Summit/Registration/Questions/SummitOrderExtraQuestionTypeConstants.php → app/Models/Foundation/Main/ExtraQuestions/ExtraQuestionTypeConstants.php
View File

@ -1,6 +1,6 @@
<?php namespace models\summit;
<?php namespace App\Models\Foundation\ExtraQuestions;
/**
* Copyright 2019 OpenStack Foundation
* Copyright 2021 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
@ -12,11 +12,12 @@
* limitations under the License.
**/
/**
* Interface SummitOrderExtraQuestionTypeConstants
* @package models\summit
* interface ExtraQuestionTypeConstants
* @package App\Models\Foundation\ExtraQuestions
*/
interface SummitOrderExtraQuestionTypeConstants
interface ExtraQuestionTypeConstants
{
const TextAreaQuestionType = 'TextArea';
const TextQuestionType = 'Text';
@ -36,19 +37,14 @@ interface SummitOrderExtraQuestionTypeConstants
self::RadioButtonListQuestionType,
];
const AllowedMultivalueQuestionType = [
const AllowedMultiValueQuestionType = [
self::ComboBoxQuestionType,
self::CheckBoxListQuestionType,
self::RadioButtonListQuestionType,
];
const OrderQuestionUsage = 'Order';
const TicketQuestionUsage = 'Ticket';
const BothQuestionUsage = 'Both';
const ValidQuestionUsages = [
self::OrderQuestionUsage,
self::TicketQuestionUsage,
self::BothQuestionUsage
const AllowedPlaceHolderQuestionType = [
self::TextAreaQuestionType,
self::TextQuestionType,
];
}

37
app/Models/Foundation/Summit/Registration/Questions/SummitOrderExtraQuestionValue.php → app/Models/Foundation/Main/ExtraQuestions/ExtraQuestionTypeValue.php
View File

@ -1,6 +1,6 @@
<?php namespace models\summit;
<?php namespace App\Models\Foundation\ExtraQuestions;
/**
* Copyright 2019 OpenStack Foundation
* Copyright 2021 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
@ -16,37 +16,37 @@ use models\utils\SilverstripeBaseModel;
use Doctrine\ORM\Mapping AS ORM;
/**
* @ORM\Entity
* @ORM\Table(name="SummitOrderExtraQuestionValue")
* Class SummitOrderExtraQuestionValue
* @package models\summit
* @ORM\Table(name="ExtraQuestionTypeValue")
* Class ExtraQuestionTypeValue
* @package App\Models\Foundation\ExtraQuestions
*/
class SummitOrderExtraQuestionValue extends SilverstripeBaseModel
implements IOrderable
class ExtraQuestionTypeValue extends SilverstripeBaseModel
implements IOrderable
{
/**
* @ORM\Column(name="Label", type="string")
* @var string
*/
private $label;
protected $label;
/**
* @ORM\Column(name="Value", type="string")
* @var string
*/
private $value;
protected $value;
/**
* @ORM\Column(name="`Order`", type="integer")
* @var int
*/
private $order;
protected $order;
/**
* @ORM\ManyToOne(targetEntity="SummitOrderExtraQuestionType", inversedBy="values")
* @ORM\ManyToOne(targetEntity="ExtraQuestionType", inversedBy="values")
* @ORM\JoinColumn(name="QuestionID", referencedColumnName="ID")
* @var SummitOrderExtraQuestionType
* @var ExtraQuestionType
*/
private $question;
protected $question;
/**
* @return string
@ -97,17 +97,17 @@ class SummitOrderExtraQuestionValue extends SilverstripeBaseModel
}
/**
* @return SummitOrderExtraQuestionType
* @return ExtraQuestionType
*/
public function getQuestion(): SummitOrderExtraQuestionType
public function getQuestion(): ExtraQuestionType
{
return $this->question;
}
/**
* @param SummitOrderExtraQuestionType $question
* @param ExtraQuestionType $question
*/
public function setQuestion(SummitOrderExtraQuestionType $question): void
public function setQuestion(ExtraQuestionType $question): void
{
$this->question = $question;
}
@ -115,7 +115,7 @@ class SummitOrderExtraQuestionValue extends SilverstripeBaseModel
public function __construct()
{
parent::__construct();
$this->order = 0;
$this->order = 1;
}
/**
@ -130,5 +130,4 @@ class SummitOrderExtraQuestionValue extends SilverstripeBaseModel
}
}
}

55
app/Models/Foundation/Main/ExtraQuestions/Factories/ExtraQuestionTypeFactory.php Normal file
View File

@ -0,0 +1,55 @@
<?php namespace App\Models\Foundation\ExtraQuestions\Factories;
/**
* Copyright 2021 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\ExtraQuestions\ExtraQuestionType;
/**
* Class ExtraQuestionTypeFactory
* @package App\Models\Foundation\ExtraQuestions\Factories
*/
abstract class ExtraQuestionTypeFactory
{
abstract protected static function getNewEntity():ExtraQuestionType;
/**
* @param array $data
* @return ExtraQuestionType
*/
public static function build(array $data):ExtraQuestionType{
return static::populate(static::getNewEntity(), $data);
}
/**
* @param ExtraQuestionType $question
* @param array $data
* @return ExtraQuestionType
*/
public static function populate(ExtraQuestionType $question, array $data):ExtraQuestionType{
if(isset($data['name']))
$question->setName(trim($data['name']));
if(isset($data['label']))
$question->setLabel(trim($data['label']));
if(isset($data['type']))
$question->setType(trim($data['type']));
if(isset($data['placeholder']))
$question->setPlaceholder(trim($data['placeholder']));
if(isset($data['mandatory']))
$question->setMandatory(boolval($data['mandatory']));
return $question;
}
}

37
app/Models/Foundation/Main/ExtraQuestions/IExtraQuestionTypeRepository.php Normal file
View File

@ -0,0 +1,37 @@
<?php namespace App\Models\Foundation\ExtraQuestions;
/**
* Copyright 2021 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 IExtraQuestionTypeRepository
* @package App\Models\Foundation\ExtraQuestions
*/
interface IExtraQuestionTypeRepository extends IBaseRepository
{
/**
* @return array
*/
public function getQuestionsMetadata();
/**
* @param ExtraQuestionType $questionType
* @return bool
*/
public function hasAnswers(ExtraQuestionType $questionType):bool;
/**
* @param ExtraQuestionType $questionType
* @return void
*/
public function deleteAnswersFrom(ExtraQuestionType $questionType):void;
}

53
app/Models/Foundation/Summit/Events/Presentations/ExtraQuestions/PresentationExtraQuestionAnswer.php Normal file
View File

@ -0,0 +1,53 @@
<?php namespace models\summit;
/**
* Copyright 2021 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\ExtraQuestions\ExtraQuestionAnswer;
use Doctrine\ORM\Mapping AS ORM;
/**
* @ORM\Entity
* @ORM\Table(name="PresentationExtraQuestionAnswer")
* Class PresentationExtraQuestionAnswer
* @package App\ModelSerializers\Summit\Presentation\ExtraQuestions
*/
class PresentationExtraQuestionAnswer
extends ExtraQuestionAnswer
{
/**
* @ORM\ManyToOne(targetEntity="models\summit\Presentation", inversedBy="extra_question_answers")
* @ORM\JoinColumn(name="PresentationID", referencedColumnName="ID")
* @var Presentation
*/
private $presentation;
/**
* @return Presentation
*/
public function getPresentation(): Presentation
{
return $this->presentation;
}
/**
* @param Presentation $presentation
*/
public function setPresentation(Presentation $presentation): void
{
$this->presentation = $presentation;
}
public function clearPresentation(){
$this->presentation = null;
}
}

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

@ -12,7 +12,7 @@
* limitations under the License.
**/
use Doctrine\ORM\Mapping AS ORM;
use App\Models\Foundation\Summit\ExtraQuestions\SummitSelectionPlanExtraQuestionType;
use App\Models\Foundation\Main\OrderableChilds;
use Behat\Transliterator\Transliterator;
use App\Models\Foundation\Summit\Events\Presentations\TrackQuestions\TrackAnswer;
@ -24,6 +24,7 @@ use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Log;
use models\exceptions\ValidationException;
use models\main\Member;
use Doctrine\ORM\Mapping AS ORM;
/**
* Class Presentation
@ -205,6 +206,12 @@ class Presentation extends SummitEvent
*/
private $actions;
/**
* @ORM\OneToMany(targetEntity="models\summit\PresentationExtraQuestionAnswer", mappedBy="presentation", cascade={"persist","remove"}, orphanRemoval=true)
* @var PresentationExtraQuestionAnswer[]
*/
private $extra_question_answers;
/**
* @return bool
*/
@ -245,6 +252,7 @@ class Presentation extends SummitEvent
$this->category_changes_requests = new ArrayCollection();
$this->selected_presentations = new ArrayCollection();
$this->actions = new ArrayCollection();
$this->extra_question_answers = new ArrayCollection();
$this->to_record = false;
$this->attending_media = false;
$this->will_all_speakers_attend = false;
@ -872,6 +880,7 @@ class Presentation extends SummitEvent
}
/**
* @deprecated
* @return TrackAnswer[]
*/
public function getAnswers()
@ -880,6 +889,7 @@ class Presentation extends SummitEvent
}
/**
* @deprecated
* @param TrackAnswer[] $answers
*/
public function setAnswers($answers)
@ -888,6 +898,7 @@ class Presentation extends SummitEvent
}
/**
* @deprecated
* @param TrackAnswer $answer
*/
public function addAnswer(TrackAnswer $answer)
@ -922,6 +933,7 @@ class Presentation extends SummitEvent
}
/**
* @deprecated
* @param TrackQuestionTemplate $question
* @return TrackAnswer|null
*/
@ -1551,4 +1563,47 @@ class Presentation extends SummitEvent
$this->will_all_speakers_attend = $will_all_speakers_attend;
}
/**
* @return PresentationExtraQuestionAnswer[]
*/
public function getExtraQuestionAnswers()
{
return $this->extra_question_answers;
}
/**
* @param SummitSelectionPlanExtraQuestionType $question
* @return PresentationExtraQuestionAnswer|null
*/
public function getExtraQuestionAnswerByQuestion(SummitSelectionPlanExtraQuestionType $question):?PresentationExtraQuestionAnswer{
$answer = $this->extra_question_answers->matching(
$criteria = Criteria::create()
->where(Criteria::expr()->eq("question", $question))
)->first();
return $answer ? $answer : null;
}
public function clearExtraQuestionAnswers()
{
return $this->extra_question_answers->clear();
}
/**
* @param PresentationExtraQuestionAnswer $answer
*/
public function addExtraQuestionAnswer(PresentationExtraQuestionAnswer $answer){
if($this->extra_question_answers->contains($answer)) return;
$this->extra_question_answers->add($answer);
$answer->setPresentation($this);
}
/**
* @param PresentationExtraQuestionAnswer $answer
*/
public function removeExtraQuestionAnswer(PresentationExtraQuestionAnswer $answer){
if(!$this->extra_question_answers->contains($answer)) return;
$this->extra_question_answers->removeElement($answer);
$answer->clearPresentation();
}
}

63
app/Models/Foundation/Summit/ExtraQuestions/SummitSelectionPlanExtraQuestionType.php Normal file
View File

@ -0,0 +1,63 @@
<?php namespace App\Models\Foundation\Summit\ExtraQuestions;
/**
* Copyright 2021 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\ExtraQuestions\ExtraQuestionType;
use App\Models\Foundation\Summit\SelectionPlan;
use models\utils\One2ManyPropertyTrait;
use Doctrine\ORM\Mapping AS ORM;
/**
* @ORM\Entity(repositoryClass="App\Repositories\Summit\DoctrineSummitSelectionPlanExtraQuestionTypeRepository")
* @ORM\Table(name="SummitSelectionPlanExtraQuestionType")
* Class SummitSelectionPlanExtraQuestionType
* @package App\Models\Foundation\Summit\ExtraQuestions
*/
class SummitSelectionPlanExtraQuestionType extends ExtraQuestionType
{
/**
* @ORM\ManyToOne(targetEntity="App\Models\Foundation\Summit\SelectionPlan", inversedBy="extra_questions")
* @ORM\JoinColumn(name="SelectionPlanID", referencedColumnName="ID")
* @var SelectionPlan
*/
protected $selection_plan;
/**
* @return SelectionPlan
*/
public function getSelectionPlan(): SelectionPlan
{
return $this->selection_plan;
}
/**
* @param SelectionPlan $selection_plan
*/
public function setSelectionPlan(SelectionPlan $selection_plan): void
{
$this->selection_plan = $selection_plan;
}
use One2ManyPropertyTrait;
protected $getIdMappings = [
'getSelectionPlanId' => 'selection_plan',
];
protected $hasPropertyMappings = [
'hasSelectionPlan' => 'selection_plan',
];
public function clearSelectionPlan():void{
$this->selection_plan = null;
}
}

10
app/Models/Foundation/Summit/Factories/SummitAttendeeFactory.php
View File

@ -111,12 +111,12 @@ final class SummitAttendeeFactory
$extra_questions = $payload['extra_questions'] ?? [];
if (count($extra_questions)) {
$mandatory_questions = $summit->getMandatoryOrderExtraQuestionsByUsage(SummitOrderExtraQuestionTypeConstants::TicketQuestionUsage);
if (count($extra_questions) < $mandatory_questions->count()) {
throw new ValidationException("You neglected to fill in all mandatory questions for the attendee.");
}
$mandatory_questions = $summit->getMandatoryOrderExtraQuestionsByUsage(SummitOrderExtraQuestionTypeConstants::TicketQuestionUsage);
if (count($extra_questions) < $mandatory_questions->count()) {
throw new ValidationException("You neglected to fill in all mandatory questions for the attendee.");
}
if (count($extra_questions)) {
$questions = $summit->getOrderExtraQuestionsByUsage(SummitOrderExtraQuestionTypeConstants::TicketQuestionUsage);
if ($questions->count() > 0) {

40
app/Models/Foundation/Summit/Factories/SummitOrderExtraQuestionTypeFactory.php
View File

@ -11,36 +11,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use App\Models\Foundation\ExtraQuestions\ExtraQuestionType;
use App\Models\Foundation\ExtraQuestions\Factories\ExtraQuestionTypeFactory;
use models\summit\SummitOrderExtraQuestionType;
/**
* Class SummitOrderExtraQuestionTypeFactory
* @package App\Models\Foundation\Summit\Factories
*/
final class SummitOrderExtraQuestionTypeFactory
final class SummitOrderExtraQuestionTypeFactory extends ExtraQuestionTypeFactory
{
/**
* @param ExtraQuestionType $question
* @param array $data
* @return SummitOrderExtraQuestionType
* @return ExtraQuestionType
* @throws \models\exceptions\ValidationException
*/
public static function build(array $data):SummitOrderExtraQuestionType{
return self::populate(new SummitOrderExtraQuestionType, $data);
}
public static function populate(ExtraQuestionType $question, array $data):ExtraQuestionType{
/**
* @param SummitOrderExtraQuestionType $question
* @param array $data
* @return SummitOrderExtraQuestionType
*/
public static function populate(SummitOrderExtraQuestionType $question, array $data):SummitOrderExtraQuestionType{
if(isset($data['name']))
$question->setName(trim($data['name']));
if(isset($data['label']))
$question->setLabel(trim($data['label']));
if(isset($data['type']))
$question->setType(trim($data['type']));
$question = parent::populate($question, $data);
if(isset($data['usage']))
$question->setUsage(trim($data['usage']));
@ -48,13 +36,11 @@ final class SummitOrderExtraQuestionTypeFactory
if(isset($data['printable']))
$question->setPrintable(boolval($data['printable']));
if(isset($data['placeholder']))
$question->setPlaceholder(trim($data['placeholder']));
if(isset($data['mandatory']))
$question->setMandatory(boolval($data['mandatory']));
return $question;
}
protected static function getNewEntity(): ExtraQuestionType
{
return new SummitOrderExtraQuestionType;
}
}

22
app/Models/Foundation/Summit/Factories/SummitOrderExtraQuestionValueFactory.php
View File

@ -1,4 +1,4 @@
<?php namespace App\Models\Foundation\Summit\Factories;
<?php namespace App\Models\Foundation\Factories;
/**
* Copyright 2019 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
@ -11,27 +11,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use models\summit\SummitOrderExtraQuestionValue;
use App\Models\Foundation\ExtraQuestions\ExtraQuestionTypeValue;
/**
* Class SummitOrderExtraQuestionValueFactory
* @package App\Models\Foundation\Summit\Factories
* Class ExtraQuestionTypeValueFactory
* @package App\Models\Foundation\Factories
*/
final class SummitOrderExtraQuestionValueFactory
final class ExtraQuestionTypeValueFactory
{
/**
* @param array $data
* @return SummitOrderExtraQuestionValue
* @return ExtraQuestionTypeValue
*/
public static function build(array $data):SummitOrderExtraQuestionValue{
return self::populate(new SummitOrderExtraQuestionValue, $data);
public static function build(array $data):ExtraQuestionTypeValue{
return self::populate(new ExtraQuestionTypeValue, $data);
}
/**
* @param SummitOrderExtraQuestionValue $value
* @param ExtraQuestionTypeValue $value
* @param array $data
* @return SummitOrderExtraQuestionValue
* @return ExtraQuestionTypeValue
*/
public static function populate(SummitOrderExtraQuestionValue $value, array $data):SummitOrderExtraQuestionValue{
public static function populate(ExtraQuestionTypeValue $value, array $data):ExtraQuestionTypeValue{
if(isset($data['label']))
$value->setLabel(trim($data['label']));

29
app/Models/Foundation/Summit/Factories/SummitSelectionPlanExtraQuestionTypeFactory.php Normal file
View File

@ -0,0 +1,29 @@
<?php namespace App\Models\Foundation\Summit\Factories;
/**
* Copyright 2021 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\ExtraQuestions\ExtraQuestionType;
use App\Models\Foundation\ExtraQuestions\Factories\ExtraQuestionTypeFactory;
use App\Models\Foundation\Summit\ExtraQuestions\SummitSelectionPlanExtraQuestionType;
/**
* Class SummitSelectionPlanExtraQuestionTypeFactory
* @package App\Models\Foundation\Summit\Factories
*/
final class SummitSelectionPlanExtraQuestionTypeFactory
extends ExtraQuestionTypeFactory
{
protected static function getNewEntity(): ExtraQuestionType
{
return new SummitSelectionPlanExtraQuestionType();
}
}

87
app/Models/Foundation/Summit/Registration/ExtraQuestions/SummitOrderExtraQuestionType.php Normal file
View File

@ -0,0 +1,87 @@
<?php namespace models\summit;
/**
* Copyright 2019 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\ExtraQuestions\ExtraQuestionType;
use models\exceptions\ValidationException;
use Doctrine\ORM\Mapping AS ORM;
/**
* @ORM\Entity(repositoryClass="App\Repositories\Summit\DoctrineSummitOrderExtraQuestionTypeRepository")
* @ORM\AssociationOverrides({
* @ORM\AssociationOverride(
* name="summit",
* inversedBy="order_extra_questions"
* )
* })
* @ORM\Table(name="SummitOrderExtraQuestionType")
* Class SummitOrderExtraQuestionType
* @package models\summit
*/
class SummitOrderExtraQuestionType extends ExtraQuestionType
{
use SummitOwned;
/**
* @ORM\Column(name="`Usage`", type="string")
* @var string
*/
private $usage;
/**
* @ORM\Column(name="Printable", type="boolean")
* @var boolean
*/
private $printable;
/**
* @return string
*/
public function getUsage(): string
{
return $this->usage;
}
/**
* @param string $usage
* @throws ValidationException
*/
public function setUsage(string $usage): void
{
if(!in_array($usage, SummitOrderExtraQuestionTypeConstants::ValidQuestionUsages))
throw new ValidationException(sprintf("%s usage is not valid", $usage));
$this->usage = $usage;
}
/**
* @return bool
*/
public function isPrintable(): bool
{
return $this->printable;
}
/**
* @param bool $printable
*/
public function setPrintable(bool $printable): void
{
$this->printable = $printable;
}
public function __construct()
{
parent::__construct();
$this->printable = false;
}
}

32
app/Models/Foundation/Summit/Registration/ExtraQuestions/SummitOrderExtraQuestionTypeConstants.php Normal file
View File

@ -0,0 +1,32 @@
<?php namespace models\summit;
/**
* Copyright 2019 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\ExtraQuestions\ExtraQuestionTypeConstants;
/**
* Interface SummitOrderExtraQuestionTypeConstants
* @package models\summit
*/
interface SummitOrderExtraQuestionTypeConstants
extends ExtraQuestionTypeConstants
{
const OrderQuestionUsage = 'Order';
const TicketQuestionUsage = 'Ticket';
const BothQuestionUsage = 'Both';
const ValidQuestionUsages = [
self::OrderQuestionUsage,
self::TicketQuestionUsage,
self::BothQuestionUsage
];
}

55
app/Models/Foundation/Summit/Registration/SummitOrderExtraQuestionAnswer.php
View File

@ -11,8 +11,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use App\Models\Foundation\ExtraQuestions\ExtraQuestionAnswer;
use models\utils\One2ManyPropertyTrait;
use models\utils\SilverstripeBaseModel;
use Doctrine\ORM\Mapping AS ORM;
/**
* @ORM\Entity
@ -20,7 +20,7 @@ use Doctrine\ORM\Mapping AS ORM;
* Class SummitOrderExtraQuestionAnswer
* @package models\summit
*/
class SummitOrderExtraQuestionAnswer extends SilverstripeBaseModel
class SummitOrderExtraQuestionAnswer extends ExtraQuestionAnswer
{
use One2ManyPropertyTrait;
@ -49,19 +49,6 @@ class SummitOrderExtraQuestionAnswer extends SilverstripeBaseModel
*/
private $attendee;
/**
* @ORM\ManyToOne(targetEntity="models\summit\SummitOrderExtraQuestionType")
* @ORM\JoinColumn(name="QuestionID", referencedColumnName="ID")
* @var SummitOrderExtraQuestionType
*/
private $question;
/**
* @ORM\Column(name="Value", type="string")
* @var string
*/
private $value;
/**
* @return SummitOrder
*/
@ -94,44 +81,6 @@ class SummitOrderExtraQuestionAnswer extends SilverstripeBaseModel
$this->attendee = $attendee;
}
/**
* @return SummitOrderExtraQuestionType
*/
public function getQuestion(): ?SummitOrderExtraQuestionType
{
return $this->question;
}
/**
* @param SummitOrderExtraQuestionType $question
*/
public function setQuestion(SummitOrderExtraQuestionType $question): void
{
$this->question = $question;
}
/**
* @return string
*/
public function getValue(): string
{
return $this->value;
}
/**
* @return bool
*/
public function hasValue():bool {
return !empty($this->value);
}
/**
* @param string $value
*/
public function setValue(string $value): void
{
$this->value = $value;
}
public function clearOrder(){
$this->order = null;

25
app/Models/Foundation/Summit/Repositories/ISummitOrderExtraQuestionTypeRepository.php
View File

@ -11,32 +11,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use models\summit\Summit;
use models\summit\SummitOrder;
use models\summit\SummitOrderExtraQuestionType;
use models\utils\IBaseRepository;
use App\Models\Foundation\ExtraQuestions\IExtraQuestionTypeRepository;
/**
* Interface ISummitOrderExtraQuestionTypeRepository
* @package App\Models\Foundation\Summit\Repositories
*/
interface ISummitOrderExtraQuestionTypeRepository extends IBaseRepository
interface ISummitOrderExtraQuestionTypeRepository extends IExtraQuestionTypeRepository
{
/**
* @param Summit $summit
* @return array
*/
public function getQuestionsMetadata(Summit $summit);
/**
* @param SummitOrderExtraQuestionType $questionType
* @return bool
*/
public function hasAnswers(SummitOrderExtraQuestionType $questionType):bool;
/**
* @param SummitOrderExtraQuestionType $questionType
* @return void
*/
public function deleteAnswersFrom(SummitOrderExtraQuestionType $questionType):void;
}

23
app/Models/Foundation/Summit/Repositories/ISummitSelectionPlanExtraQuestionTypeRepository.php Normal file
View File

@ -0,0 +1,23 @@
<?php namespace App\Models\Foundation\Summit\Repositories;
/**
* Copyright 2021 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\ExtraQuestions\IExtraQuestionTypeRepository;
/**
* Interface ISummitSelectionPlanExtraQuestionTypeRepository
* @package App\Models\Foundation\Summit\Repositories
*/
interface ISummitSelectionPlanExtraQuestionTypeRepository
extends IExtraQuestionTypeRepository
{
}

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

@ -12,10 +12,13 @@
* limitations under the License.
**/
use App\Models\Foundation\Main\OrderableChilds;
use App\Models\Foundation\Summit\ExtraQuestions\SummitSelectionPlanExtraQuestionType;
use Doctrine\Common\Collections\Criteria;
use Doctrine\ORM\Mapping AS ORM;
use App\Models\Utils\TimeZoneEntity;
use Doctrine\Common\Collections\ArrayCollection;
use models\exceptions\ValidationException;
use models\summit\Presentation;
use models\summit\PresentationCategory;
use models\summit\PresentationCategoryGroup;
@ -122,6 +125,12 @@ class SelectionPlan extends SilverstripeBaseModel
*/
private $presentations;
/**
* @ORM\OneToMany(targetEntity="App\Models\Foundation\Summit\ExtraQuestions\SummitSelectionPlanExtraQuestionType", mappedBy="selection_plan", cascade={"persist","remove"}, orphanRemoval=true, fetch="EXTRA_LAZY")
* @var SummitSelectionPlanExtraQuestionType[]
*/
private $extra_questions;
/**
* @return string
*/
@ -302,6 +311,7 @@ class SelectionPlan extends SilverstripeBaseModel
$this->allow_new_presentations = true;
$this->category_groups = new ArrayCollection;
$this->presentations = new ArrayCollection;
$this->extra_questions = new ArrayCollection;
$this->max_submission_allowed_per_user = Summit::DefaultMaxSubmissionAllowedPerUser;
}
@ -448,4 +458,105 @@ class SelectionPlan extends SilverstripeBaseModel
$presentation = $this->presentations->matching($criteria)->first();
return $presentation === false ? null : $presentation;
}
/**
* Extra Questions
*/
/**
* @param int $question_id
* @return SummitSelectionPlanExtraQuestionType|null
*/
public function getExtraQuestionById(int $question_id):?SummitSelectionPlanExtraQuestionType{
$criteria = Criteria::create();
$criteria->where(Criteria::expr()->eq('id', $question_id));
$question = $this->extra_questions->matching($criteria)->first();
return $question === false ? null : $question;
}
/**
* @param string $name
* @return SummitSelectionPlanExtraQuestionType|null
*/
public function getExtraQuestionByName(string $name):?SummitSelectionPlanExtraQuestionType{
$criteria = Criteria::create();
$criteria->where(Criteria::expr()->eq('name', trim($name)));
$question = $this->extra_questions->matching($criteria)->first();
return $question === false ? null : $question;
}
/**
* @param string $label
* @return SummitSelectionPlanExtraQuestionType|null
*/
public function getExtraQuestionByLabel(string $label):?SummitSelectionPlanExtraQuestionType{
$criteria = Criteria::create();
$criteria->where(Criteria::expr()->eq('label', trim($label)));
$question = $this->extra_questions->matching($criteria)->first();
return $question === false ? null : $question;
}
/**
* @return int
*/
private function getExtraQuestionMaxOrder():int{
$criteria = Criteria::create();
$criteria->orderBy(['order' => 'DESC']);
$question = $this->extra_questions->matching($criteria)->first();
return $question === false ? 0 : $question->getOrder();
}
/**
* @param SummitSelectionPlanExtraQuestionType $question
* @throws ValidationException
*/
public function addExtraQuestion(SummitSelectionPlanExtraQuestionType $question){
if($this->extra_questions->contains($question)) return;
$criteria = Criteria::create();
$criteria->where(Criteria::expr()->eq('name', $question->getName()));
$formerExtraQuestion = $this->extra_questions->matching($criteria)->first();
if($formerExtraQuestion){
throw new ValidationException(sprintf("Question Name %s already exists.", $question->getName()));
};
$question->setOrder($this->getExtraQuestionMaxOrder()+1);
$this->extra_questions->add($question);
$question->setSelectionPlan($this);
}
public function removeExtraQuestion(SummitSelectionPlanExtraQuestionType $question){
if(!$this->extra_questions->contains($question)) return;
$this->extra_questions->removeElement($question);
$question->clearSelectionPlan();
}
use OrderableChilds;
/**
* @param SummitSelectionPlanExtraQuestionType $question
* @param int $new_order
* @throws ValidationException
*/
public function recalculateQuestionOrder(SummitSelectionPlanExtraQuestionType $question, $new_order){
self::recalculateOrderForSelectable($this->extra_questions, $question, $new_order);
}
/**
* @return ArrayCollection|\Doctrine\Common\Collections\Collection
*/
public function getExtraQuestions(){
$criteria = Criteria::create();
$criteria->orderBy(['order' => 'ASC']);
return $this->extra_questions->matching($criteria);
}
/**
* @return ArrayCollection|\Doctrine\Common\Collections\Collection
*/
public function getMandatoryExtraQuestions(){
$criteria = Criteria::create();
$criteria->where(Criteria::expr()->eq('mandatory', true));
return $this->extra_questions->matching($criteria);
}
}

124
app/Repositories/Main/DoctrineExtraQuestionTypeRepository.php Normal file
View File

@ -0,0 +1,124 @@
<?php namespace App\Repositories\Main;
/**
* Copyright 2021 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\ExtraQuestions\ExtraQuestionType;
use App\Models\Foundation\ExtraQuestions\IExtraQuestionTypeRepository;
use App\Repositories\SilverStripeDoctrineRepository;
use Illuminate\Support\Facades\Log;
use models\summit\SummitOrderExtraQuestionType;
use utils\DoctrineLeftJoinFilterMapping;
/**
* Class DoctrineExtraQuestionTypeRepository
* @package App\Repositories\Main
*/
abstract class DoctrineExtraQuestionTypeRepository
extends SilverStripeDoctrineRepository
implements IExtraQuestionTypeRepository
{
/**
* @return array
*/
protected function getFilterMappings()
{
return [
'name' => 'e.name:json_string',
'type' => 'e.type:json_string',
'label' => 'e.label:json_string',
];
}
/**
* @return array
*/
protected function getOrderMappings()
{
return [
'id' => 'e.id',
'name' => 'e.name',
'label' => 'e.label',
'order' => 'e.order',
];
}
/**
* @return array
*/
public function getQuestionsMetadata()
{
return [
[
'type' => 'TextArea',
],
[
'type' => 'Text',
],
[
'type' => 'CheckBox',
],
[
'type' => 'ComboBox',
'values' => 'array',
],
[
'type' => 'CheckBoxList',
'values' => 'array',
],
[
'type' => 'RadioButtonList',
'values' => 'array',
],
];
}
/**
* @param ExtraQuestionType $questionType
* @return bool
*/
public function hasAnswers(ExtraQuestionType $questionType): bool
{
try {
$query = $this->getEntityManager()
->createQueryBuilder()
->select("count(e.id)")
->from($this->getBaseEntity(), "e")->join("e.question", "q")
->where("q = :question")->setParameter("question", $questionType);
return $query->getQuery()->getSingleScalarResult() > 0;
}
catch (\Exception $ex){
Log::error($ex);
return false;
}
}
/**
* @param ExtraQuestionType $questionType
*/
public function deleteAnswersFrom(ExtraQuestionType $questionType):void{
try {
$query = $this->getEntityManager()
->createQueryBuilder()
->delete($this->getBaseEntity(), "e")
->where("e.question = :question")
->setParameter("question", $questionType);
$query->getQuery()->execute();
}
catch (\Exception $ex){
Log::error($ex);
}
}
}

10
app/Repositories/RepositoriesProvider.php
View File

@ -24,6 +24,7 @@ use App\Models\Foundation\Summit\DefaultTrackTagGroup;
use App\Models\Foundation\Summit\EmailFlows\SummitEmailEventFlow;
use App\Models\Foundation\Summit\Events\Presentations\TrackQuestions\TrackQuestionTemplate;
use App\Models\Foundation\Summit\Events\RSVP\RSVPTemplate;
use App\Models\Foundation\Summit\ExtraQuestions\SummitSelectionPlanExtraQuestionType;
use App\Models\Foundation\Summit\Locations\Banners\SummitLocationBanner;
use App\Models\Foundation\Summit\Repositories\IDefaultSummitEventTypeRepository;
use App\Models\Foundation\Summit\Repositories\IDefaultTrackTagGroupRepository;
@ -59,6 +60,7 @@ use App\Models\Foundation\Summit\Repositories\ISummitOrderRepository;
use App\Models\Foundation\Summit\Repositories\ISummitRefundPolicyTypeRepository;
use App\Models\Foundation\Summit\Repositories\ISummitRegistrationInvitationRepository;
use App\Models\Foundation\Summit\Repositories\ISummitRoomReservationRepository;
use App\Models\Foundation\Summit\Repositories\ISummitSelectionPlanExtraQuestionTypeRepository;
use App\Models\Foundation\Summit\Repositories\ISummitTaxTypeRepository;
use App\Models\Foundation\Summit\Repositories\ISummitTrackChairRepository;
use App\Models\Foundation\Summit\Repositories\ISummitTrackRepository;
@ -120,6 +122,7 @@ use models\summit\SummitTaxType;
use models\summit\SummitTicketType;
use models\summit\SummitTrackChair;
use repositories\main\DoctrineLegalDocumentRepository;
/**
* Class RepositoriesProvider
* @package repositories
@ -669,5 +672,12 @@ final class RepositoriesProvider extends ServiceProvider
return EntityManager::getRepository(PresentationActionType::class);
}
);
App::singleton(
ISummitSelectionPlanExtraQuestionTypeRepository::class,
function(){
return EntityManager::getRepository(SummitSelectionPlanExtraQuestionType::class);
}
);
}
}

96
app/Repositories/Summit/DoctrineSummitOrderExtraQuestionTypeRepository.php
View File

@ -12,11 +12,7 @@
* limitations under the License.
**/
use App\Models\Foundation\Summit\Repositories\ISummitOrderExtraQuestionTypeRepository;
use App\Repositories\SilverStripeDoctrineRepository;
use Illuminate\Support\Facades\Log;
use models\summit\Summit;
use models\summit\SummitOrder;
use models\summit\SummitOrderExtraQuestionAnswer;
use App\Repositories\Main\DoctrineExtraQuestionTypeRepository;
use models\summit\SummitOrderExtraQuestionType;
use utils\DoctrineLeftJoinFilterMapping;
/**
@ -24,7 +20,7 @@ use utils\DoctrineLeftJoinFilterMapping;
* @package App\Repositories\Summit
*/
final class DoctrineSummitOrderExtraQuestionTypeRepository
extends SilverStripeDoctrineRepository
extends DoctrineExtraQuestionTypeRepository
implements ISummitOrderExtraQuestionTypeRepository
{
@ -33,13 +29,11 @@ final class DoctrineSummitOrderExtraQuestionTypeRepository
*/
protected function getFilterMappings()
{
return [
'name' => 'e.name:json_string',
'type' => 'e.type:json_string',
'usage;' => 'e.$usage;:json_string',
'label' => 'e.label:json_string',
return array_merge(parent::getFilterMappings() , [
'printable' => 'e.printable;:json_boolean',
'usage' => 'e.usage;:json_string',
'summit_id' => new DoctrineLeftJoinFilterMapping("e.summit", "s" ,"s.id :operator :value")
];
]);
}
/**
@ -47,12 +41,7 @@ final class DoctrineSummitOrderExtraQuestionTypeRepository
*/
protected function getOrderMappings()
{
return [
'id' => 'e.id',
'name' => 'e.name',
'label' => 'e.label',
'order' => 'e.order',
];
return parent::getOrderMappings();
}
/**
@ -63,75 +52,4 @@ final class DoctrineSummitOrderExtraQuestionTypeRepository
{
return SummitOrderExtraQuestionType::class;
}
/**
* @param Summit $summit
* @return array
*/
public function getQuestionsMetadata(Summit $summit)
{
return [
[
'type' => 'TextArea',
],
[
'type' => 'Text',
],
[
'type' => 'CheckBox',
],
[
'type' => 'ComboBox',
'values' => 'array',
],
[
'type' => 'CheckBoxList',
'values' => 'array',
],
[
'type' => 'RadioButtonList',
'values' => 'array',
],
];
}
/**
* @param SummitOrderExtraQuestionType $questionType
* @return bool
*/
public function hasAnswers(SummitOrderExtraQuestionType $questionType): bool
{
try {
$query = $this->getEntityManager()
->createQueryBuilder()
->select("count(e.id)")
->from(SummitOrderExtraQuestionAnswer::class, "e")->join("e.question", "q")
->where("q = :question")->setParameter("question", $questionType);
return $query->getQuery()->getSingleScalarResult() > 0;
}
catch (\Exception $ex){
Log::error($ex);
return false;
}
}
/**
* @param SummitOrderExtraQuestionType $questionType
*/
public function deleteAnswersFrom(SummitOrderExtraQuestionType $questionType):void{
try {
$query = $this->getEntityManager()
->createQueryBuilder()
->delete(SummitOrderExtraQuestionAnswer::class, "e")
->where("e.question = :question")
->setParameter("question", $questionType);
$query->getQuery()->execute();
}
catch (\Exception $ex){
Log::error($ex);
}
}
}

59
app/Repositories/Summit/DoctrineSummitSelectionPlanExtraQuestionTypeRepository.php Normal file
View File

@ -0,0 +1,59 @@
<?php namespace App\Repositories\Summit;
/**
* Copyright 2021 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\ExtraQuestions\SummitSelectionPlanExtraQuestionType;
use App\Models\Foundation\Summit\Repositories\ISummitSelectionPlanExtraQuestionTypeRepository;
use App\Repositories\Main\DoctrineExtraQuestionTypeRepository;
use utils\DoctrineLeftJoinFilterMapping;
/**
* Class DoctrineSummitSelectionPlanExtraQuestionTypeRepository
* @package App\Repositories\Summit
*/
final class DoctrineSummitSelectionPlanExtraQuestionTypeRepository
extends DoctrineExtraQuestionTypeRepository
implements ISummitSelectionPlanExtraQuestionTypeRepository
{
/**
* @return array
*/
protected function getFilterMappings()
{
return array_merge(parent::getFilterMappings() , [
'selection_plan_id' => new DoctrineLeftJoinFilterMapping
(
"e.selection_plan",
"s" ,
"s.id :operator :value"
)
]);
}
/**
* @return array
*/
protected function getOrderMappings()
{
return parent::getOrderMappings();
}
/**
*
* @return string
*/
protected function getBaseEntity()
{
return SummitSelectionPlanExtraQuestionType::class;
}
}

23
app/Services/Model/IExtraQuestionTypeService.php Normal file
View File

@ -0,0 +1,23 @@
<?php namespace App\Services\Model;
/**
* Copyright 2021 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.
**/
/**
* Interface IExtraQuestionTypeService
* @package App\Services\Model
*/
interface IExtraQuestionTypeService
{
}

82
app/Services/Model/ISelectionPlanExtraQuestionTypeService.php Normal file
View File

@ -0,0 +1,82 @@
<?php namespace App\Services\Model;
/**
* Copyright 2021 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\ExtraQuestions\ExtraQuestionTypeValue;
use App\Models\Foundation\Summit\ExtraQuestions\SummitSelectionPlanExtraQuestionType;
use App\Models\Foundation\Summit\SelectionPlan;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use models\summit\SummitOrderExtraQuestionType;
/**
* Interface ISelectionPlanExtraQuestionTypeService
* @package App\Services\Model
*/
interface ISelectionPlanExtraQuestionTypeService
{
/**
* @param SelectionPlan $selectionPlan
* @param array $payload
* @return SummitOrderExtraQuestionType
* @throws ValidationException
* @throws EntityNotFoundException
*/
public function addExtraQuestion(SelectionPlan $selectionPlan, array $payload):SummitSelectionPlanExtraQuestionType;
/**
* @param SelectionPlan $selectionPlan
* @param int $question_id
* @param array $payload
* @return SummitOrderExtraQuestionType
* @throws ValidationException
* @throws EntityNotFoundException
*/
public function updateExtraQuestion(SelectionPlan $selectionPlan, int $question_id, array $payload):SummitSelectionPlanExtraQuestionType;
/**
* @param SelectionPlan $selectionPlan
* @param int $question_id
* @throws ValidationException
* @throws EntityNotFoundException
*/
public function deleteExtraQuestion(SelectionPlan $selectionPlan, int $question_id):void;
/**
* @param SelectionPlan $selectionPlan
* @param int $question_id
* @param array $payload
* @return ExtraQuestionTypeValue
* @throws ValidationException
* @throws EntityNotFoundException
*/
public function addExtraQuestionValue(SelectionPlan $selectionPlan, int $question_id, array $payload):ExtraQuestionTypeValue;
/**
* @param SelectionPlan $selectionPlan
* @param int $question_id
* @param int $value_id
* @param array $payload
* @return ExtraQuestionTypeValue
* @throws ValidationException
* @throws EntityNotFoundException
*/
public function updateExtraQuestionValue(SelectionPlan $selectionPlan, int $question_id, int $value_id, array $payload):ExtraQuestionTypeValue;
/**
* @param SelectionPlan $selectionPlan
* @param int $question_id
* @param int $value_id
* @throws ValidationException
* @throws EntityNotFoundException
*/
public function deleteExtraQuestionValue(SelectionPlan $selectionPlan, int $question_id, int $value_id):void;
}

14
app/Services/Model/ISummitOrderExtraQuestionTypeService.php
View File

@ -11,16 +11,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use App\Models\Foundation\ExtraQuestions\ExtraQuestionTypeValue;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use models\summit\Summit;
use models\summit\SummitOrderExtraQuestionType;
use models\summit\SummitOrderExtraQuestionValue;
/**
* Interface ISummitOrderExtraQuestionTypeService
* @package App\Services\Model
*/
interface ISummitOrderExtraQuestionTypeService
interface ISummitOrderExtraQuestionTypeService extends IExtraQuestionTypeService
{
/**
* @param Summit $summit
@ -31,7 +31,6 @@ interface ISummitOrderExtraQuestionTypeService
*/
public function addOrderExtraQuestion(Summit $summit, array $payload):SummitOrderExtraQuestionType;
/**
* @param Summit $summit
* @param int $question_id
@ -42,7 +41,6 @@ interface ISummitOrderExtraQuestionTypeService
*/
public function updateOrderExtraQuestion(Summit $summit, int $question_id, array $payload):SummitOrderExtraQuestionType;
/**
* @param Summit $summit
* @param int $question_id
@ -55,22 +53,22 @@ interface ISummitOrderExtraQuestionTypeService
* @param Summit $summit
* @param int $question_id
* @param array $payload
* @return SummitOrderExtraQuestionValue
* @return ExtraQuestionTypeValue
* @throws ValidationException
* @throws EntityNotFoundException
*/
public function addOrderExtraQuestionValue(Summit $summit, int $question_id, array $payload):SummitOrderExtraQuestionValue;
public function addOrderExtraQuestionValue(Summit $summit, int $question_id, array $payload):ExtraQuestionTypeValue;
/**
* @param Summit $summit
* @param int $question_id
* @param int $value_id
* @param array $payload
* @return SummitOrderExtraQuestionValue
* @return ExtraQuestionTypeValue
* @throws ValidationException
* @throws EntityNotFoundException
*/
public function updateOrderExtraQuestionValue(Summit $summit, int $question_id, int $value_id, array $payload):SummitOrderExtraQuestionValue;
public function updateOrderExtraQuestionValue(Summit $summit, int $question_id, int $value_id, array $payload):ExtraQuestionTypeValue;
/**
* @param Summit $summit

130
app/Services/Model/Imp/ExtraQuestionTypeService.php Normal file
View File

@ -0,0 +1,130 @@
<?php namespace App\Services\Model\Imp;
/**
* Copyright 2021 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\ExtraQuestions\ExtraQuestionType;
use App\Models\Foundation\ExtraQuestions\ExtraQuestionTypeValue;
use App\Models\Foundation\ExtraQuestions\IExtraQuestionTypeRepository;
use App\Models\Foundation\Factories\ExtraQuestionTypeValueFactory;
use App\Services\Model\AbstractService;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
/**
* Class ExtraQuestionTypeService
* @package App\Services\Model\Imp
*/
abstract class ExtraQuestionTypeService
extends AbstractService
{
/**
* @var IExtraQuestionTypeRepository
*/
protected $repository;
/**
* @param ExtraQuestionType $question
* @param array $payload
* @return ExtraQuestionTypeValue
* @throws \Exception
*/
protected function _addOrderExtraQuestionValue(ExtraQuestionType $question, array $payload): ExtraQuestionTypeValue
{
return $this->tx_service->transaction(function () use ($question, $payload) {
$name = trim($payload['value']);
$former_value = $question->getValueByName($name);
if(!is_null($former_value))
throw new ValidationException("Value already exists.");
if(isset($payload['label'])) {
$label = trim($payload['label']);
$former_value = $question->getValueByLabel($label);
if (!is_null($former_value))
throw new ValidationException("Value already exists.");
}
$value = ExtraQuestionTypeValueFactory::build($payload);
$question->addValue($value);
return $value;
});
}
/**
* @param ExtraQuestionType $question
* @param int $value_id
* @param array $payload
* @return ExtraQuestionTypeValue
* @throws \Exception
*/
protected function _updateOrderExtraQuestionValue(ExtraQuestionType $question, int $value_id, array $payload): ExtraQuestionTypeValue
{
return $this->tx_service->transaction(function () use ($question, $value_id, $payload) {
$value = $question->getValueById($value_id);
if(is_null($value))
throw new EntityNotFoundException("Value not found.");
if(isset($payload['value'])) {
$name = trim($payload['value']);
$former_value = $question->getValueByName($name);
if (!is_null($former_value) && $former_value->getId() != $value_id)
throw new ValidationException("value already exists.");
}
if(isset($payload['label'])) {
$label = trim($payload['label']);
$former_value = $question->getValueByLabel($label);
if (!is_null($former_value) && $former_value->getId() != $value_id)
throw new ValidationException("value already exists.");
}
if (isset($payload['order']) && intval($payload['order']) != $value->getOrder()) {
// request to update order
$question->recalculateValueOrder($value, intval($payload['order']) );
}
return ExtraQuestionTypeValueFactory::populate($value, $payload);
});
}
/**
* @param ExtraQuestionType $question
* @param int $value_id
* @throws \Exception
*/
protected function _deleteOrderExtraQuestionValue(ExtraQuestionType $question, int $value_id): void
{
$this->tx_service->transaction(function () use ($question, $value_id) {
$value = $question->getValueById($value_id);
if(is_null($value))
throw new EntityNotFoundException("value not found");
// check if question has answers
if($this->repository->hasAnswers($question)){
throw new ValidationException(sprintf("You can not delete question value %s bc already has answers from attendees.", $value_id));
}
$question->removeValue($value);
});
}
}

60
app/Services/Model/Imp/PresentationService.php
View File

@ -19,6 +19,7 @@ use App\Http\Utils\FileUploadInfo;
use App\Http\Utils\IFileUploader;
use App\Jobs\Emails\PresentationSubmissions\PresentationCreatorNotificationEmail;
use App\Jobs\Emails\PresentationSubmissions\PresentationSpeakerNotificationEmail;
use App\Models\Foundation\Summit\ExtraQuestions\SummitSelectionPlanExtraQuestionType;
use App\Models\Foundation\Summit\Factories\PresentationLinkFactory;
use App\Models\Foundation\Summit\Factories\PresentationMediaUploadFactory;
use App\Models\Foundation\Summit\Factories\PresentationSlideFactory;
@ -41,6 +42,7 @@ use models\main\Member;
use models\summit\ISpeakerRepository;
use models\summit\ISummitEventRepository;
use models\summit\Presentation;
use models\summit\PresentationExtraQuestionAnswer;
use models\summit\PresentationLink;
use models\summit\PresentationMediaUpload;
use models\summit\PresentationSlide;
@ -51,6 +53,7 @@ use libs\utils\ITransactionService;
use models\summit\Summit;
use Illuminate\Http\Request as LaravelRequest;
use App\Services\Model\IFolderService;
use models\summit\SummitOrderExtraQuestionTypeConstants;
use Symfony\Component\HttpFoundation\File\UploadedFile;
/**
@ -526,39 +529,40 @@ final class PresentationService
}
}
$extra_questions = $payload['extra_questions'] ?? [];
// extra questions values
if (isset($data['extra_questions'])) {
foreach ($data['extra_questions'] as $extra_question) {
if (!isset($extra_question['id'])) continue;
if (!isset($extra_question['value'])) continue;
$mandatory_questions = $selection_plan->getMandatoryExtraQuestions();
if (count($extra_questions) < $mandatory_questions->count()) {
throw new ValidationException("You neglected to fill in all mandatory questions for the presentation.");
}
if (count($extra_questions)) {
$extra_question_id = $extra_question['id'];
$extra_question_value = $extra_question['value'];
$questions = $selection_plan->getExtraQuestions();
if ($questions->count() > 0) {
$presentation->clearExtraQuestionAnswers();
foreach ($questions as $question) {
if (!$question instanceof SummitSelectionPlanExtraQuestionType) continue;
foreach ($extra_questions as $question_answer) {
if (intval($question_answer['question_id']) == $question->getId()) {
$value = trim($question_answer['answer']);
$track_question = $track->getExtraQuestionById($extra_question_id);
if (is_null($track_question)) {
throw new EntityNotFoundException(
trans(
'not_found_errors.PresentationService.saveOrUpdatePresentation.trackQuestionNotFound',
['question_id' => $extra_question_id]
)
);
if (empty($value) && $question->isMandatory())
throw new ValidationException(sprintf('Question "%s" is mandatory', $question->getLabel()));
if ($question->allowsValues() && !$question->allowValue($value)) {
Log::warning(sprintf("value %s is not allowed for question %s", $value, $question->getName()));
throw new ValidationException("The answer you provided is invalid");
}
$answer = new PresentationExtraQuestionAnswer();
$answer->setQuestion($question);
$answer->setValue($value);
$presentation->addExtraQuestionAnswer($answer);
break;
}
}
}
$answer = $presentation->getTrackExtraQuestionAnswer($track_question);
if (is_null($answer)) {
$answer = new TrackAnswer();
$presentation->addAnswer($answer);
$track_question->addAnswer($answer);
}
if (is_array($extra_question_value)) {
$extra_question_value = str_replace('{comma}', ',', $extra_question_value);
$extra_question_value = implode(',', $extra_question_value);
}
$answer->setValue($extra_question_value);
}
}
return $presentation;

171
app/Services/Model/Imp/SelectionPlanOrderExtraQuestionTypeService.php Normal file
View File

@ -0,0 +1,171 @@
<?php namespace App\Services\Model\Imp;
/**
* Copyright 2021 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\ExtraQuestions\ExtraQuestionTypeValue;
use App\Models\Foundation\Summit\ExtraQuestions\SummitSelectionPlanExtraQuestionType;
use App\Models\Foundation\Summit\Factories\SummitSelectionPlanExtraQuestionTypeFactory;
use App\Models\Foundation\Summit\Repositories\ISummitSelectionPlanExtraQuestionTypeRepository;
use App\Models\Foundation\Summit\SelectionPlan;
use App\Services\Model\ISelectionPlanExtraQuestionTypeService;
use libs\utils\ITransactionService;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
/**
* Class SelectionPlanOrderExtraQuestionTypeService
* @package App\Services\Model\Imp
*/
final class SelectionPlanOrderExtraQuestionTypeService
extends ExtraQuestionTypeService
implements ISelectionPlanExtraQuestionTypeService
{
/**
* SelectionPlanOrderExtraQuestionTypeService constructor.
* @param ISummitSelectionPlanExtraQuestionTypeRepository $repository
* @param ITransactionService $tx_service
*/
public function __construct
(
ISummitSelectionPlanExtraQuestionTypeRepository $repository,
ITransactionService $tx_service
)
{
parent::__construct($tx_service);
$this->repository = $repository;
}
/**
* @inheritDoc
*/
public function addExtraQuestion(SelectionPlan $selectionPlan, array $payload): SummitSelectionPlanExtraQuestionType
{
return $this->tx_service->transaction(function () use ($selectionPlan, $payload) {
$name = trim($payload['name']);
$former_question = $selectionPlan->getExtraQuestionByName($name);
if (!is_null($former_question))
throw new ValidationException("Question Name already exists for Selection Plan.");
$label = trim($payload['label']);
$former_question = $selectionPlan->getExtraQuestionByName($label);
if (!is_null($former_question))
throw new ValidationException("Question Label already exists for Selection Plan.");
$question = SummitSelectionPlanExtraQuestionTypeFactory::build($payload);
$selectionPlan->addExtraQuestion($question);
return $question;
});
}
/**
* @inheritDoc
*/
public function updateExtraQuestion(SelectionPlan $selectionPlan, int $question_id, array $payload): SummitSelectionPlanExtraQuestionType
{
return $this->tx_service->transaction(function () use ($selectionPlan, $question_id, $payload) {
$question = $selectionPlan->getOrderExtraQuestionById($question_id);
if (is_null($question))
throw new EntityNotFoundException("question not found");
if (isset($payload['name'])) {
$name = trim($payload['name']);
$former_question = $selectionPlan->getExtraQuestionByName($name);
if (!is_null($former_question) && $former_question->getId() != $question_id)
throw new ValidationException("Question Name already exists for Selection Plan.");
}
if (isset($payload['label'])) {
$label = trim($payload['label']);
$former_question = $selectionPlan->getExtraQuestionByLabel($label);
if (!is_null($former_question) && $former_question->getId() != $question_id)
throw new ValidationException("Question Label already exists for Selection Plan.");
}
if (isset($payload['order']) && intval($payload['order']) != $question->getOrder()) {
// request to update order
$selectionPlan->recalculateQuestionOrder($question, intval($payload['order']));
}
return SummitSelectionPlanExtraQuestionTypeFactory::populate($question, $payload);
});
}
/**
* @inheritDoc
*/
public function deleteExtraQuestion(SelectionPlan $selectionPlan, int $question_id): void
{
$this->tx_service->transaction(function () use ($selectionPlan, $question_id) {
$question = $selectionPlan->getOrderExtraQuestionById($question_id);
if (is_null($question))
throw new EntityNotFoundException("Question not found.");
// check if question has answers
if ($this->repository->hasAnswers($question)) {
//throw new ValidationException(sprintf("you can not delete question %s bc already has answers from attendees", $question_id));
$this->repository->deleteAnswersFrom($question);
}
$selectionPlan->removeExtraQuestion($question);
});
}
/**
* @inheritDoc
*/
public function addExtraQuestionValue(SelectionPlan $selectionPlan, int $question_id, array $payload): ExtraQuestionTypeValue
{
return $this->tx_service->transaction(function () use ($selectionPlan, $question_id, $payload) {
$question = $selectionPlan->getExtraQuestionById($question_id);
if (is_null($question))
throw new EntityNotFoundException("Question not found.");
return parent::_addOrderExtraQuestionValue($question, $payload);
});
}
/**
* @inheritDoc
*/
public function updateExtraQuestionValue(SelectionPlan $selectionPlan, int $question_id, int $value_id, array $payload): ExtraQuestionTypeValue
{
return $this->tx_service->transaction(function () use ($selectionPlan, $question_id, $value_id, $payload) {
$question = $selectionPlan->getExtraQuestionById($question_id);
if (is_null($question))
throw new EntityNotFoundException("Question not found.");
return parent::_updateOrderExtraQuestionValue($question, $value_id, $payload);
});
}
/**
* @inheritDoc
*/
public function deleteExtraQuestionValue(SelectionPlan $selectionPlan, int $question_id, int $value_id): void
{
$this->tx_service->transaction(function () use ($selectionPlan, $question_id, $value_id) {
$question = $selectionPlan->getExtraQuestionById($question_id);
if (is_null($question))
throw new EntityNotFoundException("Question not found.");
parent::_deleteOrderExtraQuestionValue($question, $value_id);
});
}
}

119
app/Services/Model/Imp/SummitOrderExtraQuestionTypeService.php
View File

@ -11,31 +11,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use App\Models\Foundation\ExtraQuestions\ExtraQuestionTypeValue;
use App\Models\Foundation\Summit\Factories\SummitOrderExtraQuestionTypeFactory;
use App\Models\Foundation\Summit\Factories\SummitOrderExtraQuestionValueFactory;
use App\Models\Foundation\Summit\Repositories\ISummitOrderExtraQuestionTypeRepository;
use App\Services\Model\AbstractService;
use App\Services\Model\Imp\ExtraQuestionTypeService;
use App\Services\Model\ISummitOrderExtraQuestionTypeService;
use libs\utils\ITransactionService;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use models\summit\Summit;
use models\summit\SummitOrderExtraQuestionType;
use models\summit\SummitOrderExtraQuestionValue;
/**
* Class SummitOrderExtraQuestionTypeService
* @package App\Services
*/
final class SummitOrderExtraQuestionTypeService
extends AbstractService
extends ExtraQuestionTypeService
implements ISummitOrderExtraQuestionTypeService
{
/**
* @var ISummitOrderExtraQuestionTypeRepository
*/
private $repository;
/**
* SummitOrderExtraQuestionTypeService constructor.
* @param ISummitOrderExtraQuestionTypeRepository $repository
@ -63,13 +57,13 @@ final class SummitOrderExtraQuestionTypeService
return $this->tx_service->transaction(function () use ($summit, $payload) {
$name = trim($payload['name']);
$former_question = $summit->getOrderExtraQuestionByName($name);
if(!is_null($former_question))
throw new ValidationException("question name already exists for summit");
if (!is_null($former_question))
throw new ValidationException("Question Name already exists for Summit.");
$label = trim($payload['label']);
$former_question = $summit->getOrderExtraQuestionByLabel($label);
if(!is_null($former_question))
throw new ValidationException("question label already exists for summit");
if (!is_null($former_question))
throw new ValidationException("Question Label already exists for Summit.");
$question = SummitOrderExtraQuestionTypeFactory::build($payload);
@ -92,26 +86,26 @@ final class SummitOrderExtraQuestionTypeService
return $this->tx_service->transaction(function () use ($summit, $question_id, $payload) {
$question = $summit->getOrderExtraQuestionById($question_id);
if(is_null($question))
throw new EntityNotFoundException("question not found");
if (is_null($question))
throw new EntityNotFoundException("Question not Found.");
if(isset($payload['name'])) {
if (isset($payload['name'])) {
$name = trim($payload['name']);
$former_question = $summit->getOrderExtraQuestionByName($name);
if (!is_null($former_question) && $former_question->getId() != $question_id)
throw new ValidationException("question name already exists for summit");
throw new ValidationException("Question Name already exists for Summit.");
}
if(isset($payload['label'])) {
if (isset($payload['label'])) {
$label = trim($payload['label']);
$former_question = $summit->getOrderExtraQuestionByLabel($label);
if (!is_null($former_question) && $former_question->getId() != $question_id)
throw new ValidationException("question label already exists for summit");
throw new ValidationException("Question Label already exists for Summit.");
}
if (isset($payload['order']) && intval($payload['order']) != $question->getOrder()) {
// request to update order
$summit->recalculateQuestionOrder($question, intval($payload['order']) );
$summit->recalculateQuestionOrder($question, intval($payload['order']));
}
return SummitOrderExtraQuestionTypeFactory::populate($question, $payload);
@ -129,12 +123,12 @@ final class SummitOrderExtraQuestionTypeService
$this->tx_service->transaction(function () use ($summit, $question_id) {
$question = $summit->getOrderExtraQuestionById($question_id);
if(is_null($question))
throw new EntityNotFoundException("question not found");
if (is_null($question))
throw new EntityNotFoundException("Question not found.");
// check if question has answers
if($this->repository->hasAnswers($question)){
if ($this->repository->hasAnswers($question)) {
//throw new ValidationException(sprintf("you can not delete question %s bc already has answers from attendees", $question_id));
$this->repository->deleteAnswersFrom($question);
}
@ -147,35 +141,19 @@ final class SummitOrderExtraQuestionTypeService
* @param Summit $summit
* @param int $question_id
* @param array $payload
* @return SummitOrderExtraQuestionValue
* @return ExtraQuestionTypeValue
* @throws ValidationException
* @throws EntityNotFoundException
*/
public function addOrderExtraQuestionValue(Summit $summit, int $question_id, array $payload): SummitOrderExtraQuestionValue
public function addOrderExtraQuestionValue(Summit $summit, int $question_id, array $payload): ExtraQuestionTypeValue
{
return $this->tx_service->transaction(function () use ($summit, $question_id, $payload) {
$question = $summit->getOrderExtraQuestionById($question_id);
if(is_null($question))
throw new EntityNotFoundException("question not found");
$name = trim($payload['value']);
$former_value = $question->getValueByName($name);
if(!is_null($former_value))
throw new ValidationException("value already exists");
if(isset($payload['label'])) {
$label = trim($payload['label']);
$former_value = $question->getValueByLabel($label);
if (!is_null($former_value))
throw new ValidationException("value already exists");
}
$value = SummitOrderExtraQuestionValueFactory::build($payload);
$question->addValue($value);
return $value;
if (is_null($question))
throw new EntityNotFoundException("Question not found.");
return parent::_addOrderExtraQuestionValue($question, $payload);
});
}
@ -184,42 +162,18 @@ final class SummitOrderExtraQuestionTypeService
* @param int $question_id
* @param int $value_id
* @param array $payload
* @return SummitOrderExtraQuestionValue
* @return ExtraQuestionTypeValue
* @throws ValidationException
* @throws EntityNotFoundException
*/
public function updateOrderExtraQuestionValue(Summit $summit, int $question_id, int $value_id, array $payload): SummitOrderExtraQuestionValue
public function updateOrderExtraQuestionValue(Summit $summit, int $question_id, int $value_id, array $payload): ExtraQuestionTypeValue
{
return $this->tx_service->transaction(function () use ($summit, $question_id, $value_id, $payload) {
$question = $summit->getOrderExtraQuestionById($question_id);
if(is_null($question))
throw new EntityNotFoundException("question not found");
if (is_null($question))
throw new EntityNotFoundException("Question not found.");
$value = $question->getValueById($value_id);
if(is_null($value))
throw new EntityNotFoundException("value not found");
if(isset($payload['value'])) {
$name = trim($payload['value']);
$former_value = $question->getValueByName($name);
if (!is_null($former_value) && $former_value->getId() != $value_id)
throw new ValidationException("value already exists");
}
if(isset($payload['label'])) {
$label = trim($payload['label']);
$former_value = $question->getValueByLabel($label);
if (!is_null($former_value) && $former_value->getId() != $value_id)
throw new ValidationException("value already exists");
}
if (isset($payload['order']) && intval($payload['order']) != $value->getOrder()) {
// request to update order
$question->recalculateValueOrder($value, intval($payload['order']) );
}
return SummitOrderExtraQuestionValueFactory::populate($value, $payload);
return parent::_updateOrderExtraQuestionValue($question, $value_id, $payload);
});
}
@ -234,21 +188,10 @@ final class SummitOrderExtraQuestionTypeService
{
$this->tx_service->transaction(function () use ($summit, $question_id, $value_id) {
$question = $summit->getOrderExtraQuestionById($question_id);
if(is_null($question))
throw new EntityNotFoundException("question not found");
if (is_null($question))
throw new EntityNotFoundException("Question not found.");
$value = $question->getValueById($value_id);
if(is_null($value))
throw new EntityNotFoundException("value not found");
// check if question has answers
if($this->repository->hasAnswers($question)){
throw new ValidationException(sprintf("you can not delete question value %s bc already has answers from attendees", $value_id));
}
$question->removeValue($value);
parent::_deleteOrderExtraQuestionValue($question, $value_id);
});
}
}

8
app/Services/ModelServicesProvider.php
View File

@ -35,6 +35,7 @@ use App\Services\Model\Imp\CompanyService;
use App\Services\Model\Imp\PaymentGatewayProfileService;
use App\Services\Model\Imp\PresentationVideoMediaUploadProcessor;
use App\Services\Model\Imp\RegistrationIngestionService;
use App\Services\Model\Imp\SelectionPlanOrderExtraQuestionTypeService;
use App\Services\Model\Imp\SponsoredProjectService;
use App\Services\Model\Imp\SponsorUserInfoGrantService;
use App\Services\Model\Imp\SummitAdministratorPermissionGroupService;
@ -55,6 +56,7 @@ use App\Services\Model\IPresentationVideoMediaUploadProcessor;
use App\Services\Model\IRegistrationIngestionService;
use App\Services\Model\IRSVPTemplateService;
use App\Services\Model\IScheduleIngestionService;
use App\Services\Model\ISelectionPlanExtraQuestionTypeService;
use App\Services\Model\ISponsoredProjectService;
use App\Services\Model\ISponsorshipTypeService;
use App\Services\Model\ISponsorUserInfoGrantService;
@ -434,6 +436,11 @@ final class ModelServicesProvider extends ServiceProvider
ISummitPresentationActionService::class,
SummitPresentationActionService::class
);
App::singleton(
ISelectionPlanExtraQuestionTypeService::class,
SelectionPlanOrderExtraQuestionTypeService::class
);
}
/**
@ -498,6 +505,7 @@ final class ModelServicesProvider extends ServiceProvider
ITrackChairService::class,
ISummitPresentationActionTypeService::class,
ISummitPresentationActionService::class,
ISelectionPlanExtraQuestionTypeService::class,
];
}
}

134
database/migrations/model/Version20210521135639.php Normal file
View File

@ -0,0 +1,134 @@
<?php namespace Database\Migrations\Model;
/**
* Copyright 2021 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 Doctrine\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema as Schema;
use LaravelDoctrine\Migrations\Schema\Builder;
use LaravelDoctrine\Migrations\Schema\Table;
/**
* Class Version20210521135639
* @package Database\Migrations\Model
*/
class Version20210521135639 extends AbstractMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema):void
{
$builder = new Builder($schema);
if(!$schema->hasTable("ExtraQuestionType")) {
$builder->create('ExtraQuestionType', function (Table $table) {
$table->integer("ID", true, false);
$table->primary("ID");
$table->timestamp('Created');
$table->timestamp('LastEdited');
$table->string('ClassName')->setNotnull(true);
$table->string('Name')->setNotnull(true);
$table->string('Type')->setNotnull(true);
$table->string('Label')->setNotnull(true);
$table->integer('Order')->setNotnull(true)->setDefault(1);
$table->boolean('Mandatory')->setNotnull(true)->setDefault(false);
$table->string('Placeholder')->setNotnull(false)->setDefault('');
});
}
if(!$schema->hasTable("SummitSelectionPlanExtraQuestionType")) {
$builder->create('SummitSelectionPlanExtraQuestionType', function (Table $table) {
$table->integer("ID", true, false);
$table->primary("ID");
// FK
$table->integer("SelectionPlanID", false, false)->setNotnull(false)->setDefault('NULL');
$table->index("SelectionPlanID", "SelectionPlanID");
$table->foreign("SelectionPlan", "SelectionPlanID", "ID", ["onDelete" => "CASCADE"]);
});
}
if(!$schema->hasTable("ExtraQuestionTypeValue")) {
$builder->create('ExtraQuestionTypeValue', function (Table $table) {
$table->integer("ID", true, false);
$table->primary("ID");
$table->timestamp('Created');
$table->timestamp('LastEdited');
$table->string('ClassName')->setNotnull(true);
$table->string('Label')->setNotnull(true);
$table->string('Value')->setNotnull(true);
$table->integer('Order')->setNotnull(true)->setDefault(1);
// FK
$table->integer("QuestionID", false, false)->setNotnull(false)->setDefault('NULL');
$table->index("QuestionID", "QuestionID");
$table->foreign("ExtraQuestionType", "QuestionID", "ID", ["onDelete" => "CASCADE"]);
});
}
if(!$schema->hasTable("ExtraQuestionAnswer")) {
$builder->create('ExtraQuestionAnswer', function (Table $table) {
$table->integer("ID", true, false);
$table->primary("ID");
$table->timestamp('Created');
$table->timestamp('LastEdited');
$table->string('ClassName')->setNotnull(true);
$table->string('Value')->setNotnull(true);
// FK
$table->integer("QuestionID", false, false)->setNotnull(false)->setDefault('NULL');
$table->index("QuestionID", "QuestionID");
$table->foreign("ExtraQuestionType", "QuestionID", "ID", ["onDelete" => "CASCADE"]);
});
}
if(!$schema->hasTable("PresentationExtraQuestionAnswer")) {
$builder->create('PresentationExtraQuestionAnswer', function (Table $table) {
$table->integer("ID", true, false);
$table->primary("ID");
// FK
$table->integer("PresentationID", false, false)->setNotnull(false)->setDefault('NULL');
$table->index("PresentationID", "PresentationID");
$table->foreign("Presentation", "PresentationID", "ID", ["onDelete" => "CASCADE"]);
});
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema):void
{
}
}

56
database/migrations/model/Version20210521135642.php Normal file
View File

@ -0,0 +1,56 @@
<?php namespace Database\Migrations\Model;
/**
* Copyright 2021 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 Doctrine\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema as Schema;
/**
* Class Version20210521135642
* @package Database\Migrations\Model
*/
class Version20210521135642 extends AbstractMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema):void
{
$sql = <<<SQL
ALTER TABLE ExtraQuestionType MODIFY ClassName
enum(
'ExtraQuestionType',
'SummitSelectionPlanExtraQuestionType',
'SummitOrderExtraQuestionType'
) default 'SummitOrderExtraQuestionType' null;
SQL;
$this->addSql($sql);
$sql = <<<SQL
ALTER TABLE ExtraQuestionAnswer MODIFY ClassName
enum(
'ExtraQuestionAnswer',
'SummitOrderExtraQuestionAnswer',
'SummitSelectionPlanExtraQuestionType'
) default 'ExtraQuestionAnswer' null;
SQL;
$this->addSql($sql);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema):void
{
}
}

182
database/migrations/model/Version20210521170713.php Normal file
View File

@ -0,0 +1,182 @@
<?php namespace Database\Migrations\Model;
/**
* Copyright 2021 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 Doctrine\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema as Schema;
/**
* Class Version20210521170713
* @package Database\Migrations\Model
*/
class Version20210521170713 extends AbstractMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema):void
{
$sql = <<<SQL
insert into ExtraQuestionType(ID,ClassName,Created,LastEdited,Name,Type,Label,`Order`, Mandatory, Placeholder)
select
ID,
'SummitOrderExtraQuestionType',
Created,
LastEdited,Name,Type,Label,`Order`, Mandatory, Placeholder
from SummitOrderExtraQuestionType;
SQL;
$this->addSql($sql);
$sql = <<<SQL
alter table SummitOrderExtraQuestionType
drop column ClassName;
SQL;
$this->addSql($sql);
$sql = <<<SQL
alter table SummitOrderExtraQuestionType
drop column Created;
SQL;
$this->addSql($sql);
$sql = <<<SQL
alter table SummitOrderExtraQuestionType
drop column LastEdited;
SQL;
$this->addSql($sql);
$sql = <<<SQL
alter table SummitOrderExtraQuestionType
drop column Name;
SQL;
$this->addSql($sql);
$sql = <<<SQL
alter table SummitOrderExtraQuestionType
drop column Type;
SQL;
$this->addSql($sql);
$sql = <<<SQL
alter table SummitOrderExtraQuestionType
drop column Label;
SQL;
$this->addSql($sql);
$sql = <<<SQL
alter table SummitOrderExtraQuestionType
drop column `Order`;
SQL;
$this->addSql($sql);
$sql = <<<SQL
alter table SummitOrderExtraQuestionType
drop column Mandatory;
SQL;
$this->addSql($sql);
$sql = <<<SQL
alter table SummitOrderExtraQuestionType
drop column Placeholder;
SQL;
$this->addSql($sql);
$sql = <<<SQL
INSERT INTO ExtraQuestionTypeValue (ID,ClassName,LastEdited,Created,Value,Label,`Order`,QuestionID)
SELECT ID,'ExtraQuestionTypeValue',LastEdited,Created,Value,Label,`Order`,QuestionID
FROM SummitOrderExtraQuestionValue;
SQL;
$this->addSql($sql);
$sql = <<<SQL
DROP TABLE SummitOrderExtraQuestionValue;
SQL;
$this->addSql($sql);
$sql = <<<SQL
INSERT INTO ExtraQuestionAnswer
(ID, Created,LastEdited,ClassName,Value,QuestionID)
SELECT ID,Created,LastEdited,'SummitOrderExtraQuestionAnswer',Value,QuestionID
FROM SummitOrderExtraQuestionAnswer;
SQL;
$this->addSql($sql);
$sql = <<<SQL
ALTER TABLE SummitOrderExtraQuestionAnswer
DROP COLUMN ClassName;
SQL;
$this->addSql($sql);
$sql = <<<SQL
ALTER TABLE SummitOrderExtraQuestionAnswer
DROP COLUMN LastEdited;
SQL;
$this->addSql($sql);
$sql = <<<SQL
ALTER TABLE SummitOrderExtraQuestionAnswer
DROP COLUMN Created;
SQL;
$this->addSql($sql);
$sql = <<<SQL
ALTER TABLE SummitOrderExtraQuestionAnswer
DROP COLUMN Value;
SQL;
$this->addSql($sql);
$sql = <<<SQL
ALTER TABLE SummitOrderExtraQuestionAnswer
DROP COLUMN QuestionID;
SQL;
$this->addSql($sql);
$sql = <<<SQL
ALTER TABLE SummitSelectionPlanExtraQuestionType
ADD CONSTRAINT JT_SummitSelectionPlanExtraQuestionType_ExtraQuestionType
FOREIGN KEY (ID) REFERENCES ExtraQuestionType (ID) ON DELETE CASCADE;
SQL;
$this->addSql($sql);
$sql = <<<SQL
ALTER TABLE SummitOrderExtraQuestionType
ADD CONSTRAINT JT_SummitOrderExtraQuestionType_ExtraQuestionType
FOREIGN KEY (ID) REFERENCES ExtraQuestionType (ID) ON DELETE CASCADE;
SQL;
$this->addSql($sql);
$sql = <<<SQL
ALTER TABLE SummitOrderExtraQuestionAnswer
ADD CONSTRAINT JT_SummitOrderExtraQuestionAnswer_ExtraQuestionAnswer
FOREIGN KEY (ID) REFERENCES ExtraQuestionAnswer (ID) ON DELETE CASCADE;
SQL;
$this->addSql($sql);
$sql = <<<SQL
ALTER TABLE PresentationExtraQuestionAnswer
ADD CONSTRAINT JT_PresentationExtraQuestionAnswer_ExtraQuestionAnswer
FOREIGN KEY (ID) REFERENCES ExtraQuestionAnswer (ID) ON DELETE CASCADE;
SQL;
$this->addSql($sql);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema):void
{
}
}

107
database/seeds/ApiEndpointsSeeder.php
View File

@ -5178,6 +5178,113 @@ class ApiEndpointsSeeder extends Seeder
IGroup::SummitAdministrators,
]
],
// selection plans extra questions
[
'name' => 'get-selection-plan-extra-questions',
'route' => '/api/v1/summits/{id}/selection-plans/{selection_plan_id}/extra-questions',
'http_method' => 'GET',
'scopes' => [
sprintf(SummitScopes::ReadAllSummitData, $current_realm),
sprintf(SummitScopes::ReadSummitData, $current_realm)
],
],
[
'name' => 'get-selection-plan-extra-questions-metadata',
'route' => '/api/v1/summits/{id}/selection-plans/{selection_plan_id}/extra-questions/metadata',
'http_method' => 'GET',
'scopes' => [
sprintf(SummitScopes::ReadAllSummitData, $current_realm),
sprintf(SummitScopes::ReadSummitData, $current_realm)
],
],
[
'name' => 'add-selection-plan-extra-question',
'route' => '/api/v1/summits/{id}/selection-plans/{selection_plan_id}/extra-questions',
'http_method' => 'POST',
'scopes' => [
sprintf(SummitScopes::WriteSummitData, $current_realm)
],
'authz_groups' => [
IGroup::SuperAdmins,
IGroup::Administrators,
IGroup::SummitAdministrators,
]
],
[
'name' => 'get-selection-plan-extra-question',
'route' => '/api/v1/summits/{id}/selection-plans/{selection_plan_id}/extra-questions/{question_id}',
'http_method' => 'GET',
'scopes' => [
sprintf(SummitScopes::ReadAllSummitData, $current_realm),
sprintf(SummitScopes::ReadSummitData, $current_realm)
],
],
[
'name' => 'update-selection-plan-extra-question',
'route' => '/api/v1/summits/{id}/selection-plans/{selection_plan_id}/extra-questions/{question_id}',
'http_method' => 'PUT',
'scopes' => [
sprintf(SummitScopes::WriteSummitData, $current_realm)
],
'authz_groups' => [
IGroup::SuperAdmins,
IGroup::Administrators,
IGroup::SummitAdministrators,
]
],
[
'name' => 'delete-selection-plan-extra-question',
'route' => '/api/v1/summits/{id}/selection-plans/{selection_plan_id}/extra-questions/{question_id}',
'http_method' => 'DELETE',
'scopes' => [
sprintf(SummitScopes::WriteSummitData, $current_realm)
],
'authz_groups' => [
IGroup::SuperAdmins,
IGroup::Administrators,
IGroup::SummitAdministrators,
]
],
[
'name' => 'add-selection-plan-extra-question_value',
'route' => '/api/v1/summits/{id}/selection-plans/{selection_plan_id}/extra-questions/{question_id}/values',
'http_method' => 'POST',
'scopes' => [
sprintf(SummitScopes::WriteSummitData, $current_realm)
],
'authz_groups' => [
IGroup::SuperAdmins,
IGroup::Administrators,
IGroup::SummitAdministrators,
]
],
[
'name' => 'update-selection-plan-extra-question_value',
'route' => '/api/v1/summits/{id}/selection-plans/{selection_plan_id}/extra-questions/{question_id}/values/{value_id}',
'http_method' => 'PUT',
'scopes' => [
sprintf(SummitScopes::WriteSummitData, $current_realm)
],
'authz_groups' => [
IGroup::SuperAdmins,
IGroup::Administrators,
IGroup::SummitAdministrators,
]
],
[
'name' => 'delete-selection-plan-extra-question_value',
'route' => '/api/v1/summits/{id}/selection-plans/{selection_plan_id}/extra-questions/{question_id}/values/{value_id}',
'http_method' => 'DELETE',
'scopes' => [
sprintf(SummitScopes::WriteSummitData, $current_realm)
],
'authz_groups' => [
IGroup::SuperAdmins,
IGroup::Administrators,
IGroup::SummitAdministrators,
]
],
// selection plan presentations
[
'name' => 'get-selection-plan-presentations',
'route' => '/api/v1/summits/{id}/selection-plans/{selection_plan_id}/presentations',

7
database/seeds/TestSeeder.php
View File

@ -22,13 +22,6 @@ final class TestSeeder extends Seeder
public function run()
{
Model::unguard();
DB::setDefaultConnection("model");
DB::table('Summit')->delete();
DB::table('SummitEventType')->delete();
DB::table('PresentationType')->delete();
DB::table('SummitAbstractLocation')->delete();
DB::table('SummitGeoLocatedLocation')->delete();
DB::table('SummitVenue')->delete();
DB::setDefaultConnection("config");
$this->call('ApiSeeder');
$this->call('ApiScopesSeeder');

16
tests/BrowserKitTestCase.php
View File

@ -14,6 +14,8 @@
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Redis;
use Laravel\BrowserKitTesting\TestCase as BaseTestCase;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\DB;
/**
* Class TestCase
* @package Tests
@ -46,6 +48,20 @@ abstract class BrowserKitTestCase extends BaseTestCase
*/
protected function prepareForTests()
{
Model::unguard();
DB::setDefaultConnection("model");
DB::table('Group_Members')->delete();
DB::table('Member')->delete();
DB::table('Group')->delete();
DB::table('Summit')->delete();
DB::table('SummitEventType')->delete();
DB::table('PresentationType')->delete();
DB::table('SummitAbstractLocation')->delete();
DB::table('SummitGeoLocatedLocation')->delete();
DB::table('SummitVenue')->delete();
DB::table('PresentationTrackChairView')->delete();
Artisan::call('doctrine:migrations:migrate', ["--connection" => 'config']);
Artisan::call('doctrine:migrations:migrate', ["--connection" => 'model']);
//Mail::pretend(true);

65
tests/ExtraQuestionsModelTest.php Normal file
View File

@ -0,0 +1,65 @@
<?php namespace Tests;
/**
* Copyright 2021 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\ExtraQuestions\ExtraQuestionTypeConstants;
use App\Models\Foundation\Main\IGroup;
use App\Models\Foundation\Summit\ExtraQuestions\SummitSelectionPlanExtraQuestionType;
use App\Models\Foundation\Summit\Factories\SummitSelectionPlanExtraQuestionTypeFactory;
/**
* Class ExtraQuestionsModelTest
* @package Tests
*/
class ExtraQuestionsModelTest extends BrowserKitTestCase
{
use \InsertSummitTestData;
use \InsertMemberTestData;
protected function setUp()
{
parent::setUp();
self::insertTestData();
self::insertMemberTestData(IGroup::TrackChairs);
self::$summit_permission_group->addMember(self::$member);
self::$em->persist(self::$summit);
self::$em->persist(self::$summit_permission_group);
self::$em->flush();
}
protected function tearDown()
{
self::clearMemberTestData();
self::clearTestData();
parent::tearDown();
}
public function testAddSelectionPlanQuestion(){
$newQuestion = SummitSelectionPlanExtraQuestionTypeFactory::build([
'name' => 'Test Question',
'label' => 'Test Question',
'type' => ExtraQuestionTypeConstants::TextQuestionType,
'placeholder' => 'This is a placeholder',
'mandatory' => true,
]);
self::$default_selection_plan->addExtraQuestion($newQuestion);
self::$em->persist(self::$default_selection_plan);
self::$em->flush();
$this->assertFalse($newQuestion->getId() > 0);
}
}

13
tests/InsertMemberTestData.php
View File

@ -160,11 +160,16 @@ trait InsertMemberTestData
self::$member2 = self::$member_repository->find(self::$member2->getId());
self::$group2 = self::$group_repository->find(self::$group2->getId());
self::$em->remove(self::$member);
self::$em->remove(self::$group);
if(!is_null(self::$member))
self::$em->remove(self::$member);
if(!is_null(self::$group))
self::$em->remove(self::$group);
if(!is_null(self::$member2))
self::$em->remove(self::$member2);
if(!is_null(self::$group2))
self::$em->remove(self::$group2);
self::$em->remove(self::$member2);
self::$em->remove(self::$group2);
self::$em->flush();
}
}

76
tests/OAuth2SummitOrderExtraQuestionTypeApiTest.php
View File

@ -11,21 +11,41 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use App\Models\Foundation\Main\IGroup;
use models\summit\SummitOrderExtraQuestionTypeConstants;
/**
* Class OAuth2SummitOrderExtraQuestionTypeApiTest
*/
final class OAuth2SummitOrderExtraQuestionTypeApiTest extends ProtectedApiTest
{
/**
* @param int $summit_id
* @param int $company_id
* @return mixed
*/
public function testAddExtraOrderQuestion($summit_id=27){
use \InsertSummitTestData;
use \InsertMemberTestData;
protected function setUp()
{
parent::setUp();
self::insertTestData();
self::insertMemberTestData(IGroup::TrackChairs);
self::$summit_permission_group->addMember(self::$member);
self::$em->persist(self::$summit);
self::$em->persist(self::$summit_permission_group);
self::$em->flush();
}
protected function tearDown()
{
self::clearMemberTestData();
self::clearTestData();
parent::tearDown();
}
public function testAddExtraOrderQuestion(){
$params = [
'id' => $summit_id
'id' => self::$summit->getId()
];
$name = str_random(16).'_question';
@ -37,7 +57,6 @@ final class OAuth2SummitOrderExtraQuestionTypeApiTest extends ProtectedApiTest
'usage' => SummitOrderExtraQuestionTypeConstants::BothQuestionUsage,
'mandatory' => true,
'printable' => true,
'placeholder' => $name,
];
$headers = [
@ -63,10 +82,45 @@ final class OAuth2SummitOrderExtraQuestionTypeApiTest extends ProtectedApiTest
return $question;
}
public function testAddQuestionValue($summit_id=27){
$question = $this->testAddExtraOrderQuestion($summit_id);
public function testAddQuestionValue(){
$params = [
'id' => $summit_id,
'id' => self::$summit->getId()
];
$name = str_random(16).'_question';
$data = [
'name' => $name,
'type' => SummitOrderExtraQuestionTypeConstants::ComboBoxQuestionType,
'label' => $name,
'usage' => SummitOrderExtraQuestionTypeConstants::BothQuestionUsage,
'mandatory' => true,
'printable' => true,
];
$headers = [
"HTTP_Authorization" => " Bearer " . $this->access_token,
"CONTENT_TYPE" => "application/json"
];
$response = $this->action(
"POST",
"OAuth2SummitOrderExtraQuestionTypeApiController@add",
$params,
[],
[],
[],
$headers,
json_encode($data)
);
$content = $response->getContent();
$this->assertResponseStatus(201);
$question = json_decode($content);
$this->assertTrue(!is_null($question));
$params = [
'id' => self::$summit->getId(),
'question_id' => $question->id
];

204
tests/OAuth2SummitSelectionPlanExtraQuestionTypeApiTest.php Normal file
View File

@ -0,0 +1,204 @@
<?php
/**
* Copyright 2019 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\Main\IGroup;
use models\summit\SummitOrderExtraQuestionTypeConstants;
/**
* Class OAuth2SummitOrderExtraQuestionTypeApiTest
*/
final class OAuth2SummitOrderExtraQuestionTypeApiTest extends ProtectedApiTest
{
use \InsertSummitTestData;
use \InsertMemberTestData;
protected function setUp()
{
parent::setUp();
self::insertTestData();
self::insertMemberTestData(IGroup::TrackChairs);
self::$summit_permission_group->addMember(self::$member);
self::$em->persist(self::$summit);
self::$em->persist(self::$summit_permission_group);
self::$em->flush();
}
protected function tearDown()
{
self::clearMemberTestData();
self::clearTestData();
parent::tearDown();
}
public function testAddExtraQuestion(){
$params = [
'id' => self::$summit->getId(),
'selection_plan_id' => self::$default_selection_plan->getId(),
];
$name = str_random(16).'_question';
$data = [
'name' => $name,
'type' => SummitOrderExtraQuestionTypeConstants::ComboBoxQuestionType,
'label' => $name,
'mandatory' => true,
];
$headers = [
"HTTP_Authorization" => " Bearer " . $this->access_token,
"CONTENT_TYPE" => "application/json"
];
$response = $this->action(
"POST",
"OAuth2SummitSelectionPlansApiController@addExtraQuestion",
$params,
[],
[],
[],
$headers,
json_encode($data)
);
$content = $response->getContent();
$this->assertResponseStatus(201);
$question = json_decode($content);
$this->assertTrue(!is_null($question));
return $question;
}
public function testAddQuestionValue(){
$params = [
'id' => self::$summit->getId(),
'selection_plan_id' => self::$default_selection_plan->getId(),
];
$name = str_random(16).'_question';
$data = [
'name' => $name,
'type' => SummitOrderExtraQuestionTypeConstants::ComboBoxQuestionType,
'label' => $name,
'usage' => SummitOrderExtraQuestionTypeConstants::BothQuestionUsage,
'mandatory' => true,
'printable' => true,
];
$headers = [
"HTTP_Authorization" => " Bearer " . $this->access_token,
"CONTENT_TYPE" => "application/json"
];
$response = $this->action(
"POST",
"OAuth2SummitSelectionPlansApiController@addExtraQuestion",
$params,
[],
[],
[],
$headers,
json_encode($data)
);
$content = $response->getContent();
$this->assertResponseStatus(201);
$question = json_decode($content);
$this->assertTrue(!is_null($question));
$params = [
'id' => self::$summit->getId(),
'selection_plan_id' => self::$default_selection_plan->getId(),
'question_id' => $question->id
];
$name = str_random(16).'_question';
$data = [
'value' => $name,
'label' => $name,
];
$response = $this->action(
"POST",
"OAuth2SummitSelectionPlansApiController@addExtraQuestionValue",
$params,
[],
[],
[],
$headers,
json_encode($data)
);
$content = $response->getContent();
$this->assertResponseStatus(201);
$value = json_decode($content);
$this->assertTrue(!is_null($value));
// get all values
$params = [
'id' => self::$summit->getId(),
'selection_plan_id' => self::$default_selection_plan->getId(),
'question_id' => $question->id,
'expand' => 'values',
];
$response = $this->action(
"GET",
"OAuth2SummitSelectionPlansApiController@getExtraQuestions",
$params,
[],
[],
[],
$headers
);
$content = $response->getContent();
$this->assertResponseStatus(200);
$page = json_decode($content);
$this->assertTrue(!is_null($page));
$this->assertTrue($page->total == 1);
return $value;
}
public function testGetMetadata(){
$headers = [
"HTTP_Authorization" => " Bearer " . $this->access_token,
"CONTENT_TYPE" => "application/json"
];
$params = [
'id' => self::$summit->getId(),
'selection_plan_id' => self::$default_selection_plan->getId(),
];
$response = $this->action(
"GET",
"OAuth2SummitSelectionPlansApiController@getExtraQuestionsMetadata",
$params,
[],
[],
[],
$headers
);
$content = $response->getContent();
$this->assertResponseStatus(200);
$metadata = json_decode($content);
$this->assertTrue(!empty($metadata));
}
}