openinfra/openstackid-resources
Code Issues Proposed changes

Fix on IOC binding

Browse Source 
Change-Id: Ie296fe6604652c941632bd21d35a01146f578d25
This commit is contained in:
Sebastian Marcet 2016-10-11 14:48:36 -03:00
parent 8bf6b9bbf3
commit d3b080a6bd
9 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/apis/protected/summit/OAuth2SummitMembersApiController.php
View File

@ -12,25 +12,11 @@
* limitations under the License.
**/
use Exception;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use Models\foundation\main\repositories\IMemberRepository;
use models\main\IMemberRepository;
use models\oauth2\IResourceServerContext;
use models\summit\IEventFeedbackRepository;
use models\summit\ISpeakerRepository;
use models\summit\ISummitEventRepository;
use models\summit\ISummitRepository;
use ModelSerializers\SerializerRegistry;
use services\model\ISummitService;
use utils\Filter;
use utils\FilterParser;
use utils\PagingInfo;
use utils\PagingResponse;
/**
* Class OAuth2SummitMembersApiController

5
app/Models/Foundation/Main/Repositories/IMemberRepository.php
View File

@ -1,4 +1,4 @@
<?php namespace Models\foundation\main\repositories;
<?php namespace models\main;
/**
* Copyright 2016 OpenStack Foundation
@ -13,12 +13,11 @@
* limitations under the License.
**/
use models\main\Member;
use models\utils\IBaseRepository;
/**
* Interface IMemberRepository
* @package Models\foundation\main\repositories
* @package models\main
*/
interface IMemberRepository extends IBaseRepository
{

5
app/Models/Foundation/Main/Repositories/ITagRepository.php
View File

@ -1,4 +1,5 @@
<?php namespace Models\foundation\main\repositories;
<?php namespace models\main;
/**
* Copyright 2016 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
@ -16,7 +17,7 @@ use models\utils\IBaseRepository;
/**
* Interface ITagRepository
* @package Models\foundation\main\repositories
* @package models\main
*/
interface ITagRepository extends IBaseRepository
{

3
app/Models/Foundation/Main/Tag.php
View File

@ -16,8 +16,9 @@ use models\utils\SilverstripeBaseModel;
use Doctrine\ORM\Mapping AS ORM;
/**
* @ORM\Entity(repositoryClass="repositories\main\DoctrineTagRepository")
* @ORM\Entity
* @ORM\Table(name="Tag")
* @ORM\Entity(repositoryClass="repositories\main\DoctrineTagRepository")
* Class Tag
* @package models\main
*/

8
app/Providers/EventServiceProvider.php
View File

@ -81,7 +81,7 @@ class EventServiceProvider extends ServiceProvider
if(!$event instanceof SummitEventCreated) return;
$resource_server_context = App::make(\models\oauth2\IResourceServerContext::class);
$member_repository = App::make(\Models\foundation\main\repositories\IMemberRepository::class);
$member_repository = App::make(\models\main\IMemberRepository::class);
$owner_id = $resource_server_context->getCurrentUserExternalId();
if(is_null($owner_id)) $owner_id = 0;
@ -108,7 +108,7 @@ class EventServiceProvider extends ServiceProvider
{
$resource_server_context = App::make(\models\oauth2\IResourceServerContext::class);
$member_repository = App::make(\Models\foundation\main\repositories\IMemberRepository::class);
$member_repository = App::make(\models\main\IMemberRepository::class);
$owner_id = $resource_server_context->getCurrentUserExternalId();
if(is_null($owner_id)) $owner_id = 0;
@ -137,7 +137,7 @@ class EventServiceProvider extends ServiceProvider
if(!$args instanceof PreUpdateEventArgs) return;
$resource_server_context = App::make(\models\oauth2\IResourceServerContext::class);
$member_repository = App::make(\Models\foundation\main\repositories\IMemberRepository::class);
$member_repository = App::make(\models\main\IMemberRepository::class);
$owner_id = $resource_server_context->getCurrentUserExternalId();
if(is_null($owner_id)) $owner_id = 0;
@ -172,7 +172,7 @@ class EventServiceProvider extends ServiceProvider
if(!$args instanceof PreRemoveEventArgs) return;
$resource_server_context = App::make(\models\oauth2\IResourceServerContext::class);
$member_repository = App::make(\Models\foundation\main\repositories\IMemberRepository::class);
$member_repository = App::make(\models\main\IMemberRepository::class);
$owner_id = $resource_server_context->getCurrentUserExternalId();
if(is_null($owner_id)) $owner_id = 0;
$params = $args->getParams();

4
app/Repositories/Main/Doctrine/DoctrineTagRepository.php
View File

@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Models\foundation\main\repositories\ITagRepository;
use models\main\ITagRepository;
use models\main\Tag;
use repositories\SilverStripeDoctrineRepository;
@ -19,7 +19,7 @@ use repositories\SilverStripeDoctrineRepository;
* Class DoctrineTagRepository
* @package repositories\main
*/
final class DoctrineTagRepository extends SilverStripeDoctrineRepository implements ITagRepository
final class DoctrineTagRepository extends SilverStripeDoctrineRepository implements ITagRepository
{
/**

4
app/Repositories/RepositoriesProvider.php
View File

@ -82,7 +82,7 @@ class RepositoriesProvider extends ServiceProvider
App::singleton(
'Models\foundation\main\repositories\IMemberRepository',
'models\main\IMemberRepository',
function(){
return EntityManager::getRepository(\models\main\Member::class);
});
@ -106,7 +106,7 @@ class RepositoriesProvider extends ServiceProvider
});
App::singleton(
'Models\foundation\main\repositories\ITagRepository',
'models\main\ITagRepository',
function(){
return EntityManager::getRepository(\models\main\Tag::class);
});

2
app/Repositories/Summit/Doctrine/DoctrineMemberRepository.php
View File

@ -12,7 +12,7 @@
* limitations under the License.
**/
use Models\foundation\main\repositories\IMemberRepository;
use models\main\IMemberRepository;
use models\main\Member;
use repositories\SilverStripeDoctrineRepository;

30
app/Services/Model/SummitService.php
View File

@ -19,8 +19,8 @@ use GuzzleHttp\Exception\ClientException;
use Illuminate\Support\Facades\Event;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use Models\foundation\main\repositories\IMemberRepository;
use Models\foundation\main\repositories\ITagRepository;
use models\main\IMemberRepository;
use models\main\ITagRepository;
use Models\foundation\summit\EntityEvents\EntityEventTypeFactory;
use Models\foundation\summit\EntityEvents\SummitEntityEventProcessContext;
use models\main\Tag;
@ -98,17 +98,29 @@ final class SummitService implements ISummitService
*/
private $tag_repository;
/**
* SummitService constructor.
* @param ISummitEventRepository $event_repository
* @param ISpeakerRepository $speaker_repository
* @param ISummitEntityEventRepository $entity_events_repository
* @param ISummitAttendeeTicketRepository $ticket_repository
* @param ISummitAttendeeRepository $attendee_repository
* @param IMemberRepository $member_repository
* @param ITagRepository $tag_repository
* @param IEventbriteAPI $eventbrite_api
* @param ITransactionService $tx_service
*/
public function __construct
(
ISummitEventRepository $event_repository,
ISpeakerRepository $speaker_repository,
ISummitEntityEventRepository $entity_events_repository,
ISummitEventRepository $event_repository,
ISpeakerRepository $speaker_repository,
ISummitEntityEventRepository $entity_events_repository,
ISummitAttendeeTicketRepository $ticket_repository,
ISummitAttendeeRepository $attendee_repository,
IMemberRepository $member_repository,
ITagRepository $tag_repository,
IEventbriteAPI $eventbrite_api,
ITransactionService $tx_service
IMemberRepository $member_repository,
ITagRepository $tag_repository,
IEventbriteAPI $eventbrite_api,
ITransactionService $tx_service
)
{
$this->event_repository = $event_repository;