Merge pull request #2232 from cultuurnet/hotfix-bootstrapping-sapi3

Hotfix bootstrapping SAPI3

Author: lucwollants

app/Notifications/NotificationsProvider.php

@@ -10,8 +10,8 @@
 use App\Notifications\Listeners\NotifyIntegrationChanged;
 use App\Notifications\Slack\SlackMessageBuilder;
 use App\Notifications\Slack\SlackNotifier;
+use App\Search\SearchServiceProvider;
 use App\Search\UdbOrganizerNameResolver;
-use App\Search\Sapi3\SearchService;
 use App\UiTPAS\UiTPASConfig;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\ServiceProvider;
@@ -36,7 +36,7 @@ public function register(): void
             new SlackMessageBuilder(
                 $this->app->get(SubscriptionRepository::class),
                 $this->app->get(UdbOrganizerNameResolver::class),
-                $this->app->get(SearchService::class),
+                $this->app->get(SearchServiceProvider::PROD_SEARCH_SERVICE),
                 config(UiTPASConfig::CLIENT_PERMISSIONS_URI->value),
                 config(UiTPASConfig::UDB_BASE_URI->value),
                 config('app.url'),

app/Nova/Resources/Integration.php

@@ -24,7 +24,7 @@
 use App\Nova\Actions\UiTPAS\SynchronizeUiTPASPermissions;
 use App\Nova\Filters\AdminInformationFilter;
 use App\Nova\Resource;
-use App\Search\Sapi3\SearchService;
+use App\Search\SearchServiceProvider;
 use App\UiTPAS\SynchronizeUiTPASPermissionsHandler;
 use Illuminate\Contracts\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
@@ -305,7 +305,7 @@ public function actions(NovaRequest $request): array
 
             (new RequestUdbOrganizer(
                 App::make(UdbOrganizerRepository::class),
-                App::make(SearchService::class),
+                App::make(SearchServiceProvider::PROD_SEARCH_SERVICE),
                 App::make(IntegrationRepository::class),
             ))
                 ->exceptOnIndex()

app/Nova/Resources/UdbOrganizer.php

@@ -17,6 +17,7 @@
 use App\Nova\Filters\UdbOrganizerStatusFilter;
 use App\Nova\Resource;
 use App\Search\Sapi3\SearchService;
+use App\Search\SearchServiceProvider;
 use App\Search\UdbOrganizerNameResolver;
 use App\UiTPAS\ClientCredentialsContextFactory;
 use App\UiTPAS\Dto\UiTPASPermission;
@@ -101,7 +102,7 @@ public function fields(NovaRequest $request): array
                 $udbOrganizerNameResolver = App::get(UdbOrganizerNameResolver::class);
 
                 /** @var SearchService $searchService */
-                $searchService = App::get(SearchService::class);
+                $searchService = App::get(SearchServiceProvider::PROD_SEARCH_SERVICE);
 
                 $name = $udbOrganizerNameResolver->getName($searchService->findOrganizers($model->toDomain()->organizerId));
 

app/UiTPAS/UiTPASServiceProvider.php

@@ -15,7 +15,6 @@
 use App\Keycloak\Repositories\KeycloakClientRepository;
 use App\Notifications\MessageBuilder;
 use App\Notifications\Slack\SlackNotifier;
-use App\Search\Sapi3\SearchService;
 use App\Search\SearchServiceProvider;
 use App\Search\UdbOrganizerNameResolver;
 use App\UiTPAS\Event\UdbOrganizerApproved;
@@ -93,7 +92,7 @@ public function register(): void
                 $this->app->get(Mailer::class),
                 $this->app->get(IntegrationRepository::class),
                 $this->app->get(UdbOrganizerNameResolver::class),
-                $this->app->get(SearchService::class),
+                $this->app->get(SearchServiceProvider::PROD_SEARCH_SERVICE),
                 $this->app->get(UrlGenerator::class),
                 new Address(config('mail.from.address'), config('mail.from.name')),
             );