From d3b080a6bd747ab003897308e26a494bba60cd4d Mon Sep 17 00:00:00 2001 From: Sebastian Marcet Date: Tue, 11 Oct 2016 14:48:36 -0300 Subject: [PATCH] Fix on IOC binding Change-Id: Ie296fe6604652c941632bd21d35a01146f578d25 --- .../OAuth2SummitMembersApiController.php | 16 +--------- .../Main/Repositories/IMemberRepository.php | 5 ++-- .../Main/Repositories/ITagRepository.php | 5 ++-- app/Models/Foundation/Main/Tag.php | 3 +- app/Providers/EventServiceProvider.php | 8 ++--- .../Main/Doctrine/DoctrineTagRepository.php | 4 +-- app/Repositories/RepositoriesProvider.php | 4 +-- .../Doctrine/DoctrineMemberRepository.php | 2 +- app/Services/Model/SummitService.php | 30 +++++++++++++------ 9 files changed, 38 insertions(+), 39 deletions(-) diff --git a/app/Http/Controllers/apis/protected/summit/OAuth2SummitMembersApiController.php b/app/Http/Controllers/apis/protected/summit/OAuth2SummitMembersApiController.php index 55420a4f..d2efb600 100644 --- a/app/Http/Controllers/apis/protected/summit/OAuth2SummitMembersApiController.php +++ b/app/Http/Controllers/apis/protected/summit/OAuth2SummitMembersApiController.php @@ -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 diff --git a/app/Models/Foundation/Main/Repositories/IMemberRepository.php b/app/Models/Foundation/Main/Repositories/IMemberRepository.php index f3727c58..2a2c8b02 100644 --- a/app/Models/Foundation/Main/Repositories/IMemberRepository.php +++ b/app/Models/Foundation/Main/Repositories/IMemberRepository.php @@ -1,4 +1,4 @@ -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(); diff --git a/app/Repositories/Main/Doctrine/DoctrineTagRepository.php b/app/Repositories/Main/Doctrine/DoctrineTagRepository.php index 43037895..7d53bd04 100644 --- a/app/Repositories/Main/Doctrine/DoctrineTagRepository.php +++ b/app/Repositories/Main/Doctrine/DoctrineTagRepository.php @@ -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 { /** diff --git a/app/Repositories/RepositoriesProvider.php b/app/Repositories/RepositoriesProvider.php index 176f63c1..1b776fc3 100644 --- a/app/Repositories/RepositoriesProvider.php +++ b/app/Repositories/RepositoriesProvider.php @@ -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); }); diff --git a/app/Repositories/Summit/Doctrine/DoctrineMemberRepository.php b/app/Repositories/Summit/Doctrine/DoctrineMemberRepository.php index 489cf9eb..c6334628 100644 --- a/app/Repositories/Summit/Doctrine/DoctrineMemberRepository.php +++ b/app/Repositories/Summit/Doctrine/DoctrineMemberRepository.php @@ -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; diff --git a/app/Services/Model/SummitService.php b/app/Services/Model/SummitService.php index a216158d..277578b1 100644 --- a/app/Services/Model/SummitService.php +++ b/app/Services/Model/SummitService.php @@ -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;